[FFmpeg-cvslog] Support gsm_ms in caf files.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jul  9 17:13:13 2011 +0200| [43e96d0466094e3780260fa896046b1ecbb8ff06] | committer: Carl Eugen Hoyos

Support gsm_ms in caf files.

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

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

diff --git a/libavformat/caf.c b/libavformat/caf.c
index 907562a..d49cc0b 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -41,6 +41,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
     { 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_GSM_MS,          MKBETAG('m','s', 0, '1') },
     { CODEC_ID_MACE3,           MKBETAG('M','A','C','3') },
     { CODEC_ID_MACE6,           MKBETAG('M','A','C','6') },
     { CODEC_ID_MP3,             MKBETAG('.','m','p','3') },
diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index 4156c49..7cb4777 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
@@ -72,6 +72,8 @@ static uint32_t samples_per_packet(enum CodecID codec_id) {
     case CODEC_ID_GSM:
     case CODEC_ID_QCELP:
         return 160;
+    case CODEC_ID_GSM_MS:
+        return 320;
     case CODEC_ID_MP1:
         return 384;
     case CODEC_ID_MP2: