diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
| commit | 5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 (patch) | |
| tree | 4569ce180afcbc2aa3afaa35b06581e585294b4e /media/libstagefright/codecs/m4v_h263 | |
| parent | 61280541836947ce0b281b240ffa4c55bbf5bd55 (diff) | |
| parent | e5ba80c5c802ddad57e1132675c32b479c16758a (diff) | |
| download | frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.zip frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.gz frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.bz2 | |
resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp
Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/Android.mk b/media/libstagefright/codecs/m4v_h263/enc/Android.mk index c9006d9..7117692 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/Android.mk +++ b/media/libstagefright/codecs/m4v_h263/enc/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE := libstagefright_m4vh263enc LOCAL_CFLAGS := \ -DBX_RC \ - -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= + -DOSCL_IMPORT_REF= -D"OSCL_UNUSED_ARG(x)=(void)(x)" -DOSCL_EXPORT_REF= LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ @@ -55,7 +55,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DBX_RC \ - -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= + -DOSCL_IMPORT_REF= -D"OSCL_UNUSED_ARG(x)=(void)(x)" -DOSCL_EXPORT_REF= LOCAL_STATIC_LIBRARIES := \ |