Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'

* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
  build: Move MP2 muxer declaration away from MP3 muxer code

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

diff --cc libavcodec/Makefile
index 66ef2ac02c0f36bd03e50ce18eec8652aaaf4d9c,09b16e753942ab599843a9e1349de574ab8f758c..8c189064f14e1fa210e62bba4390e4674009b24e
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -816,21 -645,16 +816,20 @@@ OBJS-$(CONFIG_FLV_DEMUXER)             
  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                  \
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += mpeg4audio.o vorbis_data.o    \
                                            flac.o flacdata.o
 -OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o
 +OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o vorbis_data.o
  OBJS-$(CONFIG_MOV_DEMUXER)             += ac3tab.o
- OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.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
 -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

diff --cc libavformat/Makefile
index e6bfc42dbc71bc82395dcfa1247d560ce306a49d,d06d5d6d82c33361e265ef1d9cf032f75db179ed..5ee0debb83415d30904b9f623dcfd021ae3971c2
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -267,25 -184,19 +267,25 @@@ OBJS-$(CONFIG_MATROSKA_DEMUXER
                                              flac_picture.o replaygain.o
  OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
                                              avc.o hevc.o \
 -                                            flacenc_header.o avlanguage.o vorbiscomment.o wv.o
 -OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
 +                                            flacenc_header.o avlanguage.o vorbiscomment.o wv.o \
 +                                            webmdashenc.o webm_chunk.o
 +OBJS-$(CONFIG_MD5_MUXER)                 += hashenc.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 mov_chan.o replaygain.o
 -OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o avc.o hevc.o \
 -                                            movenchint.o mov_chan.o
 +OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o avc.o hevc.o vpcc.o \
 +                                            movenchint.o mov_chan.o rtp.o \
 +                                            movenccenc.o rawutils.o
- OBJS-$(CONFIG_MP2_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
+ OBJS-$(CONFIG_MP2_MUXER)                 += rawenc.o
  OBJS-$(CONFIG_MP3_DEMUXER)               += mp3dec.o replaygain.o
  OBJS-$(CONFIG_MP3_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
  OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o apetag.o img2.o

diff --cc libavformat/mp3enc.c
index 4c97fa113b8fd5e4788ad49052db082a18448a49,a62c7f6c8c2c260ae5e9309dfc5dd8c165b01c72..49f3742dc4a97cefa00d87c3bd2fc65f99b9e0d7
--- 1/libavformat/mp3enc.c
--- 2/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@@ -479,32 -432,6 +479,17 @@@ static int mp3_write_trailer(struct AVF
      return 0;
  }
  
- #if CONFIG_MP2_MUXER
- AVOutputFormat ff_mp2_muxer = {
-     .name              = "mp2",
-     .long_name         = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
-     .mime_type         = "audio/mpeg",
-     .extensions        = "mp2,m2a,mpa",
-     .audio_codec       = AV_CODEC_ID_MP2,
-     .video_codec       = AV_CODEC_ID_NONE,
-     .write_packet      = ff_raw_write_packet,
-     .flags             = AVFMT_NOTIMESTAMPS,
- };
- #endif
- 
- #if CONFIG_MP3_MUXER
- 
 +static int query_codec(enum AVCodecID id, int std_compliance)
 +{
 +    const CodecMime *cm= ff_id3v2_mime_tags;
 +    while(cm->id != AV_CODEC_ID_NONE) {
 +        if(id == cm->id)
 +            return MKTAG('A', 'P', 'I', 'C');
 +        cm++;
 +    }
 +    return -1;
 +}
 +
  static const AVOption options[] = {
      { "id3v2_version", "Select ID3v2 version to write. Currently 3 and 4 are supported.",
        offsetof(MP3Context, id3v2_version), AV_OPT_TYPE_INT, {.i64 = 4}, 0, 4, AV_OPT_FLAG_ENCODING_PARAM},

diff --cc libavformat/rawenc.c
Simple merge