RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5' 

* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-12 15:02:23 +02:00
parent 07f6a3d787 c0779a67e8
commit 44fb7de8ee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mp3dec.c
View File

@ -360,6 +360,6 @@ AVInputFormat ff_mp3_demuxer = {
.read_seek = mp3_seek, .read_seek = mp3_seek,
.priv_data_size = sizeof(MP3DecContext), .priv_data_size = sizeof(MP3DecContext),
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "mp2,mp3,m2a", /* XXX: use probe */ .extensions = "mp2,mp3,m2a,mpa", /* XXX: use probe */
.priv_class = &demuxer_class, .priv_class = &demuxer_class,
}; };

2
libavformat/mp3enc.c
View File

@ -385,7 +385,7 @@ AVOutputFormat ff_mp2_muxer = {
.name = "mp2", .name = "mp2",
.long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
.mime_type = "audio/x-mpeg", .mime_type = "audio/x-mpeg",
.extensions = "mp2,m2a", .extensions = "mp2,m2a,mpa",
.audio_codec = AV_CODEC_ID_MP2, .audio_codec = AV_CODEC_ID_MP2,
.video_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,