summaryrefslogtreecommitdiff
path: root/libavcodec/gsm_parser.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2013-09-07 21:06:22 +0200
committerAnton Khirnov <anton@khirnov.net>2013-11-26 08:31:10 +0100
commita16577d9857206089fd8bce6a342b31dbd7fb9b0 (patch)
tree45a4d07e2dddcd076bd0bf04ed2b4c65ed8e5d44 /libavcodec/gsm_parser.c
parent56d061ce9da954560892e3551513d5ecc0439846 (diff)
MSN Audio support
This is essentially a MS GSM decoder extension that supports more sampling rates and lower bitrates. Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/gsm_parser.c')
-rw-r--r--libavcodec/gsm_parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/gsm_parser.c b/libavcodec/gsm_parser.c
index 1d381fc109..c0befc7796 100644
--- a/libavcodec/gsm_parser.c
+++ b/libavcodec/gsm_parser.c
@@ -50,7 +50,8 @@ static int gsm_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
s->duration = GSM_FRAME_SIZE;
break;
case AV_CODEC_ID_GSM_MS:
- s->block_size = GSM_MS_BLOCK_SIZE;
+ s->block_size = avctx->block_align ? avctx->block_align
+ : GSM_MS_BLOCK_SIZE;
s->duration = GSM_FRAME_SIZE * 2;
break;
default: