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.

Andreas Rheinhardt committed 1 year ago

Commit 34b624d1 parent b29ae291 file · +4 −2Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

@@ -23,7 +23,6 @@ · 22 unmodified lines
23	23	#include <stdatomic.h>
24	24
25	25	#include "avcodec.h"
26		−#include "me_cmp.h"
27	26
28	27	/// current MB is the first after a resync marker
29	28	#define VP_START 1
@@ -37,6 +36,8 @@ · 7 unmodified lines
37	36	#define ER_MB_ERROR (ER_AC_ERROR\|ER_DC_ERROR\|ER_MV_ERROR)
38	37	#define ER_MB_END (ER_AC_END\|ER_DC_END\|ER_MV_END)
39	38
	39	+typedef struct MPVEncContext MPVEncContext;
	40	+
40	41	typedef struct ERPicture {
41	42	AVFrame *f;
42	43	const struct ThreadFrame *tf;
@@ -53,7 +54,8 @@ typedef struct ERPicture { · 10 unmodified lines
53	54	typedef struct ERContext {
54	55	AVCodecContext *avctx;
55	56
56		− me_cmp_func sad;
	57	+ int (sad)(MPVEncContext unused, const uint8_t *blk1,
	58	+ const uint8_t *blk2, ptrdiff_t stride, int h);
57	59	int mecc_inited;
58	60
59	61	int *mb_index2xy;

Keyboard shortcuts