Skip to content

F
ffmpeg
Commit 43e96d04 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Support gsm_ms in caf files.

parent a7aabda2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
libavformat/caf.c
View file @ 43e96d04
...@@ -41,6 +41,7 @@ const AVCodecTag ff_codec_caf_tags[] = { ...@@ -41,6 +41,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
{ CODEC_ID_ADPCM_IMA_QT, MKBETAG('i','m','a','4') }, { CODEC_ID_ADPCM_IMA_QT, MKBETAG('i','m','a','4') },
{ CODEC_ID_AMR_NB, MKBETAG('s','a','m','r') }, { CODEC_ID_AMR_NB, MKBETAG('s','a','m','r') },
{ CODEC_ID_GSM, MKBETAG('a','g','s','m') }, { 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_MACE3, MKBETAG('M','A','C','3') },
{ CODEC_ID_MACE6, MKBETAG('M','A','C','6') }, { CODEC_ID_MACE6, MKBETAG('M','A','C','6') },
{ CODEC_ID_MP3, MKBETAG('.','m','p','3') }, { CODEC_ID_MP3, MKBETAG('.','m','p','3') },
......
libavformat/cafenc.c
View file @ 43e96d04
...@@ -72,6 +72,8 @@ static uint32_t samples_per_packet(enum CodecID codec_id) { ...@@ -72,6 +72,8 @@ static uint32_t samples_per_packet(enum CodecID codec_id) {
case CODEC_ID_GSM: case CODEC_ID_GSM:
case CODEC_ID_QCELP: case CODEC_ID_QCELP:
return 160; return 160;
case CODEC_ID_GSM_MS:
return 320;
case CODEC_ID_MP1: case CODEC_ID_MP1:
return 384; return 384;
case CODEC_ID_MP2: case CODEC_ID_MP2:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment