diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 13:19:25 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 13:20:15 +0300 |
| commit | a0bc6b51d4f6d01eb4bcaec5489ca67037687a77 (patch) | |
| tree | 5618d262eea09d2ebcc227ed80a8587906ae7e92 /libavformat/rawenc.c | |
| parent | cd70ffaac8b74d88ed1460e10c7e9c02d067e3ca (diff) | |
| parent | e72d6fa08a3c1876109149401753a8d2c736d418 (diff) | |
Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'
* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/rawenc.c')
| -rw-r--r-- | libavformat/rawenc.c | 13 |
1 files changed, 13 insertions, 0 deletions
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", |