diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 01:26:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 01:36:40 +0400 |
| commit | e98bac82e5152f492ef05deff562abb2c68ec2ca (patch) | |
| tree | 58771a16707237f10d5074213c625ef5160aabdb /libavcodec/dsputil.h | |
| parent | 011d83de488d2051c485a1618dda0a43d77bcbc7 (diff) | |
| parent | 82bb3048013201c0095d2853d4623633d912252f (diff) | |
Merge commit '82bb3048013201c0095d2853d4623633d912252f'
* commit '82bb3048013201c0095d2853d4623633d912252f':
dsputil: Use correct type in me_cmp_func function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 3f35e420f0..4e16c92bde 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); |