diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 22:14:58 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 22:14:58 +0000 |
| commit | ccec1b69c0395feef6ce4e290d2eb95cc3fc8997 (patch) | |
| tree | ec7967a3c99a9f12fb7f6897f818e6376d656461 /libavformat | |
| parent | d88812a91fc3ace08dc461d1156c6169ea312e45 (diff) | |
| download | ffmpeg-ccec1b69c0395feef6ce4e290d2eb95cc3fc8997.tar.gz | |
m4v/m4a are usual itunes/ipod/iphone extensions
Originally committed as revision 13737 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 20dcecc7d2..b33fc2422a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1690,7 +1690,7 @@ AVOutputFormat mp4_muxer = { "mp4", NULL_IF_CONFIG_SMALL("MP4 format"), "application/mp4", - "mp4,m4a", + "mp4", sizeof(MOVContext), CODEC_ID_AAC, CODEC_ID_MPEG4, @@ -1738,7 +1738,7 @@ AVOutputFormat ipod_muxer = { "ipod", NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"), "application/mp4", - NULL, + "m4v,m4a", sizeof(MOVContext), CODEC_ID_AAC, CODEC_ID_H264, |