From 1f32ad151711b371cb1a7a50c138868f3d94e73c Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Wed, 19 Mar 2025 17:03:31 +0100
Subject: [PATCH 75/77] avcodec/error_resilience: Avoid me_cmp.h inclusion
Use spell out what me_cmp_func means.
Avoids inclusions in the H.264 decoder as well as all
mpegvideo decoders.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/error_resilience.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
index 4005018676..8e43219b09 100644
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -23,7 +23,6 @@
#include <stdatomic.h>
#include "avcodec.h"
-#include "me_cmp.h"
/// current MB is the first after a resync marker
#define VP_START 1
@@ -37,6 +36,8 @@
#define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR)
#define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END)
+typedef struct MPVEncContext MPVEncContext;
+
typedef struct ERPicture {
AVFrame *f;
const struct ThreadFrame *tf;
@@ -53,7 +54,8 @@ typedef struct ERPicture {
typedef struct ERContext {
AVCodecContext *avctx;
- me_cmp_func sad;
+ int (*sad)(MPVEncContext *unused, const uint8_t *blk1,
+ const uint8_t *blk2, ptrdiff_t stride, int h);
int mecc_inited;
int *mb_index2xy;
--
2.45.2