Support decoding of amr_nb and gsm in caf.

[ffmpeg] / libavformat / caf.c

diff --git a/libavformat/caf.c b/libavformat/caf.c
index fd916746d8c42784d4b7666e712d4295b0b8a5d9..907562a0827025cfe43cc912f9937a93c3688c64 100644 (file)
--- 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') },