summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/vorbis
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-02-27 21:14:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-27 21:14:45 +0000
commiteed157dcfea88cc7b71524258a112ebf49ad7a05 (patch)
treef2688d81caa34807d5e17ce926d20c9d0543d63b /media/libstagefright/codecs/vorbis
parentb99c5b8eebb35133a08c46b015624bd4c4a6c477 (diff)
parentccf51ec41652a7e2db8cbee37bca91a95908d5ff (diff)
downloadframeworks_av-eed157dcfea88cc7b71524258a112ebf49ad7a05.zip
frameworks_av-eed157dcfea88cc7b71524258a112ebf49ad7a05.tar.gz
frameworks_av-eed157dcfea88cc7b71524258a112ebf49ad7a05.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/libstagefright/codecs/vorbis')
-rw-r--r--media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp2
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);