From e4b38878da6b38ef5ca54ce14be985d6ae088834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?=
<alexandra.khirnova@gmail.com>
Date: Sat, 14 May 2016 11:28:18 +0200
Subject: [PATCH] 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>
---
libavcodec/get_bits.h | 9 ---------
libavcodec/mpeg4videodec.c | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index b8debb9d028..ce765119e7e 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 40d281bea70..1c1a9c0e67c 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)
--
GitLab