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/mpeg12dec.c | |
parent | 7475a9351f57a157cddf47db7a00b7922c7bd994 (diff) | |
download | ffmpeg-streaming-6c98398b0be7e7f3a03d5f3b64d16f7a0e444e7f.zip ffmpeg-streaming-6c98398b0be7e7f3a03d5f3b64d16f7a0e444e7f.tar.gz |
lavc/get_bits: add a logging context to check_marker()
Based on d338abb664febbc2c7266af7818aab1f12dbc161
Diffstat (limited to 'libavcodec/mpeg12dec.c')
-rw-r--r-- | libavcodec/mpeg12dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 54a70e3..204a578 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -767,7 +767,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) s->last_mv[0][1][1] = mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]); - check_marker(&s->gb, "after concealment_motion_vectors"); + check_marker(s->avctx, &s->gb, "after concealment_motion_vectors"); } else { /* reset mv prediction */ memset(s->last_mv, 0, sizeof(s->last_mv)); @@ -1439,7 +1439,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) s->height |= (vert_size_ext << 12); bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ s->bit_rate += (bit_rate_ext << 18) * 400LL; - check_marker(&s->gb, "after bit rate extension"); + check_marker(s->avctx, &s->gb, "after bit rate extension"); s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10; s->low_delay = get_bits1(&s->gb); @@ -2130,7 +2130,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->frame_rate_index = 1; } s->bit_rate = get_bits(&s->gb, 18) * 400LL; - if (check_marker(&s->gb, "in sequence header") == 0) { + if (check_marker(s->avctx, &s->gb, "in sequence header") == 0) { return AVERROR_INVALIDDATA; } |