Merge commit 'e1dc5358af0dadef548114ec9cabba766b7c6260'

* commit 'e1dc5358af0dadef548114ec9cabba766b7c6260':
  build: Create a component for MPEG audio header decoding

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index c15fa21,4956119..979ec8f
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2341,26 -1903,22 +2342,26 @@@ error_resilience_select="me_cmp
  faandct_deps="faan fdctdsp"
  faanidct_deps="faan idctdsp"
  h264dsp_select="startcode"
 +frame_thread_encoder_deps="encoders threads"
  intrax8_select="blockdsp idctdsp"
  mdct_select="fft"
 -rdft_select="fft"
 +mdct15_select="fft"
  me_cmp_select="fdctdsp idctdsp pixblockdsp"
  mpeg_er_select="error_resilience"
- mpegaudio_select="mpegaudiodsp"
+ mpegaudio_select="mpegaudiodsp mpegaudioheader"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp"
 +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
  mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
  vc1dsp_select="h264chroma qpeldsp startcode"
 +rdft_select="fft"
  
  # decoders / encoders
 -aac_decoder_select="imdct15 mdct sinewin"
 -aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
 +aac_decoder_select="mdct15 mdct sinewin"
 +aac_fixed_decoder_select="mdct sinewin"
 +aac_encoder_select="audio_frame_queue iirfilter lpc mdct sinewin"
  aac_latm_decoder_select="aac_decoder aac_latm_parser"
  ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct"
 +ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
  ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
  ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
  adpcm_g722_decoder_select="g722dsp"
@@@ -2794,47 -2230,18 +2795,51 @@@ wmv3_vdpau_decoder_select="vc1_vdpau_de
  # parsers
  h264_parser_select="golomb h264dsp h264parse"
  hevc_parser_select="golomb"
+ mpegaudio_parser_select="mpegaudioheader"
  mpegvideo_parser_select="mpegvideo"
 -mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
 +mpeg4video_parser_select="h263dsp mpegvideo qpeldsp"
  vc1_parser_select="vc1dsp"
  
  # bitstream_filters
  mjpeg2jpeg_bsf_select="jpegtables"
  
  # external libraries
 -libdcadec_decoder_deps="libdcadec"
 -libfaac_encoder_deps="libfaac"
 -libfaac_encoder_select="audio_frame_queue"
 +aac_at_decoder_deps="audiotoolbox"
 +ac3_at_decoder_deps="audiotoolbox"
 +ac3_at_decoder_select="ac3_parser"
 +adpcm_ima_qt_at_decoder_deps="audiotoolbox"
 +alac_at_decoder_deps="audiotoolbox"
 +amr_nb_at_decoder_deps="audiotoolbox"
 +avisynth_deps_any="dlopen LoadLibrary"
 +avisynth_demuxer_deps="avisynth"
 +avisynth_demuxer_select="riffdec"
 +eac3_at_decoder_deps="audiotoolbox"
 +eac3_at_decoder_select="ac3_parser"
 +gsm_ms_at_decoder_deps="audiotoolbox"
 +ilbc_at_decoder_deps="audiotoolbox"
 +mp1_at_decoder_deps="audiotoolbox"
 +mp2_at_decoder_deps="audiotoolbox"
 +mp3_at_decoder_deps="audiotoolbox"
++mp1_at_decoder_select="mpegaudioheader"
++mp2_at_decoder_select="mpegaudioheader"
++mp3_at_decoder_select="mpegaudioheader"
 +pcm_alaw_at_decoder_deps="audiotoolbox"
 +pcm_mulaw_at_decoder_deps="audiotoolbox"
 +qdmc_at_decoder_deps="audiotoolbox"
 +qdm2_at_decoder_deps="audiotoolbox"
 +aac_at_encoder_deps="audiotoolbox"
 +aac_at_encoder_select="audio_frame_queue"
 +alac_at_encoder_deps="audiotoolbox"
 +alac_at_encoder_select="audio_frame_queue"
 +ilbc_at_encoder_deps="audiotoolbox"
 +ilbc_at_encoder_select="audio_frame_queue"
 +pcm_alaw_at_encoder_deps="audiotoolbox"
 +pcm_alaw_at_encoder_select="audio_frame_queue"
 +pcm_mulaw_at_encoder_deps="audiotoolbox"
 +pcm_mulaw_at_encoder_select="audio_frame_queue"
 +chromaprint_muxer_deps="chromaprint"
 +h264_videotoolbox_encoder_deps="videotoolbox_encoder pthreads"
 +libcelt_decoder_deps="libcelt"
  libfdk_aac_decoder_deps="libfdk_aac"
  libfdk_aac_encoder_deps="libfdk_aac"
  libfdk_aac_encoder_select="audio_frame_queue"
@@@ -2846,9 -2252,8 +2851,9 @@@ libgsm_ms_encoder_deps="libgsm
  libilbc_decoder_deps="libilbc"
  libilbc_encoder_deps="libilbc"
  libkvazaar_encoder_deps="libkvazaar"
 +libmodplug_demuxer_deps="libmodplug"
  libmp3lame_encoder_deps="libmp3lame"
- libmp3lame_encoder_select="audio_frame_queue"
+ libmp3lame_encoder_select="audio_frame_queue mpegaudioheader"
  libopencore_amrnb_decoder_deps="libopencore_amrnb"
  libopencore_amrnb_encoder_deps="libopencore_amrnb"
  libopencore_amrnb_encoder_select="audio_frame_queue"

diff --cc libavcodec/Makefile
index dc6371e,0beeda4..e856626
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -98,12 -79,10 +98,11 @@@ OBJS-$(CONFIG_LLVIDENCDSP)             
  OBJS-$(CONFIG_LPC)                     += lpc.o
  OBJS-$(CONFIG_LSP)                     += lsp.o
  OBJS-$(CONFIG_LZF)                     += lzf.o
 -OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o
 +OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o mdct_fixed_32.o
  OBJS-$(CONFIG_ME_CMP)                  += me_cmp.o
 +OBJS-$(CONFIG_MEDIACODEC)              += mediacodecdec_common.o mediacodec_surface.o mediacodec_wrapper.o mediacodec_sw_buffer.o
  OBJS-$(CONFIG_MPEG_ER)                 += mpeg_er.o
- OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodata.o   \
-                                           mpegaudiodecheader.o
+ OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o
  OBJS-$(CONFIG_MPEGAUDIODSP)            += mpegaudiodsp.o                \
                                            mpegaudiodsp_data.o           \
                                            mpegaudiodsp_fixed.o          \
@@@ -838,41 -651,15 +838,40 @@@ OBJS-$(CONFIG_LATM_MUXER)              
  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_MXF_MUXER)               += dnxhddata.o
  OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 +OBJS-$(CONFIG_NUT_DEMUXER)             += mpegaudiodata.o mpeg4audio.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
  
 +# 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_MP1_AT_DECODER)             += audiotoolboxdec.o
++OBJS-$(CONFIG_MP2_AT_DECODER)             += audiotoolboxdec.o
++OBJS-$(CONFIG_MP3_AT_DECODER)             += audiotoolboxdec.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
@@@ -952,9 -732,7 +951,8 @@@ OBJS-$(CONFIG_MLP_PARSER)              
  OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \
                                            mpeg4videodec.o mpeg4video.o \
                                            ituh263dec.o h263dec.o h263data.o
- OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o \
-                                           mpegaudiodecheader.o mpegaudiodata.o
 +OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
+ OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o
  OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
                                            mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_OPUS_PARSER)             += opus_parser.o opus.o vorbis_data.o