diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:35:33 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 19:27:41 -0800 |
| commit | 842f7df253913a11b6dbc705b83299c437edd4e3 (patch) | |
| tree | 6cb7da0af2b2b7254d8e43c454cb881dfa15f206 /media/libstagefright/ACodec.cpp | |
| parent | 8ab5ff0b3709976cde09362e7444d78d0a981dd3 (diff) | |
| parent | 60282213a1194ee8753ac53b97fc7f7e36373e17 (diff) | |
| download | frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.zip frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.gz frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/av into cm-13.0
Change-Id: Ia41df61c3ccfeb809572b63a4b1a8ca6bd85dfb2
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index ebe8046..213d4e2 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -2098,7 +2098,11 @@ status_t ACodec::configureCodec( } err = setupG711Codec(encoder, sampleRate, numChannels); } +#ifdef QTI_FLAC_DECODER } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC) && encoder) { +#else + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) { +#endif int32_t numChannels = 0, sampleRate = 0, compressionLevel = -1; if (encoder && (!msg->findInt32("channel-count", &numChannels) |