summaryrefslogtreecommitdiff
authorBang Peng <bang.peng@amlogic.com>2017-05-26 09:32:56 (GMT)
committer Zhi Zhou <zhi.zhou@amlogic.com>2017-05-26 12:20:01 (GMT)
commit2419075a08754809225980b9079ec501e1b7d705 (patch)
treef5bbcc51286bf95a95ab29faae4205f37e187bd7
parenta9ad4c7e70e081972bc31dc50594b566d8a07abc (diff)
downloadffmpeg-2419075a08754809225980b9079ec501e1b7d705.zip
ffmpeg-2419075a08754809225980b9079ec501e1b7d705.tar.gz
ffmpeg-2419075a08754809225980b9079ec501e1b7d705.tar.bz2
PD#144998:add ec3 dts demux
Change-Id: Id4fd1b465fe3d16f6c8ed178074b454e57c9b6fd
Diffstat
-rw-r--r--Android.mk5
-rw-r--r--config.h8
2 files changed, 8 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index c002bd4..4520927 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1393,7 +1393,10 @@ FFMPEG_LIBAVFORMAT_SRC_FILES := \
libavformat/yop.c \
libavformat/yuv4mpegdec.c \
libavformat/yuv4mpegenc.c \
-
+ libavformat/avisynth.c \
+ libavformat/dtsdec.c \
+ libavformat/dtshddec.c \
+ libavformat/ac3dec.c \
##### libswscalse
diff --git a/config.h b/config.h
index bba0f00..be929f4 100644
--- a/config.h
+++ b/config.h
@@ -1239,7 +1239,7 @@
#define CONFIG_AST_DEMUXER 1
#define CONFIG_AU_DEMUXER 1
#define CONFIG_AVI_DEMUXER 1
-#define CONFIG_AVISYNTH_DEMUXER 0
+#define CONFIG_AVISYNTH_DEMUXER 1
#define CONFIG_AVR_DEMUXER 1
#define CONFIG_AVS_DEMUXER 1
#define CONFIG_BETHSOFTVID_DEMUXER 1
@@ -1267,15 +1267,15 @@
#define CONFIG_DSF_DEMUXER 1
#define CONFIG_DSICIN_DEMUXER 1
#define CONFIG_DSS_DEMUXER 1
-#define CONFIG_DTS_DEMUXER 0
-#define CONFIG_DTSHD_DEMUXER 0
+#define CONFIG_DTS_DEMUXER 1
+#define CONFIG_DTSHD_DEMUXER 1
#define CONFIG_DV_DEMUXER 1
#define CONFIG_DVBSUB_DEMUXER 1
#define CONFIG_DVBTXT_DEMUXER 1
#define CONFIG_DXA_DEMUXER 1
#define CONFIG_EA_DEMUXER 1
#define CONFIG_EA_CDATA_DEMUXER 1
-#define CONFIG_EAC3_DEMUXER 0
+#define CONFIG_EAC3_DEMUXER 1
#define CONFIG_EPAF_DEMUXER 1
#define CONFIG_FFM_DEMUXER 1
#define CONFIG_FFMETADATA_DEMUXER 1