diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:07:22 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-27 22:24:50 +0100 |
| commit | 873379939299046b30cdec26a837171029ef8099 (patch) | |
| tree | 573138ee943cc452bedaea4abe31baf49bf5bc87 | |
| parent | 4d388c0cd05dd4de545e8ea333ab4de7d67ad12d (diff) | |
| download | ffmpeg-873379939299046b30cdec26a837171029ef8099.tar.gz | |
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.
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |