[FFmpeg-devel] [PATCH 71/72] avcodec/mpegutils.h: Move DELAYED_PIC_REF macro to h264dec.h
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Wed Feb 2 08:01:57 EET 2022
It is only used by the H.264 decoder (as well as the dirac decoder,
which already uses a local copy).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavcodec/h264dec.h | 5 +++++
libavcodec/mpegutils.h | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 8168c8e97b..2a06d9a092 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -139,6 +139,11 @@ typedef struct H264Picture {
int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF
int field_picture; ///< whether or not picture was encoded in separate fields
+/**
+ * H264Picture.reference has this flag set,
+ * when the picture is held for delayed output.
+ */
+#define DELAYED_PIC_REF (1 << 2)
int reference;
int recovered; ///< picture at IDR or recovery point + recovery count
int invalid_gap;
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index 07705854b3..c92f9192db 100644
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -37,12 +37,6 @@
#define PICT_BOTTOM_FIELD 2
#define PICT_FRAME 3
-/**
- * Value of Picture.reference when Picture is not a reference picture, but
- * is held for delayed output.
- */
-#define DELAYED_PIC_REF 4
-
#define MAX_MB_BYTES (30 * 16 * 16 * 3 / 8 + 120)
#define MAX_FCODE 7
--
2.32.0
More information about the ffmpeg-devel
mailing list