# HG changeset patch # User bcoudurier # Date 1206721822 0 # Node ID 5c8fc77cf10aac5a6af4f3c2d0c38c8849d6e9f0 # Parent 196e3f07b4d7d9dc84741605bcb9fdaf77fef7e6 gsm in mov, demux surge-1-16-B-agsm.mov diff -r 196e3f07b4d7 -r 5c8fc77cf10a isom.c --- a/isom.c Fri Mar 28 10:40:19 2008 +0000 +++ b/isom.c Fri Mar 28 16:30:22 2008 +0000 @@ -159,6 +159,7 @@ { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ + { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */ { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */ diff -r 196e3f07b4d7 -r 5c8fc77cf10a mov.c --- a/mov.c Fri Mar 28 10:40:19 2008 +0000 +++ b/mov.c Fri Mar 28 16:30:22 2008 +0000 @@ -931,6 +931,7 @@ st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ st->need_parsing = AVSTREAM_PARSE_FULL; break; + case CODEC_ID_GSM: case CODEC_ID_ADPCM_MS: case CODEC_ID_ADPCM_IMA_WAV: st->codec->block_align = sc->bytes_per_frame;