RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-10-28 17:05:59 +01:00
parent 269b3c8799
commit c00686518c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h263dec.c
View File

@ -375,6 +375,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int buf_size = avpkt->size; int buf_size = avpkt->size;
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
int ret; int ret;
int slice_ret = 0;
AVFrame *pict = data; AVFrame *pict = data;
s->flags = avctx->flags; s->flags = avctx->flags;
@ -705,7 +706,7 @@ retry:
s->mb_x = 0; s->mb_x = 0;
s->mb_y = 0; s->mb_y = 0;
ret = decode_slice(s); slice_ret = decode_slice(s);
while (s->mb_y < s->mb_height) { while (s->mb_y < s->mb_height) {
if (s->msmpeg4_version) { if (s->msmpeg4_version) {
if (s->slice_height == 0 || s->mb_x != 0 || if (s->slice_height == 0 || s->mb_x != 0 ||
@ -723,7 +724,7 @@ retry:
ff_mpeg4_clean_buffers(s); ff_mpeg4_clean_buffers(s);
if (decode_slice(s) < 0) if (decode_slice(s) < 0)
ret = AVERROR_INVALIDDATA; slice_ret = AVERROR_INVALIDDATA;
} }
if (s->msmpeg4_version && s->msmpeg4_version < 4 && if (s->msmpeg4_version && s->msmpeg4_version < 4 &&
@ -812,7 +813,7 @@ frame_end:
*got_frame = 1; *got_frame = 1;
} }
if (ret && (avctx->err_recognition & AV_EF_EXPLODE)) if (slice_ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
return ret; return ret;
else else
return get_consumed_bytes(s, buf_size); return get_consumed_bytes(s, buf_size);