From 883120aaf04a42252ff95d0f48934006feb8a94c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 4 Mar 2025 23:06:38 +0100 Subject: [PATCH] avcodec/mpeg12dec: Use proper logcontext When used with the "mpegvideo" or "mpeg1video" decoder (which do not have a private class) this would lead to the log callback receiving a non-NULL object with a NULL AVClass pointer. The default log callback handles this gracefully, yet it is probably an API violation. Reviewed-by: Ramiro Polla Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 843640edbf..14c028379e 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1655,11 +1655,11 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, } eos: // end of slice if (get_bits_left(&s->gb) < 0) { - av_log(s, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb)); + av_log(s->avctx, AV_LOG_ERROR, "overread %d\n", -get_bits_left(&s->gb)); return AVERROR_INVALIDDATA; } *buf += (get_bits_count(&s->gb) - 1) / 8; - ff_dlog(s, "Slice start:%d %d end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); + ff_dlog(s->avctx, "Slice start:%d %d end:%d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); return 0; }