diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-09 17:13:13 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-09 17:13:13 +0200 |
| commit | 43e96d0466094e3780260fa896046b1ecbb8ff06 (patch) | |
| tree | 46e419170f9b6f460f35c224429f83d76b8240b0 /libavformat | |
| parent | a7aabda267d6e2277ac8e234a603ebee3ede2fca (diff) | |
| download | ffmpeg-43e96d0466094e3780260fa896046b1ecbb8ff06.tar.gz | |
Support gsm_ms in caf files.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/caf.c | 1 | ||||
| -rw-r--r-- | libavformat/cafenc.c | 2 |
2 files changed, 3 insertions, 0 deletions
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: |