generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

Browse Source 
* commit '82bb3048013201c0095d2853d4623633d912252f':
  dsputil: Use correct type in me_cmp_func function pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-20 22:26:58 +01:00
parent 011d83de48 82bb304801
commit e98bac82e5
9 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/motion_est.c
View File

@@ -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;
}