highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/intelh263dec: Use check_marker()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-15 14:36:03 +02:00
parent 3163083f7b
commit 574978d2bd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/intelh263dec.c
View File

@ -37,8 +37,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
} }
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
if (get_bits1(&s->gb) != 1) { if (check_marker(&s->gb, "after picture_number") != 1) {
av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n");
return -1; /* marker */ return -1; /* marker */
} }
if (get_bits1(&s->gb) != 0) { if (get_bits1(&s->gb) != 0) {
@ -94,7 +93,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
if(format == 6){ if(format == 6){
int ar = get_bits(&s->gb, 4); int ar = get_bits(&s->gb, 4);
skip_bits(&s->gb, 9); // display width skip_bits(&s->gb, 9); // display width
skip_bits1(&s->gb); check_marker(&s->gb, "in dimensions");
skip_bits(&s->gb, 9); // display height skip_bits(&s->gb, 9); // display height
if(ar == 15){ if(ar == 15){
s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width