summaryrefslogtreecommitdiff
path: root/libavcodec/gsm_parser.c
diff options
context:
space:
mode:
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: