diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:26:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:36:40 +0100 |
| commit | e98bac82e5152f492ef05deff562abb2c68ec2ca (patch) | |
| tree | 58771a16707237f10d5074213c625ef5160aabdb /libavcodec/motion_est.c | |
| parent | 011d83de488d2051c485a1618dda0a43d77bcbc7 (diff) | |
| parent | 82bb3048013201c0095d2853d4623633d912252f (diff) | |
| download | ffmpeg-e98bac82e5152f492ef05deff562abb2c68ec2ca.tar.gz | |
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/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 0e5f9d1baa..19053967a5 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -286,7 +286,9 @@ static int cmp_qpel(MpegEncContext *s, const int x, const int y, const int subx, #include "motion_est_template.c" -static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){ +static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b, + int stride, int h) +{ return 0; } |