diff options
| author | Alexis Ballier <alexis.ballier@gmail.com> | 2010-01-19 16:30:20 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2010-01-19 16:30:20 +0000 |
| commit | f28cc5771f1fc98609cbf74a02db35b8beff1e22 (patch) | |
| tree | 0a6250497c0eab260e79acbfe407b3c22ca5909a | |
| parent | ff6e82a968c02d01ff9c5fb891b56af12a0f650c (diff) | |
| download | ffmpeg-f28cc5771f1fc98609cbf74a02db35b8beff1e22.tar.gz | |
Make const prototypes for input sources of sws_scale_* stricter.
Patch by Alexis Ballier gmailify($firstname, $familyname)
Originally committed as revision 30374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 2cffc5d4e5..1f276cbf22 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2926,7 +2926,7 @@ static void reset_ptr(const uint8_t* src[], int format) * 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_t* src[], int srcStride[], int srcSlice } #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 --git a/libswscale/swscale.h b/libswscale/swscale.h index 878962384c..4127454945 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -184,13 +184,13 @@ struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat * 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 |