[FFmpeg-cvslog] Merge commit '326d9116936ab61d13ac4142b49c7337daf7c4c0'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Nov 14 11:50:03 2016 +0100| [444e65299ba5cbf390439e27ce2cb91dff0e5aa7] | committer: Hendrik Leppkes

Merge commit '326d9116936ab61d13ac4142b49c7337daf7c4c0'

* commit '326d9116936ab61d13ac4142b49c7337daf7c4c0':
  build: Drop unnecessary libavcodec <-> libavformat object dependencies

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=444e65299ba5cbf390439e27ce2cb91dff0e5aa7
---

 libavcodec/Makefile | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8c18906..82f7fa2 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


======================================================================

diff --cc libavcodec/Makefile
index 8c18906,8eb7d36..82f7fa2
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -809,60 -640,21 +809,47 @@@ OBJS-$(CONFIG_ISO_MEDIA)               
  
  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
 +
  # external codec libraries
 -OBJS-$(CONFIG_LIBDCADEC_DECODER)          += libdcadec.o dca.o
 -OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
 +OBJS-$(CONFIG_AAC_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_AC3_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_ADPCM_IMA_QT_AT_DECODER)    += audiotoolboxdec.o
 +OBJS-$(CONFIG_ALAC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_AMR_NB_AT_DECODER)          += audiotoolboxdec.o
 +OBJS-$(CONFIG_EAC3_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_GSM_MS_AT_DECODER)          += audiotoolboxdec.o
 +OBJS-$(CONFIG_ILBC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_MP1_AT_DECODER)             += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o
 +OBJS-$(CONFIG_MP2_AT_DECODER)             += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o
 +OBJS-$(CONFIG_MP3_AT_DECODER)             += audiotoolboxdec.o mpegaudiodata.o mpegaudiodecheader.o
 +OBJS-$(CONFIG_PCM_MULAW_AT_DECODER)       += audiotoolboxdec.o
 +OBJS-$(CONFIG_PCM_ALAW_AT_DECODER)        += audiotoolboxdec.o
 +OBJS-$(CONFIG_QDMC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_QDM2_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_AAC_AT_ENCODER)             += audiotoolboxenc.o
 +OBJS-$(CONFIG_ALAC_AT_ENCODER)            += audiotoolboxenc.o
 +OBJS-$(CONFIG_ILBC_AT_ENCODER)            += audiotoolboxenc.o
 +OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER)        += audiotoolboxenc.o
 +OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER)       += audiotoolboxenc.o
 +OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
  OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
  OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
  OBJS-$(CONFIG_LIBGSM_DECODER)             += libgsmdec.o