ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Wed Mar 19 17:03:31 2025 +0100| [34b624d98cb8199befaba2ffc8a7b92c881cf03b] | committer: Andreas Rheinhardt
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.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34b624d98cb8199befaba2ffc8a7b92c881cf03b --- 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
