diff options
| author | Justin Chuang <jchuang@google.com> | 2015-12-25 18:20:13 +0800 |
|---|---|---|
| committer | Justin Chuang <jchuang@google.com> | 2016-01-12 10:55:28 +0800 |
| commit | bb74e3e19b98261031216de8cadcef34cccd9e4a (patch) | |
| tree | 5734dc81363847d09216d23b473c10890ee398c0 | |
| parent | bdab24b5c8c329150f7622678077f2c936c2a07e (diff) | |
| download | libyuv-nougat-mr0.5-release.tar.gz | |
Add MJPEG supportandroid-n-mr1-preview-2android-n-mr1-preview-1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-release
This adds MJPEG support in libyuv_static, but it also adds dependency of
libjpeg for modules linked with libyuv_static.
BUG: 26318505
Change-Id: I98c70bda5767dc5261268b72986b3a597c28d1be
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -10,6 +10,7 @@ common_SRC_FILES := \ files/source/convert_from.cc \ files/source/cpu_id.cc \ files/source/format_conversion.cc \ + files/source/mjpeg_decoder.cc \ files/source/planar_functions.cc \ files/source/rotate.cc \ files/source/rotate_argb.cc \ @@ -19,7 +20,7 @@ common_SRC_FILES := \ files/source/scale_argb.cc \ files/source/video_common.cc -common_CFLAGS := -Wall -fexceptions +common_CFLAGS := -Wall -fexceptions -DHAVE_JPEG common_C_INCLUDES = $(LOCAL_PATH)/files/include @@ -37,6 +38,7 @@ LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) +LOCAL_SHARED_LIBRARIES := libjpeg LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/files/include |