diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-07 00:19:02 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-09-07 01:10:14 +0200 |
| commit | b5d4c0e26e356ed11533ea43d83ab53d85f63781 (patch) | |
| tree | 78ea6ad2b0b15f4233c9598b8b794138556ca160 /libavformat/isom.c | |
| parent | d898ab90901525f048baa58173b62eebc6791807 (diff) | |
| download | ffmpeg-b5d4c0e26e356ed11533ea43d83ab53d85f63781.tar.gz | |
Support Speex in isom.
Adobe Flash Media Server produces such files although the f4v
specification does not allow Speex (nor Nellymoser).
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 7d5d6248c1..5955bb1fce 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -261,7 +261,7 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */ - { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, + { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's') }, /* Flash Media Server */ { CODEC_ID_QCELP, MKTAG('Q','c','l','p') }, { CODEC_ID_QCELP, MKTAG('Q','c','l','q') }, @@ -270,6 +270,8 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') }, /* QDMC */ { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */ + { CODEC_ID_SPEEX, MKTAG('s','p','e','x') }, /* Flash Media Server */ + { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, |