diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 17:53:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 17:53:49 +0400 |
| commit | 6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (patch) | |
| tree | 502e9b517e24b857069884bda22575eaf9c2779c /libavfilter/x86 | |
| parent | fadf845973aeb47d1b0bf3eac552394fd8a71437 (diff) | |
| parent | 238614de679a71970c20d7c3fee08a322967ec40 (diff) | |
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_yadif_init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index dc14c67fdd..8d5e76833f 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -26,14 +26,14 @@ #include "libavcodec/x86/dsputil_mmx.h" #include "libavfilter/yadif.h" -void ff_yadif_filter_line_mmxext(uint8_t *dst, uint8_t *prev, uint8_t *cur, - uint8_t *next, int w, int prefs, +void ff_yadif_filter_line_mmxext(void *dst, void *prev, void *cur, + void *next, int w, int prefs, int mrefs, int parity, int mode); -void ff_yadif_filter_line_sse2(uint8_t *dst, uint8_t *prev, uint8_t *cur, - uint8_t *next, int w, int prefs, +void ff_yadif_filter_line_sse2(void *dst, void *prev, void *cur, + void *next, int w, int prefs, int mrefs, int parity, int mode); -void ff_yadif_filter_line_ssse3(uint8_t *dst, uint8_t *prev, uint8_t *cur, - uint8_t *next, int w, int prefs, +void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur, + void *next, int w, int prefs, int mrefs, int parity, int mode); av_cold void ff_yadif_init_x86(YADIFContext *yadif) |