diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:37:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:37:20 +0100 |
| commit | 8c87658fdc657fa0c19c9b507645b03d5295eb49 (patch) | |
| tree | 3773185b8bb1de15485e5aef4784d38d47ff8d63 /libavcodec/gsmdec.c | |
| parent | ac021fdc40631f77a727f076f8748f89109c785b (diff) | |
| parent | a16577d9857206089fd8bce6a342b31dbd7fb9b0 (diff) | |
| download | ffmpeg-8c87658fdc657fa0c19c9b507645b03d5295eb49.tar.gz | |
Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
MSN Audio support
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsmdec.c')
| -rw-r--r-- | libavcodec/gsmdec.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 7ca9677923..077056a9be 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -55,7 +55,16 @@ static av_cold int gsm_init(AVCodecContext *avctx) break; case AV_CODEC_ID_GSM_MS: avctx->frame_size = 2 * GSM_FRAME_SIZE; - avctx->block_align = GSM_MS_BLOCK_SIZE; + if (!avctx->block_align) + avctx->block_align = GSM_MS_BLOCK_SIZE; + else + if (avctx->block_align < MSN_MIN_BLOCK_SIZE || + avctx->block_align > GSM_MS_BLOCK_SIZE || + (avctx->block_align - MSN_MIN_BLOCK_SIZE) % 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid block alignment %d\n", + avctx->block_align); + return AVERROR_INVALIDDATA; + } } return 0; @@ -87,12 +96,13 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&gb, buf, buf_size * 8); if (get_bits(&gb, 4) != 0xd) av_log(avctx, AV_LOG_WARNING, "Missing GSM magic!\n"); - res = gsm_decode_block(avctx, samples, &gb); + res = gsm_decode_block(avctx, samples, &gb, GSM_13000); if (res < 0) return res; break; case AV_CODEC_ID_GSM_MS: - res = ff_msgsm_decode_block(avctx, samples, buf); + res = ff_msgsm_decode_block(avctx, samples, buf, + (GSM_MS_BLOCK_SIZE - avctx->block_align) / 3); if (res < 0) return res; } |