diff options
| author | Wei Jia <wjia@google.com> | 2015-09-08 16:02:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 16:02:07 +0000 |
| commit | 0cf901dd983e1a6b37eba2ab4414d647494588f1 (patch) | |
| tree | 8dcc576ee3043e251b5adda9212998a74d021d24 /media | |
| parent | c85dc0548dcc59aebc39251aa66b8c5df956c76f (diff) | |
| parent | c336136d8a86a8a95047949955a9bb749af247ab (diff) | |
| download | frameworks_av-0cf901dd983e1a6b37eba2ab4414d647494588f1.zip frameworks_av-0cf901dd983e1a6b37eba2ab4414d647494588f1.tar.gz frameworks_av-0cf901dd983e1a6b37eba2ab4414d647494588f1.tar.bz2 | |
am c336136d: Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev
* commit 'c336136d8a86a8a95047949955a9bb749af247ab':
libstagefright: fix A_Refl to return immediately when there is an error.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/Android.mk b/media/libstagefright/codecs/amrnb/dec/Android.mk index 3750e2e..76a7f40 100644 --- a/media/libstagefright/codecs/amrnb/dec/Android.mk +++ b/media/libstagefright/codecs/amrnb/dec/Android.mk @@ -98,7 +98,7 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_amrnbdec libsndfile LOCAL_SHARED_LIBRARIES := \ - libstagefright_amrnb_common libaudioutils + libstagefright_amrnb_common libaudioutils liblog LOCAL_MODULE := libstagefright_amrnbdec_test LOCAL_MODULE_TAGS := optional diff --git a/media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp b/media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp index fb7cff3..696d2da 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/a_refl.cpp @@ -59,6 +59,8 @@ terms listed above has been obtained from the copyright holder. /*---------------------------------------------------------------------------- ; INCLUDES ----------------------------------------------------------------------------*/ +#include <log/log.h> + #include "a_refl.h" #include "typedef.h" #include "cnst.h" @@ -291,7 +293,8 @@ void A_Refl( { refl[i] = 0; } - break; + ALOGE("b/23609206"); + return; } bState[j] = extract_l(L_temp); |