[FFmpeg-devel] [PATCH 2/3] avcodec/error_resilience: Constify ThreadFrame*

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Tue Oct 10 04:27:19 EEST 2023


Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49.
While just at it, also use a forward declaration.

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

diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
index b03f8ec896..1346639c3c 100644
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -24,7 +24,6 @@
 
 #include "avcodec.h"
 #include "me_cmp.h"
-#include "threadframe.h"
 
 ///< current MB is the first after a resync marker
 #define VP_START               1
@@ -40,7 +39,7 @@
 
 typedef struct ERPicture {
     AVFrame *f;
-    ThreadFrame *tf;
+    const struct ThreadFrame *tf;
 
     // it is the caller's responsibility to allocate these buffers
     int16_t (*motion_val[2])[2];
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index b4ea0ed880..0009b539e7 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -43,6 +43,7 @@
 #include "h264qpel.h"
 #include "h274.h"
 #include "mpegutils.h"
+#include "threadframe.h"
 #include "videodsp.h"
 
 #define H264_MAX_PICTURE_COUNT 36
-- 
2.34.1



More information about the ffmpeg-devel mailing list