Mercurial > libavformat.hg
changeset 3187:5c8fc77cf10a libavformat
gsm in mov, demux surge-1-16-B-agsm.mov
| author | bcoudurier |
|---|---|
| date | Fri, 28 Mar 2008 16:30:22 +0000 |
| parents | 196e3f07b4d7 |
| children | 87119f0c4736 |
| files | isom.c mov.c |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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;