diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 11:50:03 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:01:17 +0100 |
commit | 444e65299ba5cbf390439e27ce2cb91dff0e5aa7 (patch) | |
tree | c7c2cc23c21a16a4fb9ea2ea027cd871bb14b3fa | |
parent | a0bc6b51d4f6d01eb4bcaec5489ca67037687a77 (diff) | |
parent | 326d9116936ab61d13ac4142b49c7337daf7c4c0 (diff) | |
download | ffmpeg-444e65299ba5cbf390439e27ce2cb91dff0e5aa7.tar.gz |
Merge commit '326d9116936ab61d13ac4142b49c7337daf7c4c0'
* commit '326d9116936ab61d13ac4142b49c7337daf7c4c0':
build: Drop unnecessary libavcodec <-> libavformat object dependencies
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r-- | libavcodec/Makefile | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8c189064f1..82f7fa24eb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -810,33 +810,20 @@ OBJS-$(CONFIG_ISO_MEDIA) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_CAF_DEMUXER) += ac3tab.o OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddata.o -OBJS-$(CONFIG_FLAC_DEMUXER) += flac.o flacdata.o vorbis_data.o -OBJS-$(CONFIG_FLAC_MUXER) += flac.o flacdata.o vorbis_data.o OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o -OBJS-$(CONFIG_GXF_DEMUXER) += mpeg12data.o -OBJS-$(CONFIG_IFF_DEMUXER) += iff.o OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o vorbis_data.o \ - flac.o flacdata.o -OBJS-$(CONFIG_MATROSKA_MUXER) += flac.o flacdata.o vorbis_data.o +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o +OBJS-$(CONFIG_MATROSKA_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o -OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MXF_MUXER) += dnxhddata.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_NUT_DEMUXER) += mpegaudiodata.o mpeg4audio.o -OBJS-$(CONFIG_OGA_MUXER) += flac.o flacdata.o -OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \ - dirac.o vorbis_data.o -OBJS-$(CONFIG_OGG_MUXER) += flac.o flacdata.o \ - vorbis_data.o OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o OBJS-$(CONFIG_SPDIF_MUXER) += dca.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o -OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o mpegaudiodata.o \ - flac.o flacdata.o \ - vorbis_data.o +OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o # libavfilter dependencies OBJS-$(CONFIG_ELBG_FILTER) += elbg.o |