diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-08 23:06:05 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-08 23:06:05 +0000 |
| commit | c099766fad39988a3da1e48041e18a6bdcb1f594 (patch) | |
| tree | 2605fd34c133f7b653fa8ebaa32ce03f950491cf | |
| parent | 96b27045d2ee683db270aa91d6ddff0d92e1cf6d (diff) | |
| download | ffmpeg-c099766fad39988a3da1e48041e18a6bdcb1f594.tar.gz | |
Drop the deprecated sws_scale_ordered() at the next major version
bump.
Originally committed as revision 28492 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 88ac39757e..a6d18b4b90 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2820,6 +2820,7 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, } } +#if LIBSWSCALE_VERSION_MAJOR < 1 /** * swscale wrapper, so we don't need to export the SwsContext. */ @@ -2827,6 +2828,7 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli int srcSliceH, uint8_t* dst[], int dstStride[]){ return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); } +#endif SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, float lumaSharpen, float chromaSharpen, diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 70a47a9eba..2c3f6c34ff 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -118,8 +118,10 @@ struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat SwsFilter *srcFilter, SwsFilter *dstFilter, double *param); int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]); +#if LIBSWSCALE_VERSION_MAJOR < 1 int sws_scale_ordered(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) attribute_deprecated; +#endif int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation); |