From b3253b3e61d5d30abc6527d66f3f7af947cae2c0 Mon Sep 17 00:00:00 2001
From: Bang Peng<bang.peng@amlogic.com>
Date: Fri, 25  Aug  2017  13:04:25  +0000
Subject: external/ffmpeg: fixed subtile no show [1/1]

PD#149588

ffmpeg should supprot zlib

Change-Id: Ie5ba3e1086416a8d7dc6baad9cf6bf92c2b5b720
---
diff --git a/Android.mk b/Android.mk
index 4520927..4cf2907 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
diff --git a/config.h b/config.h
index be929f4..7a7810a 100644
--- a/config.h
+++ b/config.h
@@ -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
--
cgit