diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-04-15 10:26:38 +0530 |
|---|---|---|
| committer | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-04-18 08:39:18 +0530 |
| commit | c59cd5d2be13b15a80e8821532c48826081968d6 (patch) | |
| tree | 892348510ce259ba56c8693cc8ce98a5655c0574 | |
| parent | dbcbd3567f218f6e98067d5def5ffbcf42ff843b (diff) | |
| download | android_external_libavc-c59cd5d2be13b15a80e8821532c48826081968d6.tar.gz android_external_libavc-c59cd5d2be13b15a80e8821532c48826081968d6.tar.bz2 android_external_libavc-c59cd5d2be13b15a80e8821532c48826081968d6.zip | |
Moved ALOGE and android_errorWriteLog calls under #ifdef __ANDROID__
Also added shared library liblog to test\decoder.mk
Change-Id: If7793f849522dd3f93a5177bab91f4ea5ada41ad
| -rw-r--r-- | decoder/ih264d_dpb_mgr.c | 5 | ||||
| -rw-r--r-- | test/decoder.mk | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index 7c4305b..493258c 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -17,9 +17,10 @@ ***************************************************************************** * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore */ +#ifdef __ANDROID__ #include "log/log.h" #include <cutils/log.h> - +#endif #include "ih264_typedefs.h" #include "ih264_macros.h" #include "ih264_platform_macros.h" @@ -877,8 +878,10 @@ WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec) { if (j >= MAX_REF_BUFS) { +#ifdef __ANDROID__ ALOGE("b/25818142"); android_errorWriteLog(0x534e4554, "25818142"); +#endif ps_dpb_cmds->u1_num_of_commands = 0; return -1; } diff --git a/test/decoder.mk b/test/decoder.mk index 1a49a92..0dda948 100644 --- a/test/decoder.mk +++ b/test/decoder.mk @@ -9,5 +9,5 @@ LOCAL_CFLAGS := -DPROFILE_ENABLE -DARM -DMD5_DISABLE -fPIC LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/ LOCAL_SRC_FILES := decoder/main.c LOCAL_STATIC_LIBRARIES := libavcdec - +LOCAL_SHARED_LIBRARIES := liblog include $(BUILD_EXECUTABLE) |