| author | Bang Peng <bang.peng@amlogic.com> | 2017-08-25 13:04:25 (GMT) |
|---|---|---|
| committer | Bang Peng <bang.peng@amlogic.com> | 2017-08-25 13:07:14 (GMT) |
| commit | b3253b3e61d5d30abc6527d66f3f7af947cae2c0 (patch) | |
| tree | acda95dfbf5bdd4b9c8d00b2c4078bbd1c93acaf | |
| parent | a993f1b4f2a51a244eba324bedec3ff4f9e000da (diff) | |
| download | ffmpeg-b3253b3e61d5d30abc6527d66f3f7af947cae2c0.zip ffmpeg-b3253b3e61d5d30abc6527d66f3f7af947cae2c0.tar.gz ffmpeg-b3253b3e61d5d30abc6527d66f3f7af947cae2c0.tar.bz2 | |
external/ffmpeg: fixed subtile no show [1/1]
PD#149588
ffmpeg should supprot zlib
Change-Id: Ie5ba3e1086416a8d7dc6baad9cf6bf92c2b5b720
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | config.h | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1505,6 +1505,8 @@ LOCAL_SRC_FILES_arm64 := \ $(FFMPEG_LIBRESAMPLE_SRC_FILES_armv8-a) \ $(FFMPEG_LIBSWSCALE_SRC_FILES_armv8-a) \ -LOCAL_SHARED_LIBRARIES := libutils liblog libdl +LOCAL_C_INCLUDES += external/zlib + +LOCAL_SHARED_LIBRARIES := libutils liblog libdl libz include $(BUILD_SHARED_LIBRARY) @@ -506,7 +506,7 @@ #define CONFIG_SDL2 0 #define CONFIG_SECURETRANSPORT 0 #define CONFIG_XLIB 1 -#define CONFIG_ZLIB 0 +#define CONFIG_ZLIB 1 #define CONFIG_AVISYNTH 0 #define CONFIG_FREI0R 0 #define CONFIG_LIBCDIO 0 |