diff options
author | Andreas Huber <andih@google.com> | 2013-02-27 21:14:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-27 21:14:45 +0000 |
commit | f9a2b8192403a969919fa7751c3d95bfb44ecec5 (patch) | |
tree | 0541e9c890ee898402d4bb8c79de57bb87df557f /media | |
parent | 7fa43f376ebd63fda24d85c9ebf97e0ddf534083 (diff) | |
parent | 25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2 (diff) | |
download | frameworks_av-f9a2b8192403a969919fa7751c3d95bfb44ecec5.zip frameworks_av-f9a2b8192403a969919fa7751c3d95bfb44ecec5.tar.gz frameworks_av-f9a2b8192403a969919fa7751c3d95bfb44ecec5.tar.bz2 |
am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"
* commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff':
SoftVorbis: Set the right encoding in the port definition
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp index 13dfc8c..922ac61 100644 --- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp +++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp @@ -93,7 +93,7 @@ void SoftVorbis::initPorts() { def.format.audio.pNativeRender = NULL; def.format.audio.bFlagErrorConcealment = OMX_FALSE; - def.format.audio.eEncoding = OMX_AUDIO_CodingAAC; + def.format.audio.eEncoding = OMX_AUDIO_CodingVORBIS; addPort(def); |