diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-15 02:42:58 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-15 03:25:57 +0200 |
| commit | 0c3803f6bb50038970ee40daa25cfb3ea484febd (patch) | |
| tree | db4c531adec4557106b78ad5c4082fbd4618259a /libavformat | |
| parent | 445ee35e21c92e2429241d65bdba65f6e7c09132 (diff) | |
| download | ffmpeg-0c3803f6bb50038970ee40daa25cfb3ea484febd.tar.gz | |
Support decoding of amr_nb and gsm in caf.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/caf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c index fd916746d8..907562a082 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -39,6 +39,8 @@ const AVCodecTag ff_codec_caf_tags[] = { /*{ CODEC_ID_DVAUDIO, MKBETAG('v','d','v','a') },*/ /*{ CODEC_ID_DVAUDIO, MKBETAG('d','v','c','a') },*/ { CODEC_ID_ADPCM_IMA_QT, MKBETAG('i','m','a','4') }, + { CODEC_ID_AMR_NB, MKBETAG('s','a','m','r') }, + { CODEC_ID_GSM, MKBETAG('a','g','s','m') }, { CODEC_ID_MACE3, MKBETAG('M','A','C','3') }, { CODEC_ID_MACE6, MKBETAG('M','A','C','6') }, { CODEC_ID_MP3, MKBETAG('.','m','p','3') }, |