diff mbox series

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

Message ID DU0P250MB074779A640BB0D5E2131EDFE8FCDA@DU0P250MB0747.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit a7663c96044e51b48dd877f0ca4530bc36ba709a
Headers show
Series [FFmpeg-devel,1/3] avcodec/h264idct_template: Don't include h264dec.h | expand

Commit Message

Andreas Rheinhardt Oct. 10, 2023, 1:27 a.m. UTC
Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49.
While just at it, also use a forward declaration.

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

Comments

Michael Niedermayer Oct. 12, 2023, 8:24 p.m. UTC | #1
On Tue, Oct 10, 2023 at 03:27:19AM +0200, Andreas Rheinhardt wrote:
> Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49.
> While just at it, also use a forward declaration.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/error_resilience.h | 3 +--
>  libavcodec/h264dec.h          | 1 +
>  2 files changed, 2 insertions(+), 2 deletions(-)

LGTM

[...]
diff mbox series

Patch

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