From 3bf1d787b58cf268f3c055d6f2509fd75258450b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 18 Dec 2011 18:57:56 +0100 Subject: [PATCH] adx_parser: Fix infinite loop. Signed-off-by: Michael Niedermayer --- libavcodec/adx_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adx_parser.c b/libavcodec/adx_parser.c index ebcb1370e5..f5d7989ecf 100644 --- a/libavcodec/adx_parser.c +++ b/libavcodec/adx_parser.c @@ -56,7 +56,6 @@ static int adx_parse(AVCodecParserContext *s1, if (ret = avpriv_adx_decode_header(avctx, pc->buffer, pc->index, &s->header_size, NULL)) return AVERROR_INVALIDDATA; - s->block_size = BLOCK_SIZE * avctx->channels; } if (s->header_size && s->header_size <= pc->index) { avctx->extradata = av_mallocz(s->header_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -71,6 +70,7 @@ static int adx_parse(AVCodecParserContext *s1, *poutbuf_size = 0; return buf_size; } + s->block_size = BLOCK_SIZE * avctx->channels; if (pc->index - s->buf_pos >= s->block_size) { *poutbuf = &pc->buffer[s->buf_pos];