# HG changeset patch # User benoit # Date 1263918620 0 # Node ID b4c3e12c9a08cd50cf9392e6f7f2842f6bdbf746 # Parent 4398e647c2eaaf95117551c238ab7948458c5300 Make const prototypes for input sources of sws_scale_* stricter. Patch by Alexis Ballier gmailify($firstname, $familyname) diff -r 4398e647c2ea -r b4c3e12c9a08 libswscale/swscale.c --- a/libswscale/swscale.c Tue Jan 19 15:42:51 2010 +0000 +++ b/libswscale/swscale.c Tue Jan 19 16:30:20 2010 +0000 @@ -2926,7 +2926,7 @@ * swscale wrapper, so we don't need to export the SwsContext. * Assumes planar YUV to be in YUV order instead of YVU. */ -int sws_scale(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +int sws_scale(SwsContext *c, const uint8_t* const src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { int i; @@ -3046,7 +3046,7 @@ } #if LIBSWSCALE_VERSION_MAJOR < 1 -int sws_scale_ordered(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +int sws_scale_ordered(SwsContext *c, const uint8_t* const src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); diff -r 4398e647c2ea -r b4c3e12c9a08 libswscale/swscale.h --- a/libswscale/swscale.h Tue Jan 19 15:42:51 2010 +0000 +++ b/libswscale/swscale.h Tue Jan 19 16:30:20 2010 +0000 @@ -184,13 +184,13 @@ * the destination image * @return the height of the output slice */ -int sws_scale(struct SwsContext *context, const uint8_t* srcSlice[], int srcStride[], +int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]); #if LIBSWSCALE_VERSION_MAJOR < 1 /** * @deprecated Use sws_scale() instead. */ -int sws_scale_ordered(struct SwsContext *context, const uint8_t* src[], +int sws_scale_ordered(struct SwsContext *context, const uint8_t* const src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) attribute_deprecated; #endif