diff options
| author | Dan Christiansen | 2003-10-19 20:57:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer | 2003-10-19 20:57:47 +0000 |
| commit | 4cb3f3b6376474ae251421d5bb318998a3776ae8 (patch) | |
| tree | 87400aaf32c4950756d4fbfdb54e3b882721faf1 /libavformat/mov.c | |
| parent | cf9d24adf66bcb99ee168301d40b297266a62203 (diff) | |
Using the extension m4a for audio only MPEG-4 files is increasingly
common, especially since Apple iTunes treats files with the two
extensions differently. Without the patch, FFmpeg won't know that m4a
is for MPEG-4 files
patch by (Dan Christiansen <danchr at daimi dot au dot dk>)
Originally committed as revision 2398 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index b834eaa69e..4d768a29ce 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -120,7 +120,7 @@ static const CodecTag mov_audio_tags[] = { { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */ /* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ /* MP4 tags */ - { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG 4 AAC or audio ? */ + { CODEC_ID_MPEG4AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */ /* The standard for mpeg4 audio is still not normalised AFAIK anyway */ { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ @@ -1658,7 +1658,7 @@ static int mov_read_close(AVFormatContext *s) } static AVInputFormat mov_iformat = { - "mov", + "mov,mp4,m4a,3gp", "QuickTime/MPEG4 format", sizeof(MOVContext), mov_probe, |