diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-06-28 13:53:29 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-06-29 20:24:10 +0200 |
| commit | e72d6fa08a3c1876109149401753a8d2c736d418 (patch) | |
| tree | 0678e715a3e44c44ed171103f1d4e48b1bac38aa | |
| parent | 67cb2c0f73ec08bdcecd675c1ffe25c3a5b26ef2 (diff) | |
| download | ffmpeg-e72d6fa08a3c1876109149401753a8d2c736d418.tar.gz | |
build: Move MP2 muxer declaration away from MP3 muxer code
The MP2 muxer uses none of the code of the MP3 muxer.
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/mp3enc.c | 16 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 13 |
4 files changed, 14 insertions, 18 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 55a8f2d8e1..09b16e7539 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -649,7 +649,6 @@ OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o \ flac.o flacdata.o OBJS-$(CONFIG_MATROSKA_MUXER) += flac.o flacdata.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_NUT_MUXER) += mpegaudiodata.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 48b66cf464..d06d5d6d82 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -196,7 +196,7 @@ OBJS-$(CONFIG_MMF_MUXER) += mmf.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_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 --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 24949cba65..a62c7f6c8c 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -432,21 +432,6 @@ static int mp3_write_trailer(struct AVFormatContext *s) 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 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}, @@ -589,4 +574,3 @@ AVOutputFormat ff_mp3_muxer = { .flags = AVFMT_NOTIMESTAMPS, .priv_class = &mp3_muxer_class, }; -#endif diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index e4c79bf3ee..60740fb405 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -231,6 +231,19 @@ AVOutputFormat ff_mlp_muxer = { }; #endif +#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_MPEG1VIDEO_MUXER AVOutputFormat ff_mpeg1video_muxer = { .name = "mpeg1video", |