virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/error_resilience: Avoid me_cmp.h inclusion

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt
2025-03-19 17:03:31 +01:00
parent b29ae29ee7
commit 34b624d98c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/error_resilience.h
View File

@ -23,7 +23,6 @@
#include <stdatomic.h> #include <stdatomic.h>
#include "avcodec.h" #include "avcodec.h"
#include "me_cmp.h"
/// current MB is the first after a resync marker /// current MB is the first after a resync marker
#define VP_START 1 #define VP_START 1
@ -37,6 +36,8 @@
#define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR) #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) #define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END)
typedef struct MPVEncContext MPVEncContext;
typedef struct ERPicture { typedef struct ERPicture {
AVFrame *f; AVFrame *f;
const struct ThreadFrame *tf; const struct ThreadFrame *tf;
@ -53,7 +54,8 @@ typedef struct ERPicture {
typedef struct ERContext { typedef struct ERContext {
AVCodecContext *avctx; 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 mecc_inited;
int *mb_index2xy; int *mb_index2xy;