[FFmpeg-cvslog] Support decoding of amr_nb and gsm in caf.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun May 15 02:42:58 2011 +0200| [0c3803f6bb50038970ee40daa25cfb3ea484febd] | committer: Carl Eugen Hoyos

Support decoding of amr_nb and gsm in caf.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c3803f6bb50038970ee40daa25cfb3ea484febd
---

 libavformat/caf.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/caf.c b/libavformat/caf.c
index fd91674..907562a 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') },