OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d59389
)
motion_est: Fix warning from zero_cmp() assignment
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 14 Apr 2015 11:32:06 +0000
(13:32 +0200)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Sun, 19 Apr 2015 22:17:56 +0000
(23:17 +0100)
warning: incompatible
pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct
MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int
(MpegEncContext *, uint8_t *, uint8_t *, int, int)'
[-Wincompatible-pointer-types]
libavcodec/motion_est.c
patch
|
blob
|
history
diff --git
a/libavcodec/motion_est.c
b/libavcodec/motion_est.c
index
b14160f
..
3f4faa4
100644
(file)
--- a/
libavcodec/motion_est.c
+++ b/
libavcodec/motion_est.c
@@
-291,7
+291,7
@@
static int cmp_qpel(MpegEncContext *s, const int x, const int y, const int subx,
#include "motion_est_template.c"
static int zero_cmp(MpegEncContext *s, uint8_t *a, uint8_t *b,
-
in
t stride, int h)
+
ptrdiff_
t stride, int h)
{
return 0;
}