aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-18 21:58:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-18 22:00:33 +0100
commit8c3ab3094b81ffc4525b2038d10aa5d744f16d71 (patch)
tree1c664ec263666d4b914f12667436982f4012564e /libswscale
parent58eca5178ac0844a6980ca1156b8db7e6a3a76d1 (diff)
downloadffmpeg-8c3ab3094b81ffc4525b2038d10aa5d744f16d71.tar.gz
sws: Fix:
libswscale/swscale_unscaled.c:805:5: warning: passing argument 1 of ‘check_image_pointers’ from incompatible pointer type libswscale/swscale_unscaled.c:774:12: note: expected ‘uint8_t **’ but argument is of type ‘const uint8_t * const*’ libswscale/swscale_unscaled.c:809:5: warning: passing argument 1 of ‘check_image_pointers’ discards qualifiers from pointer target type libswscale/swscale_unscaled.c:774:12: note: expected ‘uint8_t **’ but argument is of type ‘uint8_t * const*’ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_unscaled.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index d6c16e3cda..02f8e9c1cf 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -771,7 +771,7 @@ static void reset_ptr(const uint8_t* src[], int format)
}
}
-static int check_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt,
+static int check_image_pointers(const uint8_t * const data[4], enum PixelFormat pix_fmt,
const int linesizes[4])
{
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
@@ -806,7 +806,7 @@ int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
av_log(c, AV_LOG_ERROR, "bad src image pointers\n");
return 0;
}
- if (!check_image_pointers(dst, c->dstFormat, dstStride)) {
+ if (!check_image_pointers((const uint8_t* const*)dst, c->dstFormat, dstStride)) {
av_log(c, AV_LOG_ERROR, "bad dst image pointers\n");
return 0;
}