[FFmpeg-cvslog] r30381 - in trunk/libswscale: swscale.c swscale.h

conrad subversion
Thu Jan 21 10:52:11 CET 2010


Author: conrad
Date: Thu Jan 21 10:52:11 2010
New Revision: 30381

Log:
More const-correctness for sws_scale

Modified:
   trunk/libswscale/swscale.c
   trunk/libswscale/swscale.h

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Wed Jan 20 04:26:12 2010	(r30380)
+++ trunk/libswscale/swscale.c	Thu Jan 21 10:52:11 2010	(r30381)
@@ -2927,8 +2927,8 @@ 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* const src[], int srcStride[], int srcSliceY,
-              int srcSliceH, uint8_t* dst[], int dstStride[])
+int sws_scale(SwsContext *c, const uint8_t* const src[], const int srcStride[], int srcSliceY,
+              int srcSliceH, uint8_t* const dst[], const int dstStride[])
 {
     int i;
     const uint8_t* src2[4]= {src[0], src[1], src[2], src[3]};

Modified: trunk/libswscale/swscale.h
==============================================================================
--- trunk/libswscale/swscale.h	Wed Jan 20 04:26:12 2010	(r30380)
+++ trunk/libswscale/swscale.h	Thu Jan 21 10:52:11 2010	(r30381)
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 0
-#define LIBSWSCALE_VERSION_MINOR 8
+#define LIBSWSCALE_VERSION_MINOR 9
 #define LIBSWSCALE_VERSION_MICRO 0
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
@@ -184,8 +184,8 @@ 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* const srcSlice[], int srcStride[],
-              int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]);
+int sws_scale(struct SwsContext *context, const uint8_t* const srcSlice[], const int srcStride[],
+              int srcSliceY, int srcSliceH, uint8_t* const dst[], const int dstStride[]);
 #if LIBSWSCALE_VERSION_MAJOR < 1
 /**
  * @deprecated Use sws_scale() instead.



More information about the ffmpeg-cvslog mailing list