Module: libav Branch: master Commit: ec7d002e55590bf9e2c2745065ec3463364a5273
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Wed May 15 11:51:03 2013 +0300 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ö <[email protected]> --- libavcodec/mss2.c | 2 +- libavcodec/vc1dec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 44b6f1f..2562209 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 a3b6031..86806b1 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; } } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
