From 95af01e97b1ca1b39a0e05b8f7f934f70b429d9d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 24 Jan 2022 18:00:04 +0100 Subject: lavc/h264dec.h: Move MMCOOpcode to h264_parse.h 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(-) 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 @@ -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. */ -- cgit v1.2.3