commit 7072e03ae4eb9b8f48a567dbb2a5cc8d2049f331
author Andreas Huber <andih@google.com> Wed Feb 27 21:14:45 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 27 21:14:45 2013 +0000
tree 92cbfe05639329e162f362b5d3bd80fc0227511d
parent f9a2b8192403a969919fa7751c3d95bfb44ecec5
parent d166e4c1b2463a1aa78ca9225a36aa956427446b

am ceb83b8d: Merge "SoftAMR: Signal the right frame format"

* commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b':
  SoftAMR: Signal the right frame format

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

diff --git a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
index c5f733b..4d4212f 100644
--- a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
+++ b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
@@ -154,7 +154,7 @@
 
             amrParams->nChannels = 1;
             amrParams->eAMRDTXMode = OMX_AUDIO_AMRDTXModeOff;
-            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatConformance;
+            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatFSF;
 
             if (!isConfigured()) {
                 amrParams->nBitRate = 0;