diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:46:10 +0000 |
| commit | 34e4c588c8e86fc407f8a67942434949f51b7da6 (patch) | |
| tree | fba7ed12afa96dab869b7ee739d03522a1210677 | |
| parent | 3c5a040ad94d0758e5b8949b049926f172812ef2 (diff) | |
| parent | 82454c3a826bc8aa42474097784b70befd5be532 (diff) | |
| download | ffmpeg-34e4c588c8e86fc407f8a67942434949f51b7da6.tar.gz | |
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
* commit '82454c3a826bc8aa42474097784b70befd5be532':
build: Let the WTV demuxer select the MPEG-TS demuxer
build: Adjust mpeg4video parser dependencies
build: Fix mpegvideo component dependencies
build: Fix dependencies for components relying on H.263 data tables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 | ||||
| -rw-r--r-- | libavformat/Makefile | 4 |
3 files changed, 7 insertions, 8 deletions
@@ -2736,8 +2736,8 @@ wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" -wtv_demuxer_select="riffdec" -wtv_muxer_select="riffenc" +wtv_demuxer_select="mpegts_demuxer riffdec" +wtv_muxer_select="mpegts_muxer riffenc" xmv_demuxer_select="riffdec" xwma_demuxer_select="riffdec" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a00c3ba71..9e0ece62b4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -296,7 +296,7 @@ OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o flvdec.o\ intelh263dec.o h263data.o OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ - h263.o h263data.o ituh263enc.o flvenc.o + h263.o ituh263enc.o flvenc.o h263data.o OBJS-$(CONFIG_H264_DECODER) += h264.o h264_cabac.o h264_cavlc.o \ h264_direct.o h264_loopfilter.o \ h264_mb.o h264_picture.o h264_ps.o \ @@ -497,8 +497,8 @@ OBJS-$(CONFIG_SUBVIEWER1_DECODER) += textdec.o ass.o OBJS-$(CONFIG_SUBVIEWER_DECODER) += subviewerdec.o ass.o OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o -OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o svq13.o h263.o -OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ +OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o svq13.o h263data.o +OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o h263data.o \ h263.o ituh263enc.o OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o svq13.o mpegutils.o OBJS-$(CONFIG_TEXT_DECODER) += textdec.o ass.o @@ -794,7 +794,6 @@ OBJS-$(CONFIG_TAK_DEMUXER) += tak.o OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o mpegaudiodata.o \ flac.o flacdata.o \ vorbis_data.o -OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o # libavfilter dependencies OBJS-$(CONFIG_ELBG_FILTER) += elbg.o diff --git a/libavformat/Makefile b/libavformat/Makefile index b98c1a3805..219140fd41 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -484,9 +484,9 @@ OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asf.o \ - avlanguage.o mpegts.o isom.o + avlanguage.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv_common.o \ - mpegtsenc.o asf.o + asf.o OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o OBJS-$(CONFIG_WVE_DEMUXER) += wvedec.o pcm.o OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o |