diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 17:05:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 17:05:59 +0100 |
| commit | c00686518c0b80905f785b0e29a75b6fb806553e (patch) | |
| tree | 60ec1be35ef36ec0f0dae27cdcee16ce6d530977 | |
| parent | 269b3c8799f446a512d8a084da5c00a3e8a3a87b (diff) | |
| download | ffmpeg-c00686518c0b80905f785b0e29a75b6fb806553e.tar.gz | |
avcodec/h263dec: fix handling of AV_EF_EXPLODE
This fixes checking a variable that had been overwritten before.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h263dec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index a5955b7acb..40d223736a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -375,6 +375,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int buf_size = avpkt->size; MpegEncContext *s = avctx->priv_data; int ret; + int slice_ret = 0; AVFrame *pict = data; s->flags = avctx->flags; @@ -705,7 +706,7 @@ retry: s->mb_x = 0; s->mb_y = 0; - ret = decode_slice(s); + slice_ret = decode_slice(s); while (s->mb_y < s->mb_height) { if (s->msmpeg4_version) { if (s->slice_height == 0 || s->mb_x != 0 || @@ -723,7 +724,7 @@ retry: ff_mpeg4_clean_buffers(s); if (decode_slice(s) < 0) - ret = AVERROR_INVALIDDATA; + slice_ret = AVERROR_INVALIDDATA; } if (s->msmpeg4_version && s->msmpeg4_version < 4 && @@ -812,7 +813,7 @@ frame_end: *got_frame = 1; } - if (ret && (avctx->err_recognition & AV_EF_EXPLODE)) + if (slice_ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; else return get_consumed_bytes(s, buf_size); |