diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 14:36:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 18:53:55 +0200 |
| commit | 574978d2bdbc7a8c63e6030cf8b14233f8b0ac3b (patch) | |
| tree | bd5d12f4c9a36e7932deee450ff6270379ca80a0 /libavcodec | |
| parent | 3163083f7b8fd836aad5222dbd01357f3434118b (diff) | |
| download | ffmpeg-574978d2bdbc7a8c63e6030cf8b14233f8b0ac3b.tar.gz | |
avcodec/intelh263dec: Use check_marker()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/intelh263dec.c | 5 |
1 files 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 |