generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apedec: set s->samples only when init_frame_decoder succeeded

Browse Source 
Otherwise range_start_decoding is not necessarily run and thus
ctx->rc.range still 0 in range_dec_normalize leading to an infinite
loop.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 464c49155c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andreas Cadhalpun
2015-04-28 00:30:51 +02:00
committed by Michael Niedermayer
parent cb63a8c646
commit d269eb2c11
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/apedec.c
View File

@@ -1476,13 +1476,13 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
nblocks); nblocks);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->samples = nblocks;
/* Initialize the frame decoder */ /* Initialize the frame decoder */
if (init_frame_decoder(s) < 0) { if (init_frame_decoder(s) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error reading frame header\n"); av_log(avctx, AV_LOG_ERROR, "Error reading frame header\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->samples = nblocks;
} }
if (!s->data) { if (!s->data) {