Use spell out what me_cmp_func means. Avoids inclusions in the H.264 decoder as well as all mpegvideo decoders.
Unified · Split
| @@ -23,7 +23,6 @@ · 22 unmodified lines | |||
| 23 | #include <stdatomic.h> | 23 | #include <stdatomic.h> |
| 24 | 24 | ||
| 25 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 26 | #include "me_cmp.h" | ||
| 27 | 26 | ||
| 28 | /// current MB is the first after a resync marker | 27 | /// current MB is the first after a resync marker |
| 29 | #define VP_START 1 | 28 | #define VP_START 1 |
| @@ -37,6 +36,8 @@ · 7 unmodified lines | |||
| 37 | #define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR) | 36 | #define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR) |
| 38 | #define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END) | 37 | #define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END) |
| 39 | 38 | ||
| 39 | typedef struct MPVEncContext MPVEncContext; | ||
| 40 | |||
| 40 | typedef struct ERPicture { | 41 | typedef struct ERPicture { |
| 41 | AVFrame *f; | 42 | AVFrame *f; |
| 42 | const struct ThreadFrame *tf; | 43 | const struct ThreadFrame *tf; |
| @@ -53,7 +54,8 @@ typedef struct ERPicture { · 10 unmodified lines | |||
| 53 | typedef struct ERContext { | 54 | typedef struct ERContext { |
| 54 | AVCodecContext *avctx; | 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 | int mecc_inited; | 59 | int mecc_inited; |
| 58 | 60 | ||
| 59 | int *mb_index2xy; | 61 | int *mb_index2xy; |