diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-28 00:30:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-28 03:21:12 +0200 |
| commit | 464c49155ce7ffc88ed39eb2511e7a75565c24be (patch) | |
| tree | fbe25083835f99eb459c6b4a3549152648f921ad /libavcodec/apedec.c | |
| parent | 8ca170a78ab6e50f44d27d8a6b4ad7ba1ed81f0c (diff) | |
| download | ffmpeg-streaming-464c49155ce7ffc88ed39eb2511e7a75565c24be.zip ffmpeg-streaming-464c49155ce7ffc88ed39eb2511e7a75565c24be.tar.gz | |
apedec: set s->samples only when init_frame_decoder succeeded
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>
Diffstat (limited to 'libavcodec/apedec.c')
| -rw-r--r-- | libavcodec/apedec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 536361c..ffd54c1 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1461,13 +1461,13 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, nblocks); return AVERROR_INVALIDDATA; } - s->samples = nblocks; /* Initialize the frame decoder */ if (init_frame_decoder(s) < 0) { av_log(avctx, AV_LOG_ERROR, "Error reading frame header\n"); return AVERROR_INVALIDDATA; } + s->samples = nblocks; } if (!s->data) { |
