diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 11:19:25 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 11:20:15 +0100 |
| commit | a0bc6b51d4f6d01eb4bcaec5489ca67037687a77 (patch) | |
| tree | 5618d262eea09d2ebcc227ed80a8587906ae7e92 | |
| parent | cd70ffaac8b74d88ed1460e10c7e9c02d067e3ca (diff) | |
| parent | e72d6fa08a3c1876109149401753a8d2c736d418 (diff) | |
| download | ffmpeg-a0bc6b51d4f6d01eb4bcaec5489ca67037687a77.tar.gz | |
Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'
* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -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 66ef2ac02c..8c189064f1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -820,7 +820,6 @@ 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_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 diff --git a/libavformat/Makefile b/libavformat/Makefile index e6bfc42dbc..5ee0debb83 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -285,7 +285,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o replaygain.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 --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 4c97fa113b..49f3742dc4 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -490,21 +490,6 @@ static int query_codec(enum AVCodecID id, int std_compliance) return -1; } -#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}, @@ -652,4 +637,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 730e99a020..0edcd1cf99 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -337,6 +337,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", |