From 43e96d0466094e3780260fa896046b1ecbb8ff06 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sat, 9 Jul 2011 17:13:13 +0200
Subject: [PATCH] Support gsm_ms in caf files.
---
libavformat/caf.c | 1 +
libavformat/cafenc.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/libavformat/caf.c b/libavformat/caf.c
index 907562a082..d49cc0b9f3 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 4156c49f7a..7cb4777bc6 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: