summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-02-27 20:12:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-02-27 20:12:07 +0000
commit25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2 (patch)
tree6f163708d5b1a1e641fbfdb9b2298c30ff99c774 /media
parent6ee1b867bb316fa3eda3b0c9f907d473031659d9 (diff)
parent323093339da7774935bd4f3a8af5057e4411f30a (diff)
downloadframeworks_av-25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2.zip
frameworks_av-25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2.tar.gz
frameworks_av-25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2.tar.bz2
Merge "SoftVorbis: Set the right encoding in the port definition"
Diffstat (limited to 'media')
-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 ac88107..fab0b0c 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);