Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:53:30 +0000 (17:53 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:53:30 +0000 (17:53 +0000)
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
  build: Introduce iso_media component

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure
libavcodec/Makefile
libavformat/Makefile

diff --cc configure
+++ b/configure
@@@ -2009,12 -1706,11 +2009,13 @@@ CONFIG_EXTRA=
      iirfilter
      imdct15
      intrax8
+     iso_media
      ividsp
      jpegtables
 -    libx262
      lgplv3
 +    libx262
 +    llauddsp
 +    llviddsp
      lpc
      lzf
      me_cmp
@@@ -2669,18 -2248,15 +2670,18 @@@ nvenc_hevc_encoder_deps="nvenc
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"
  asf_demuxer_select="riffdec"
 +asf_o_demuxer_select="riffdec"
  asf_muxer_select="riffenc"
  asf_stream_muxer_select="asf_muxer"
- avi_demuxer_select="riffdec exif"
 -avi_demuxer_select="iso_media riffdec"
++avi_demuxer_select="iso_media riffdec exif"
  avi_muxer_select="riffenc"
  avisynth_demuxer_deps="avisynth"
  avisynth_demuxer_select="riffdec"
- caf_demuxer_select="riffdec"
+ caf_demuxer_select="iso_media riffdec"
  dash_muxer_select="mp4_muxer"
  dirac_demuxer_select="dirac_parser"
 +dts_demuxer_select="dca_parser"
 +dtshd_demuxer_select="dca_parser"
  dv_demuxer_select="dvprofile"
  dv_muxer_select="dvprofile"
  dxa_demuxer_select="riffdec"
@@@ -2689,22 -2265,19 +2690,23 @@@ f4v_muxer_select="mov_muxer
  flac_demuxer_select="flac_parser"
  hds_muxer_select="flv_muxer"
  hls_muxer_select="mpegts_muxer"
 +image2_alias_pix_demuxer_select="image2_demuxer"
 +image2_brender_pix_demuxer_select="image2_demuxer"
  ipod_muxer_select="mov_muxer"
  ismv_muxer_select="mov_muxer"
 +libnut_demuxer_deps="libnut"
 +libnut_muxer_deps="libnut"
  matroska_audio_muxer_select="matroska_muxer"
- matroska_demuxer_select="riffdec"
+ matroska_demuxer_select="iso_media riffdec"
  matroska_demuxer_suggest="bzlib lzo zlib"
- matroska_muxer_select="riffenc"
+ matroska_muxer_select="iso_media riffenc"
  mmf_muxer_select="riffenc"
- mov_demuxer_select="riffdec"
+ mov_demuxer_select="iso_media riffdec"
  mov_demuxer_suggest="zlib"
- mov_muxer_select="riffenc rtpenc_chain"
+ mov_muxer_select="iso_media riffenc rtpenc_chain"
  mp3_demuxer_select="mpegaudio_parser"
  mp4_muxer_select="mov_muxer"
+ mpegts_demuxer_select="iso_media"
  mpegts_muxer_select="adts_muxer latm_muxer"
  mpegtsraw_demuxer_select="mpegts_demuxer"
  mxf_d10_muxer_select="mxf_muxer"
@@@ -2729,15 -2301,12 +2731,15 @@@ swf_demuxer_suggest="zlib
  tak_demuxer_select="tak_parser"
  tg2_muxer_select="mov_muxer"
  tgp_muxer_select="mov_muxer"
 +vobsub_demuxer_select="mpegps_demuxer"
  w64_demuxer_select="wav_demuxer"
 +w64_muxer_select="wav_muxer"
  wav_demuxer_select="riffdec"
  wav_muxer_select="riffenc"
- webm_muxer_select="riffenc"
+ webm_muxer_select="iso_media riffenc"
 -webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
 +webm_dash_manifest_demuxer_select="matroska_demuxer"
  wtv_demuxer_select="mpegts_demuxer riffdec"
 +wtv_muxer_select="mpegts_muxer riffenc"
  xmv_demuxer_select="riffdec"
  xwma_demuxer_select="riffdec"
  
@@@ -752,41 -618,28 +752,36 @@@ OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL
  OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
  OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o
  OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)          += vdpau_vc1.o
 +OBJS-$(CONFIG_VP9_D3D11VA_HWACCEL)        += dxva2_vp9.o
 +OBJS-$(CONFIG_VP9_DXVA2_HWACCEL)          += dxva2_vp9.o
 +OBJS-$(CONFIG_VP9_VAAPI_HWACCEL)          += vaapi_vp9.o
  
  # libavformat dependencies
