diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
commit | 6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (patch) | |
tree | 502e9b517e24b857069884bda22575eaf9c2779c /libavfilter/yadif.h | |
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/yadif.h')
-rw-r--r-- | libavfilter/yadif.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index d2084fa86e..b7e8852660 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -53,8 +53,8 @@ typedef struct YADIFContext { AVFilterBufferRef *next; AVFilterBufferRef *prev; AVFilterBufferRef *out; - void (*filter_line)(uint8_t *dst, - uint8_t *prev, uint8_t *cur, uint8_t *next, + void (*filter_line)(void *dst, + void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); const AVPixFmtDescriptor *csp; |