[FFmpeg-cvslog] r30374 - in trunk/libswscale: swscale.c swscale.h
benoit
subversion
Tue Jan 19 17:30:20 CET 2010
Author: benoit
Date: Tue Jan 19 17:30:20 2010
New Revision: 30374
Log:
Make const prototypes for input sources of sws_scale_* stricter.
Patch by Alexis Ballier gmailify($firstname, $familyname)
Modified:
trunk/libswscale/swscale.c
trunk/libswscale/swscale.h
Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c Tue Jan 19 16:42:51 2010 (r30373)
+++ trunk/libswscale/swscale.c Tue Jan 19 17:30:20 2010 (r30374)
@@ -2926,7 +2926,7 @@ static void reset_ptr(const uint8_t* src
* 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 @@ int sws_scale(SwsContext *c, const uint8
}
#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);
Modified: trunk/libswscale/swscale.h
==============================================================================
--- trunk/libswscale/swscale.h Tue Jan 19 16:42:51 2010 (r30373)
+++ trunk/libswscale/swscale.h Tue Jan 19 17:30:20 2010 (r30374)
@@ -184,13 +184,13 @@ struct SwsContext *sws_getContext(int sr
* 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
More information about the ffmpeg-cvslog
mailing list