From 574978d2bdbc7a8c63e6030cf8b14233f8b0ac3b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 15 Apr 2015 14:36:03 +0200 Subject: [PATCH] avcodec/intelh263dec: Use check_marker() Signed-off-by: Michael Niedermayer --- libavcodec/intelh263dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 5ed1cdba72..1a0dd59d6a 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -37,8 +37,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) } s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ - if (get_bits1(&s->gb) != 1) { - av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n"); + if (check_marker(&s->gb, "after picture_number") != 1) { return -1; /* marker */ } if (get_bits1(&s->gb) != 0) { @@ -94,7 +93,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) if(format == 6){ int ar = get_bits(&s->gb, 4); skip_bits(&s->gb, 9); // display width - skip_bits1(&s->gb); + check_marker(&s->gb, "in dimensions"); skip_bits(&s->gb, 9); // display height if(ar == 15){ s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width