[FFmpeg-devel] [PATCH 13/57] avcodec/mpegutils: Move H.264-only macros to h264dec.h

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/h264dec.h   | 8 ++++++++
 libavcodec/mpegutils.h | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index fc50df90f2..ccd7583bf4 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -93,6 +93,14 @@
 
 #define IS_REF0(a)         ((a) & MB_TYPE_REF0)
 #define IS_8x8DCT(a)       ((a) & MB_TYPE_8x8DCT)
+#define IS_SUB_8X8(a)      ((a) & MB_TYPE_16x16) // note reused
+#define IS_SUB_8X4(a)      ((a) & MB_TYPE_16x8)  // note reused
+#define IS_SUB_4X8(a)      ((a) & MB_TYPE_8x16)  // note reused
+#define IS_SUB_4X4(a)      ((a) & MB_TYPE_8x8)   // note reused
+#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list))))
+
+// does this mb use listX, note does not work if subMBs
+#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list))))
 
 /**
  * Memory management control operation.
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index c58a14d497..43075191c6 100644
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -82,16 +82,8 @@
 #define IS_16X8(a)       ((a) & MB_TYPE_16x8)
 #define IS_8X16(a)       ((a) & MB_TYPE_8x16)
 #define IS_8X8(a)        ((a) & MB_TYPE_8x8)
-#define IS_SUB_8X8(a)    ((a) & MB_TYPE_16x16) // note reused
-#define IS_SUB_8X4(a)    ((a) & MB_TYPE_16x8)  // note reused
-#define IS_SUB_4X8(a)    ((a) & MB_TYPE_8x16)  // note reused
-#define IS_SUB_4X4(a)    ((a) & MB_TYPE_8x8)   // note reused
 #define IS_ACPRED(a)     ((a) & MB_TYPE_ACPRED)
 #define IS_QUANT(a)      ((a) & MB_TYPE_QUANT)
-#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list))))
-
-// does this mb use listX, note does not work if subMBs
-#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list))))
 
 #define HAS_CBP(a)       ((a) & MB_TYPE_CBP)
 #define HAS_FORWARD_MV(a)  ((a) & MB_TYPE_FORWARD_MV)
-- 
2.40.1