avcodec/lossless_videodsp: fix incompatible pointer type warning

Michael Niedermayer committed 12 years ago

Commit ebf2c2c1 parent ae8e2d72 files · +3 −3Browse files

Unified · Split

2 files

libavcodec/lossless_videodsp.h +1 −1
libavcodec/x86/lossless_videodsp_init.c +2 −2

libavcodec/lossless_videodsp.h+1−1

@@ -31,7 +31,7 @@ typedef struct LLVidDSPContext { · 30 unmodified lines
31	31
32	32	void (sub_hfyu_median_prediction_int16)(uint16_t dst, const uint16_t src1, const uint16_t src2, unsigned mask, int w, int left, int left_top);
33	33	void (add_hfyu_median_prediction_int16)(uint16_t dst, const uint16_t top, const uint16_t diff, unsigned mask, int w, int left, int left_top);
34		− int (add_hfyu_left_prediction_int16)(uint16_t dst, const uint16_t *src, unsigned mask, int w, int left);
	34	+ int (add_hfyu_left_prediction_int16)(uint16_t dst, const uint16_t *src, unsigned mask, int w, unsigned left);
35	35	} LLVidDSPContext;
36	36
37	37	void ff_llviddsp_init(LLVidDSPContext llviddsp, AVCodecContext avctx);

libavcodec/x86/lossless_videodsp_init.c+2−2

@@ -26,8 +26,8 @@ void ff_add_int16_mmx(uint16_t dst, const uint16_t src, unsigned mask, int w); · 25 unmodified lines
26	26	void ff_add_int16_sse2(uint16_t dst, const uint16_t src, unsigned mask, int w);
27	27	void ff_diff_int16_mmx (uint16_t dst, const uint16_t src1, const uint16_t *src2, unsigned mask, int w);
28	28	void ff_diff_int16_sse2(uint16_t dst, const uint16_t src1, const uint16_t *src2, unsigned mask, int w);
29		−int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t dst, const uint16_t src, unsigned mask, int w, int acc);
30		−int ff_add_hfyu_left_prediction_int16_sse4(uint16_t dst, const uint16_t src, unsigned mask, int w, int acc);
	29	+int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t dst, const uint16_t src, unsigned mask, int w, unsigned acc);
	30	+int ff_add_hfyu_left_prediction_int16_sse4(uint16_t dst, const uint16_t src, unsigned mask, int w, unsigned acc);
31	31	void ff_add_hfyu_median_prediction_int16_mmxext(uint16_t dst, const uint16_t top, const uint16_t diff, unsigned mask, int w, int left, int *left_top);
32	32	void ff_sub_hfyu_median_prediction_int16_mmxext(uint16_t dst, const uint16_t src1, const uint16_t src2, unsigned mask, int w, int left, int *left_top);
33	33