From 5cd03b68ef8943ca2e7bf8a18b9173ca3ca68642 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 27 Jan 2021 19:06:36 +0100 Subject: get_bits: move check_marker() to mpegvideo.h It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263, ituh263, mpeg4video. --- libavcodec/get_bits.h | 10 ---------- libavcodec/mpegvideo.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index d4e9276da1..498ce4ed35 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -610,16 +610,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n) } } -static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) -{ - int bit = get_bits1(s); - if (!bit) - av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", - get_bits_count(s) - 1, s->size_in_bits, msg); - - return bit; -} - static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer, int bit_size, int is_le) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 448fe2cedc..ed39288e35 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -782,4 +782,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s) return qscale << 1; } +static inline int check_marker(void *logctx, GetBitContext *s, const char *msg) +{ + int bit = get_bits1(s); + if (!bit) + av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n", + get_bits_count(s) - 1, s->size_in_bits, msg); + + return bit; +} + #endif /* AVCODEC_MPEGVIDEO_H */ -- cgit v1.2.3