ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat Jul 25 03:15:56 2015 +0200| [1909a9151cceac37a26103410fc3323a920211af] | committer: Michael Niedermayer
swscale/output: Fix "warning: assignment from incompatible pointer type" Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1909a9151cceac37a26103410fc3323a920211af --- libswscale/output.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index ca60bf2..31e1023 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2010,11 +2010,15 @@ yuv2ya8_X_c(SwsContext *c, const int16_t *lumFilter, static void yuv2ayuv64le_X_c(SwsContext *c, const int16_t *lumFilter, - const int32_t **lumSrc, int lumFilterSize, - const int16_t *chrFilter, const int32_t **chrUSrc, - const int32_t **chrVSrc, int chrFilterSize, - const int32_t **alpSrc, uint8_t *dest, int dstW, int y) + const int16_t **_lumSrc, int lumFilterSize, + const int16_t *chrFilter, const int16_t **_chrUSrc, + const int16_t **_chrVSrc, int chrFilterSize, + const int16_t **_alpSrc, uint8_t *dest, int dstW, int y) { + const int32_t **lumSrc = (const int32_t **) _lumSrc, + **chrUSrc = (const int32_t **) _chrUSrc, + **chrVSrc = (const int32_t **) _chrVSrc, + **alpSrc = (const int32_t **) _alpSrc; int hasAlpha = !!alpSrc; int i; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
