diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-25 03:15:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-25 03:15:56 +0200 |
| commit | 1909a9151cceac37a26103410fc3323a920211af (patch) | |
| tree | 350e5ecb5db900a2d86c9721cc9a28d20556c3f3 | |
| parent | 8a173351895e29e842e3a299b0366faac80aff9a (diff) | |
| download | android_external_ffmpeg-1909a9151cceac37a26103410fc3323a920211af.tar.gz android_external_ffmpeg-1909a9151cceac37a26103410fc3323a920211af.tar.bz2 android_external_ffmpeg-1909a9151cceac37a26103410fc3323a920211af.zip | |
swscale/output: Fix "warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/output.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index ca60bf2596..31e10237d8 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; |