diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 15:02:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 15:02:23 +0200 |
| commit | 44fb7de8ee6d344ce18d7b4c5d906da6c2c541cf (patch) | |
| tree | 581457978f478dc9be7ce60754cdec05a5894005 | |
| parent | 07f6a3d7873404d3600c536c02fbbda2d6dc0652 (diff) | |
| parent | c0779a67e85df856904ee6fab760c4233d4c2be5 (diff) | |
| download | ffmpeg-44fb7de8ee6d344ce18d7b4c5d906da6c2c541cf.tar.gz | |
Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'
* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
mp3: add .mpa extension
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mp3dec.c | 2 | ||||
| -rw-r--r-- | libavformat/mp3enc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 74b76e2501..e09d45a145 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -360,6 +360,6 @@ AVInputFormat ff_mp3_demuxer = { .read_seek = mp3_seek, .priv_data_size = sizeof(MP3DecContext), .flags = AVFMT_GENERIC_INDEX, - .extensions = "mp2,mp3,m2a", /* XXX: use probe */ + .extensions = "mp2,mp3,m2a,mpa", /* XXX: use probe */ .priv_class = &demuxer_class, }; diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index ee0956e8b9..185ac63255 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -385,7 +385,7 @@ AVOutputFormat ff_mp2_muxer = { .name = "mp2", .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .mime_type = "audio/x-mpeg", - .extensions = "mp2,m2a", + .extensions = "mp2,m2a,mpa", .audio_codec = AV_CODEC_ID_MP2, .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, |