diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-12 17:35:20 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-12 17:35:20 +0200 |
| commit | 45ecc7a294d56e41dab621512f6f70fc2578340e (patch) | |
| tree | bdf82590f52e60b6f3199d8735910b98aaa691b0 /libavformat/caf.c | |
| parent | afa218f372ad2616e6609e2c3b41ef458261a431 (diff) | |
| download | ffmpeg-45ecc7a294d56e41dab621512f6f70fc2578340e.tar.gz | |
Support adpcm_ima_wav and adpcm_ms in caf.
Diffstat (limited to 'libavformat/caf.c')
| -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 1f3057dd63..faed166dfe 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_ADPCM_IMA_WAV, MKBETAG('m','s', 0, 17 ) }, + { CODEC_ID_ADPCM_MS, MKBETAG('m','s', 0, 2 ) }, { CODEC_ID_AMR_NB, MKBETAG('s','a','m','r') }, { CODEC_ID_GSM, MKBETAG('a','g','s','m') }, { CODEC_ID_GSM_MS, MKBETAG('m','s', 0, '1') }, |