diff options
author | Clément Bœsch <u@pkh.me> | 2016-06-22 20:07:46 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-06-22 20:07:49 +0200 |
commit | 6c98398b0be7e7f3a03d5f3b64d16f7a0e444e7f (patch) | |
tree | 08da12ab9fc2f099718928e3b45d41ecfe7d895e /libavcodec/ituh263dec.c | |
parent | 7475a9351f57a157cddf47db7a00b7922c7bd994 (diff) | |
download | ffmpeg-6c98398b0be7e7f3a03d5f3b64d16f7a0e444e7f.tar.gz |
lavc/get_bits: add a logging context to check_marker()
Based on d338abb664febbc2c7266af7818aab1f12dbc161
Diffstat (limited to 'libavcodec/ituh263dec.c')
-rw-r--r-- | libavcodec/ituh263dec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index e4a7ad4238..a26244f393 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -175,17 +175,17 @@ static int h263_decode_gob_header(MpegEncContext *s) return -1; if(s->h263_slice_structured){ - if(check_marker(&s->gb, "before MBA")==0) + if(check_marker(s->avctx, &s->gb, "before MBA")==0) return -1; ff_h263_decode_mba(s); if(s->mb_num > 1583) - if(check_marker(&s->gb, "after MBA")==0) + if(check_marker(s->avctx, &s->gb, "after MBA")==0) return -1; s->qscale = get_bits(&s->gb, 5); /* SQUANT */ - if(check_marker(&s->gb, "after SQUANT")==0) + if(check_marker(s->avctx, &s->gb, "after SQUANT")==0) return -1; skip_bits(&s->gb, 2); /* GFID */ }else{ @@ -904,7 +904,7 @@ int ff_h263_decode_picture_header(MpegEncContext *s) s->picture_number= (s->picture_number&~0xFF) + i; /* PTYPE starts here */ - if (check_marker(&s->gb, "in PTYPE") != 1) { + if (check_marker(s->avctx, &s->gb, "in PTYPE") != 1) { return -1; } if (get_bits1(&s->gb) != 0) { @@ -1025,7 +1025,7 @@ int ff_h263_decode_picture_header(MpegEncContext *s) 6-14 - reserved */ width = (get_bits(&s->gb, 9) + 1) * 4; - check_marker(&s->gb, "in dimensions"); + check_marker(s->avctx, &s->gb, "in dimensions"); height = get_bits(&s->gb, 9) * 4; ff_dlog(s->avctx, "\nH.263+ Custom picture: %dx%d\n",width,height); if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { @@ -1120,13 +1120,13 @@ int ff_h263_decode_picture_header(MpegEncContext *s) return AVERROR_INVALIDDATA; if(s->h263_slice_structured){ - if (check_marker(&s->gb, "SEPB1") != 1) { + if (check_marker(s->avctx, &s->gb, "SEPB1") != 1) { return -1; } ff_h263_decode_mba(s); - if (check_marker(&s->gb, "SEPB2") != 1) { + if (check_marker(s->avctx, &s->gb, "SEPB2") != 1) { return -1; } } |