eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc/get_bits: add a logging context to check_marker()

Browse Source 
Based on d338abb664
This commit is contained in:
Clément Bœsch
2016-06-22 20:07:46 +02:00
parent 7475a9351f
commit 6c98398b0b
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/intelh263dec.c
View File

@@ -39,7 +39,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
}
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
if (check_marker(&s->gb, "after picture_number") != 1) {
if (check_marker(s->avctx, &s->gb, "after picture_number") != 1) {
return -1; /* marker */
}
if (get_bits1(&s->gb) != 0) {
@@ -95,7 +95,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
check_marker(&s->gb, "in dimensions");
check_marker(s->avctx, &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