Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev (c336136d) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/amrnb/dec/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);