Skip to content

F
ffmpeg.wasm-core
Commit e0827ba4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

.m1v and .m2a (feature req #1178960) 

Originally committed as revision 4431 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5b2ad9f5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavformat/mp3.c
View file @ e0827ba4
...@@ -350,7 +350,7 @@ AVInputFormat mp3_iformat = { ...@@ -350,7 +350,7 @@ AVInputFormat mp3_iformat = {
mp3_read_header, mp3_read_header,
mp3_read_packet, mp3_read_packet,
mp3_read_close, mp3_read_close,
.extensions = "mp2,mp3", /* XXX: use probe */ .extensions = "mp2,mp3,m2a", /* XXX: use probe */
}; };
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
...@@ -359,9 +359,9 @@ AVOutputFormat mp2_oformat = { ...@@ -359,9 +359,9 @@ AVOutputFormat mp2_oformat = {
"MPEG audio layer 2", "MPEG audio layer 2",
"audio/x-mpeg", "audio/x-mpeg",
#ifdef CONFIG_MP3LAME #ifdef CONFIG_MP3LAME
"mp2", "mp2,m2a",
#else #else
"mp2,mp3", "mp2,mp3,m2a",
#endif #endif
0, 0,
CODEC_ID_MP2, CODEC_ID_MP2,
......
libavformat/raw.c
View file @ e0827ba4
...@@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = { ...@@ -479,7 +479,7 @@ AVOutputFormat mpeg1video_oformat = {
"mpeg1video", "mpeg1video",
"MPEG video", "MPEG video",
"video/x-mpeg", "video/x-mpeg",
"mpg,mpeg", "mpg,mpeg,m1v",
0, 0,
0, 0,
CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment