diff options
| author | Wei Jia <wjia@google.com> | 2015-09-04 09:13:37 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-09-04 09:54:14 -0700 |
| commit | 715dcb9c90d86c1a02a0da056f3cee8875ad1230 (patch) | |
| tree | 7513a97cf310e38dcfdb7f8627f80250628fe19a /media | |
| parent | e6eeff25562cecb668110b446d6114098e27370d (diff) | |
| download | frameworks_av-715dcb9c90d86c1a02a0da056f3cee8875ad1230.zip frameworks_av-715dcb9c90d86c1a02a0da056f3cee8875ad1230.tar.gz frameworks_av-715dcb9c90d86c1a02a0da056f3cee8875ad1230.tar.bz2 | |
libstagefright: fix A_Refl to return immediately when there is an error.
Bug: 23609206
Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
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); |