diff mbox series

[FFmpeg-devel,v2,04/18] lavc/h264dec.h: Move MMCOOpcode to h264_parse.h

Message ID AM7PR03MB66605F26804539169BC319A08F5E9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 5484c502db4a932aec22422b6a456a707310f155
Headers show
Series [FFmpeg-devel,v2,01/18] avcodec/h264dec: Move find_start_code() to its only user | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 24, 2022, 8:09 p.m. UTC 
From: Anton Khirnov <anton@khirnov.net>

Both parser and decoder use these, so h264_parse is the proper place for
them.
---
 libavcodec/h264_parse.h | 13 +++++++++++++
 libavcodec/h264dec.h    | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Anton Khirnov Jan. 26, 2022, 11:02 a.m. UTC | #1 
Quoting Andreas Rheinhardt (2022-01-24 21:09:17)
> From: Anton Khirnov <anton@khirnov.net>
> 
> Both parser and decoder use these, so h264_parse is the proper place for
                              ^^^^^
                              it
diff mbox series

Patch

diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h
index 4d01620125..05732326d3 100644
--- a/libavcodec/h264_parse.h
+++ b/libavcodec/h264_parse.h
@@ -27,6 +27,19 @@ 
 #include "get_bits.h"
 #include "h264_ps.h"
 
+/**
+ * Memory management control operation opcode.
+ */
+typedef enum MMCOOpcode {
+    MMCO_END = 0,
+    MMCO_SHORT2UNUSED,
+    MMCO_LONG2UNUSED,
+    MMCO_SHORT2LONG,
+    MMCO_SET_MAX_LONG,
+    MMCO_RESET,
+    MMCO_LONG,
+} MMCOOpcode;
+
 typedef struct H264PredWeightTable {
     int use_weight;
     int use_weight_chroma;
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 38a4e96e26..c7662f930e 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -102,19 +102,6 @@ 
 #define IS_REF0(a)         ((a) & MB_TYPE_REF0)
 #define IS_8x8DCT(a)       ((a) & MB_TYPE_8x8DCT)
 
-/**
- * Memory management control operation opcode.
- */
-typedef enum MMCOOpcode {
-    MMCO_END = 0,
-    MMCO_SHORT2UNUSED,
-    MMCO_LONG2UNUSED,
-    MMCO_SHORT2LONG,
-    MMCO_SET_MAX_LONG,
-    MMCO_RESET,
-    MMCO_LONG,
-} MMCOOpcode;
-
 /**
  * Memory management control operation.
  */