diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-20 15:44:16 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-03-20 05:03:23 -0700 |
| commit | 82bb3048013201c0095d2853d4623633d912252f (patch) | |
| tree | 4b8e701fed59b8b2f37ac82c36143a69b67b7722 /libavcodec/dsputil.h | |
| parent | 0e083d7e43805db1a978cb57bfa25fda62e8ff18 (diff) | |
| download | ffmpeg-82bb3048013201c0095d2853d4623633d912252f.tar.gz | |
dsputil: Use correct type in me_cmp_func function pointer
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f8ac5eff5a..10479f9f78 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -108,12 +108,13 @@ DEF_OLD_QPEL(qpel8_mc32_old_c) DEF_OLD_QPEL(qpel8_mc13_old_c) DEF_OLD_QPEL(qpel8_mc33_old_c) +struct MpegEncContext; /* Motion estimation: * h is limited to { width / 2, width, 2 * width }, * but never larger than 16 and never smaller than 2. * Although currently h < 4 is not used as functions with * width < 8 are neither used nor implemented. */ -typedef int (*me_cmp_func)(void /* MpegEncContext */ *s, +typedef int (*me_cmp_func)(struct MpegEncContext *c, uint8_t *blk1 /* align width (8 or 16) */, uint8_t *blk2 /* align 1 */, int line_size, int h); |