diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-01-27 19:06:36 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-07-04 18:16:11 +0200 |
| commit | c9a2506de9e906e82c4c99df759fcfc1142b24a4 (patch) | |
| tree | bc36abbb44313265f5670f23a3861d3f136082db | |
| parent | 8cfb44cd2ec76306f0c4fbfd030b411f77298074 (diff) | |
| download | ffmpeg-c9a2506de9e906e82c4c99df759fcfc1142b24a4.tar.gz | |
get_bits: move check_marker() to mpegvideodec.h
It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263,
ituh263, mpeg4video.
| -rw-r--r-- | libavcodec/get_bits.h | 11 | ||||
| -rw-r--r-- | libavcodec/intelh263dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideodec.h | 12 |
4 files changed, 14 insertions, 11 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 16f8af5107..992765dc92 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -31,7 +31,6 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/log.h" #include "libavutil/avassert.h" #include "defs.h" @@ -610,16 +609,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/intelh263dec.c b/libavcodec/intelh263dec.c index e7e821d3b3..ded0a7f618 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -21,6 +21,7 @@ #include "codec_internal.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "h263data.h" #include "h263dec.h" #include "mpegvideodata.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index f01c942f04..af054360d8 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -48,6 +48,7 @@ #include "rv10dec.h" #include "mpeg4video.h" #include "mpegvideodata.h" +#include "mpegvideodec.h" #include "mpeg4videodec.h" // The defines below define the number of bits that are read at once for diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h index 1af8ebac36..fabc1b2202 100644 --- a/libavcodec/mpegvideodec.h +++ b/libavcodec/mpegvideodec.h @@ -29,6 +29,8 @@ #define AVCODEC_MPEGVIDEODEC_H #include "libavutil/frame.h" +#include "libavutil/log.h" + #include "avcodec.h" #include "get_bits.h" #include "mpegpicture.h" @@ -67,4 +69,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_MPEGVIDEODEC_H */ |