summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-01-24 18:00:04 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-01-24 20:12:18 +0100
commit95af01e97b1ca1b39a0e05b8f7f934f70b429d9d (patch)
tree8d89b5610378bac4fe4b9bf5319a9a10724fff0a
parentabee2cd9f022d337ebd498bb40d9f64da0c14fbf (diff)
lavc/h264dec.h: Move MMCOOpcode to h264_parse.h
Both parser and decoder use these, so h264_parse is the proper place for them.
-rw-r--r--libavcodec/h264_parse.h13
-rw-r--r--libavcodec/h264dec.h13
2 files changed, 13 insertions, 13 deletions
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 4f72743acc..5d93e61d2d 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -103,19 +103,6 @@
#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.
*/
typedef struct MMCO {