diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -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 |