+ OBJS-$(CONFIG_ISO_MEDIA)               += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
- OBJS-$(CONFIG_AVI_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
- OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o  \
-                                           ac3tab.o
+ OBJS-$(CONFIG_CAF_DEMUXER)             += ac3tab.o
 -OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.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_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += mpeg4audio.o                  \
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += mpeg4audio.o vorbis_data.o    \
                                            flac.o flacdata.o
- OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o
- OBJS-$(CONFIG_MATROSKA_MUXER)          += mpeg4audio.o mpegaudiodata.o  \
-                                           flac.o flacdata.o vorbis_data.o
 -OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o
++OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o vorbis_data.o
  OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
- OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o ac3tab.o
- OBJS-$(CONFIG_MOV_MUXER)               += mpeg4audio.o mpegaudiodata.o
+ OBJS-$(CONFIG_MOV_DEMUXER)             += ac3tab.o
  OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
- OBJS-$(CONFIG_MPEGTS_DEMUXER)          += mpeg4audio.o mpegaudiodata.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
 -OBJS-$(CONFIG_OGG_MUXER)               += flac.o flacdata.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
@@@ -83,53 -73,33 +85,53 @@@ OBJS-$(CONFIG_AMR_MUXER
  OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o
  OBJS-$(CONFIG_APC_DEMUXER)               += apc.o
  OBJS-$(CONFIG_APE_DEMUXER)               += ape.o apetag.o img2.o
 -OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec.o asf.o asfcrypt.o \
 +OBJS-$(CONFIG_APNG_DEMUXER)              += apngdec.o
 +OBJS-$(CONFIG_APNG_MUXER)                += apngenc.o
 +OBJS-$(CONFIG_AQTITLE_DEMUXER)           += aqtitledec.o subtitles.o
 +OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec_f.o asf.o asfcrypt.o \
 +                                            avlanguage.o
 +OBJS-$(CONFIG_ASF_O_DEMUXER)             += asfdec_o.o asf.o asfcrypt.o \
                                              avlanguage.o
  OBJS-$(CONFIG_ASF_MUXER)                 += asfenc.o asf.o
 -OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.o
 +OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.o subtitles.o
  OBJS-$(CONFIG_ASS_MUXER)                 += assenc.o
 +OBJS-$(CONFIG_AST_DEMUXER)               += ast.o astdec.o
 +OBJS-$(CONFIG_AST_MUXER)                 += ast.o astenc.o
  OBJS-$(CONFIG_AU_DEMUXER)                += au.o pcm.o
  OBJS-$(CONFIG_AU_MUXER)                  += au.o rawenc.o
- OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o isom.o
+ OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o
 -OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o
 +OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o mpegtsenc.o avlanguage.o rawutils.o
  OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
  OBJS-$(CONFIG_AVM2_MUXER)                += swfenc.o swf.o
 +OBJS-$(CONFIG_AVR_DEMUXER)               += avr.o pcm.o
  OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
  OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
  OBJS-$(CONFIG_BINK_DEMUXER)              += bink.o
 +OBJS-$(CONFIG_BINTEXT_DEMUXER)           += bintext.o sauce.o
 +OBJS-$(CONFIG_BIT_DEMUXER)               += bit.o
 +OBJS-$(CONFIG_BIT_MUXER)                 += bit.o
  OBJS-$(CONFIG_BMV_DEMUXER)               += bmv.o
 +OBJS-$(CONFIG_BOA_DEMUXER)               += boadec.o
 +OBJS-$(CONFIG_BFSTM_DEMUXER)             += brstm.o
 +OBJS-$(CONFIG_BRSTM_DEMUXER)             += brstm.o
  OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
  OBJS-$(CONFIG_CAF_DEMUXER)               += cafdec.o caf.o mov.o mov_chan.o \
-                                             isom.o replaygain.o
+                                             replaygain.o
 +OBJS-$(CONFIG_CAF_MUXER)                 += cafenc.o caf.o riff.o isom.o
  OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += cavsvideodec.o rawdec.o
  OBJS-$(CONFIG_CAVSVIDEO_MUXER)           += rawenc.o
  OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o
  OBJS-$(CONFIG_CDXL_DEMUXER)              += cdxl.o
 +OBJS-$(CONFIG_CINE_DEMUXER)              += cinedec.o
 +OBJS-$(CONFIG_CONCAT_DEMUXER)            += concatdec.o
  OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
- OBJS-$(CONFIG_DASH_MUXER)                += dashenc.o isom.o
 +OBJS-$(CONFIG_DATA_DEMUXER)              += rawdec.o
 +OBJS-$(CONFIG_DATA_MUXER)                += rawdec.o
+ OBJS-$(CONFIG_DASH_MUXER)                += dashenc.o
  OBJS-$(CONFIG_DAUD_DEMUXER)              += dauddec.o
  OBJS-$(CONFIG_DAUD_MUXER)                += daudenc.o
 +OBJS-$(CONFIG_DCSTR_DEMUXER)             += dcstr.o
  OBJS-$(CONFIG_DFA_DEMUXER)               += dfa.o
  OBJS-$(CONFIG_DIRAC_DEMUXER)             += diracdec.o rawdec.o
  OBJS-$(CONFIG_DIRAC_MUXER)               += rawenc.o
@@@ -245,28 -175,23 +247,28 @@@ OBJS-$(CONFIG_LXF_DEMUXER
  OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
  OBJS-$(CONFIG_M4V_MUXER)                 += rawenc.o
  OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o  \
-                                             isom.o rmsipr.o flac_picture.o \
 -                                            rmsipr.o \
++                                            rmsipr.o flac_picture.o \
                                              oggparsevorbis.o vorbiscomment.o \
                                              flac_picture.o replaygain.o
  OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
-                                             isom.o avc.o hevc.o \
+                                             avc.o hevc.o \
 -                                            flacenc_header.o avlanguage.o vorbiscomment.o wv.o
 +                                            flacenc_header.o avlanguage.o vorbiscomment.o wv.o \
 +                                            webmdashenc.o webm_chunk.o
  OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
 +OBJS-$(CONFIG_MGSTS_DEMUXER)             += mgsts.o
 +OBJS-$(CONFIG_MICRODVD_DEMUXER)          += microdvddec.o subtitles.o
 +OBJS-$(CONFIG_MICRODVD_MUXER)            += microdvdenc.o
  OBJS-$(CONFIG_MJPEG_DEMUXER)             += rawdec.o
  OBJS-$(CONFIG_MJPEG_MUXER)               += rawenc.o
 -OBJS-$(CONFIG_MLP_DEMUXER)               += rawdec.o
 +OBJS-$(CONFIG_MLP_DEMUXER)               += rawdec.o mlpdec.o
  OBJS-$(CONFIG_MLP_MUXER)                 += rawenc.o
 +OBJS-$(CONFIG_MLV_DEMUXER)               += mlvdec.o riffdec.o
  OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
 -OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o pcm.o
 -OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o
 +OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o
 +OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o rawenc.o
- OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o isom.o mov_chan.o replaygain.o
- OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o isom.o avc.o hevc.o \
+ OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o mov_chan.o replaygain.o
+ OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o avc.o hevc.o \
 -                                            movenchint.o mov_chan.o
 +                                            movenchint.o mov_chan.o rtp.o movenccenc.o
  OBJS-$(CONFIG_MP2_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
  OBJS-$(CONFIG_MP3_DEMUXER)               += mp3dec.o replaygain.o
  OBJS-$(CONFIG_MP3_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
@@@ -472,28 -358,17 +474,28 @@@ OBJS-$(CONFIG_WAV_DEMUXER
  OBJS-$(CONFIG_WAV_MUXER)                 += wavenc.o
  OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
  OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
-                                             isom.o avc.o hevc.o \
+                                             avc.o hevc.o \
                                              flacenc_header.o avlanguage.o \
 -                                            wv.o vorbiscomment.o
 +                                            wv.o vorbiscomment.o \
 +                                            webmdashenc.o webm_chunk.o
 +OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER)  += webmdashenc.o matroska.o
 +OBJS-$(CONFIG_WEBM_CHUNK_MUXER)          += webm_chunk.o matroska.o
 +OBJS-$(CONFIG_WEBP_MUXER)                += webpenc.o
 +OBJS-$(CONFIG_WEBVTT_DEMUXER)            += webvttdec.o subtitles.o
 +OBJS-$(CONFIG_WEBVTT_MUXER)              += webvttenc.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 \
 +OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv_common.o asf.o \
                                              avlanguage.o
 +OBJS-$(CONFIG_WTV_MUXER)                 += wtvenc.o wtv_common.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
  OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
 +OBJS-$(CONFIG_XBIN_DEMUXER)              += bintext.o sauce.o
  OBJS-$(CONFIG_XMV_DEMUXER)               += xmv.o
 +OBJS-$(CONFIG_XVAG_DEMUXER)              += xvag.o
  OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o
  OBJS-$(CONFIG_YOP_DEMUXER)               += yop.o
  OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpegenc.o