virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vf_yadif: silence a warning.

Browse Source 
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
This commit is contained in:
Anton Khirnov 2013-01-26 20:49:16 +01:00
parent 48a4ffa722
commit 99162f8d46
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_yadif.c
View File

@ -81,10 +81,14 @@
next2++; \ next2++; \
} }
static void filter_line_c(uint8_t *dst, static void filter_line_c(void *dst1,
uint8_t *prev, uint8_t *cur, uint8_t *next, void *prev1, void *cur1, void *next1,
int w, int prefs, int mrefs, int parity, int mode) int w, int prefs, int mrefs, int parity, int mode)
{ {
uint8_t *dst = dst1;
uint8_t *prev = prev1;
uint8_t *cur = cur1;
uint8_t *next = next1;
int x; int x;
uint8_t *prev2 = parity ? prev : cur ; uint8_t *prev2 = parity ? prev : cur ;
uint8_t *next2 = parity ? cur : next; uint8_t *next2 = parity ? cur : next;
@ -92,11 +96,15 @@ static void filter_line_c(uint8_t *dst,
FILTER FILTER
} }
static void filter_line_c_16bit(uint16_t *dst, static void filter_line_c_16bit(void *dst1,
uint16_t *prev, uint16_t *cur, uint16_t *next, void *prev1, void *cur1, void *next1,
int w, int prefs, int mrefs, int parity, int w, int prefs, int mrefs, int parity,
int mode) int mode)
{ {
uint16_t *dst = dst1;
uint16_t *prev = prev1;
uint16_t *cur = cur1;
uint16_t *next = next1;
int x; int x;
uint16_t *prev2 = parity ? prev : cur ; uint16_t *prev2 = parity ? prev : cur ;
uint16_t *next2 = parity ? cur : next; uint16_t *next2 = parity ? cur : next;

12
libavfilter/x86/vf_yadif_init.c
View File

@ -27,14 +27,14 @@
#include "libavcodec/x86/dsputil_mmx.h" #include "libavcodec/x86/dsputil_mmx.h"
#include "libavfilter/yadif.h" #include "libavfilter/yadif.h"
void ff_yadif_filter_line_mmxext(uint8_t *dst, uint8_t *prev, uint8_t *cur, void ff_yadif_filter_line_mmxext(void *dst, void *prev, void *cur,
uint8_t *next, int w, int prefs, void *next, int w, int prefs,
int mrefs, int parity, int mode); int mrefs, int parity, int mode);
void ff_yadif_filter_line_sse2(uint8_t *dst, uint8_t *prev, uint8_t *cur, void ff_yadif_filter_line_sse2(void *dst, void *prev, void *cur,
uint8_t *next, int w, int prefs, void *next, int w, int prefs,
int mrefs, int parity, int mode); int mrefs, int parity, int mode);
void ff_yadif_filter_line_ssse3(uint8_t *dst, uint8_t *prev, uint8_t *cur, void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur,
uint8_t *next, int w, int prefs, void *next, int w, int prefs,
int mrefs, int parity, int mode); int mrefs, int parity, int mode);
av_cold void ff_yadif_init_x86(YADIFContext *yadif) av_cold void ff_yadif_init_x86(YADIFContext *yadif)

4
libavfilter/yadif.h
View File

@ -50,8 +50,8 @@ typedef struct YADIFContext {
AVFilterBufferRef *next; AVFilterBufferRef *next;
AVFilterBufferRef *prev; AVFilterBufferRef *prev;
AVFilterBufferRef *out; AVFilterBufferRef *out;
void (*filter_line)(uint8_t *dst, void (*filter_line)(void *dst,
uint8_t *prev, uint8_t *cur, uint8_t *next, void *prev, void *cur, void *next,
int w, int prefs, int mrefs, int parity, int mode); int w, int prefs, int mrefs, int parity, int mode);
const AVPixFmtDescriptor *csp; const AVPixFmtDescriptor *csp;