From: Martin Storsjö Date: Wed, 15 May 2013 08:51:03 +0000 (+0300) Subject: vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header X-Git-Tag: n2.0~26^2~356 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=ec7d002e55590bf9e2c2745065ec3463364a5273 vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header This is required if we return other error codes than explicitly -1, which so far has been the only other possible return value besides 0. Signed-off-by: Martin Storsjö --- diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 44b6f1f62c..2562209324 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -388,7 +388,7 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, s->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL; - if (ff_vc1_parse_frame_header(v, &s->gb) == -1) { + if (ff_vc1_parse_frame_header(v, &s->gb) < 0) { av_log(v->s.avctx, AV_LOG_ERROR, "header error\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index a3b6031752..86806b1d21 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5464,11 +5464,11 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, // do parse frame header v->pic_header_flag = 0; if (v->profile < PROFILE_ADVANCED) { - if (ff_vc1_parse_frame_header(v, &s->gb) == -1) { + if (ff_vc1_parse_frame_header(v, &s->gb) < 0) { goto err; } } else { - if (ff_vc1_parse_frame_header_adv(v, &s->gb) == -1) { + if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) { goto err; } }