diff options
| author | Justin Chuang <jchuang@google.com> | 2015-12-25 18:20:13 +0800 |
|---|---|---|
| committer | Justin Chuang <jchuang@google.com> | 2016-01-07 15:00:43 +0800 |
| commit | b9921f31de65dab04a385bef21b9c54c17e218de (patch) | |
| tree | ff48e20ef858527a8df65fb5cedb64a73724256f | |
| parent | 613f94db72ea295b8e7040f508ea0bbb782714a2 (diff) | |
| download | libyuv-b9921f31de65dab04a385bef21b9c54c17e218de.tar.gz | |
Add MJPEG support
This adds MJPEG support in libyuv_static, but it also adds dependency of
libjpeg for modules linked with libyuv_static.
BUG: 26318505
Change-Id: I83f7b0e739964b7b1640117956421c9ab760debe
| -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 ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon) common_CFLAGS += -DLIBYUV_NEON @@ -46,6 +47,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_MODULE:= libyuv_static LOCAL_MODULE_TAGS := optional |