From 7403be9b1bce92cfa3a2afee2526e5d560ecf430 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 20:01:30 +0100 Subject: [PATCH 1/4] build: Fix dependencies for components relying on H.263 data tables --- libavcodec/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6969bcc402..c4f80ae872 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -244,7 +244,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 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 \ @@ -411,8 +411,8 @@ OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o OBJS-$(CONFIG_SRT_DECODER) += srtdec.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_TAK_DECODER) += takdec.o tak.o From 2870972e9de6b66b572cdfb3d45bb720bf39edbb Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 20:34:47 +0100 Subject: [PATCH 2/4] build: Fix mpegvideo component dependencies --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 270a6ec46e..11fbfcb258 100755 --- a/configure +++ b/configure @@ -1897,7 +1897,7 @@ me_cmp_select="fdctdsp idctdsp pixblockdsp" mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp videodsp" +mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" nvenc_deps_any="dlopen LoadLibrary" nvenc_extralibs='$ldl' From de3b134be3f5fc2f860a78c0af1ab59ba50811ae Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 20:35:10 +0100 Subject: [PATCH 3/4] build: Adjust mpeg4video parser dependencies --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 11fbfcb258..28d8d9872a 100755 --- a/configure +++ b/configure @@ -2188,7 +2188,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" h264_parser_select="h264_decoder" hevc_parser_select="golomb" mpegvideo_parser_select="mpegvideo" -mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp" +mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp" vc1_parser_select="mpegvideo startcode vc1_decoder" # bitstream_filters From 82454c3a826bc8aa42474097784b70befd5be532 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 19:51:26 +0100 Subject: [PATCH 4/4] build: Let the WTV demuxer select the MPEG-TS demuxer The WTV demuxer depends on large parts of the MPEG-TS demuxer internals anyway and fails to build without it. --- configure | 2 +- libavcodec/Makefile | 1 - libavformat/Makefile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 28d8d9872a..ff506136c6 100755 --- a/configure +++ b/configure @@ -2304,7 +2304,7 @@ wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder" -wtv_demuxer_select="riffdec" +wtv_demuxer_select="mpegts_demuxer riffdec" xmv_demuxer_select="riffdec" xwma_demuxer_select="riffdec" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c4f80ae872..b93a5f4171 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -650,7 +650,6 @@ OBJS-$(CONFIG_SPDIF_MUXER) += dca.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o mpegaudiodata.o \ flac.o flacdata.o -OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o # external codec libraries OBJS-$(CONFIG_LIBDCADEC_DECODER) += libdcadec.o dca.o diff --git a/libavformat/Makefile b/libavformat/Makefile index c5d1bfa202..8e37538f75 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -362,7 +362,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtv.o asfdec.o asf.o asfcrypt.o \ - avlanguage.o mpegts.o isom.o + avlanguage.o OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o