[FFmpeg-cvslog] h263dec: sanitize a condition.
Anton Khirnov
git at videolan.org
Thu Nov 28 11:23:03 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 26 11:07:22 2013 +0100| [873379939299046b30cdec26a837171029ef8099] | committer: Anton Khirnov
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=873379939299046b30cdec26a837171029ef8099
---
libavcodec/h263dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index fceb217..48e67cb 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;
More information about the ffmpeg-cvslog
mailing list