Mercurial > mplayer.hg
changeset 28457:7d49f24cc18f
Drop the deprecated sws_scale_ordered() at the next major version
bump.
| author | stefano |
|---|---|
| date | Sun, 08 Feb 2009 23:06:05 +0000 |
| parents | 2402abd3a2d5 |
| children | 6629e391d52d |
| files | libswscale/swscale.c libswscale/swscale.h |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Sun Feb 08 23:02:06 2009 +0000 +++ b/libswscale/swscale.c Sun Feb 08 23:06:05 2009 +0000 @@ -2820,6 +2820,7 @@ } } +#if LIBSWSCALE_VERSION_MAJOR < 1 /** * swscale wrapper, so we don't need to export the SwsContext. */ @@ -2827,6 +2828,7 @@ 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,
--- a/libswscale/swscale.h Sun Feb 08 23:02:06 2009 +0000 +++ b/libswscale/swscale.h Sun Feb 08 23:06:05 2009 +0000 @@ -118,8 +118,10 @@ 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);