From 873379939299046b30cdec26a837171029ef8099 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Nov 2013 11:07:22 +0100 Subject: h263dec: sanitize a condition. Call ff_mpeg4_decode_picture_header() only when the decoder has the MPEG4 codec id, not based on a vaguely related value of h263_pred. --- libavcodec/h263dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h263dec.c') diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index fceb217254..48e67cb658 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -434,7 +434,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ret = ff_wmv2_decode_picture_header(s); } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { ret = ff_msmpeg4_decode_picture_header(s); - } else if (CONFIG_MPEG4_DECODER && s->h263_pred) { + } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { if (s->avctx->extradata_size && s->picture_number == 0) { GetBitContext gb; -- cgit v1.2.3