diff options
| author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2016-05-14 11:28:18 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-05-16 10:51:01 +0200 |
| commit | e4b38878da6b38ef5ca54ce14be985d6ae088834 (patch) | |
| tree | dea24b72eb6070ec336ac9e8302d582b207bf782 | |
| parent | 31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3 (diff) | |
| download | ffmpeg-e4b38878da6b38ef5ca54ce14be985d6ae088834.tar.gz | |
Move check_marker() from get_bits to mpeg4videodec
MPEG-4 is the only decoder which uses check_marker().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/get_bits.h | 9 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index b8debb9d02..ce765119e7 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -364,15 +364,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n) } } -static inline int check_marker(GetBitContext *s, const char *msg) -{ - int bit = get_bits1(s); - if (!bit) - av_log(NULL, AV_LOG_INFO, "Marker bit missing %s\n", msg); - - return bit; -} - /** * Initialize GetBitContext. * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 40d281bea7..1c1a9c0e67 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -51,6 +51,15 @@ static const int mb_type_b_map[4] = { MB_TYPE_L0 | MB_TYPE_16x16, }; +static inline int check_marker(GetBitContext *s, const char *msg) +{ + int bit = get_bits1(s); + if (!bit) + av_log(NULL, AV_LOG_INFO, "Marker bit missing %s\n", msg); + + return bit; +} + /** * Predict the ac. * @param n block index (0-3 are luma, 4-5 are chroma) |