Commit 8c3ab309 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 58eca517
...@@ -771,7 +771,7 @@ static void reset_ptr(const uint8_t* src[], int format) ...@@ -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 int linesizes[4])
{ {
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
...@@ -806,7 +806,7 @@ int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[], ...@@ -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"); av_log(c, AV_LOG_ERROR, "bad src image pointers\n");
return 0; 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"); av_log(c, AV_LOG_ERROR, "bad dst image pointers\n");
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment