summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-08 23:06:05 +0000
committerstefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-08 23:06:05 +0000
commit45a1edd1df1c48fad2ad3c6c8ef1e7ab3137d57a (patch)
treeb2462a0f78de047a6828842dbb183575e3fe992e /libswscale
parentf6ff53adcca9ccefda471b3a0e16dd89ba82d581 (diff)
downloadmpv-45a1edd1df1c48fad2ad3c6c8ef1e7ab3137d57a.tar.bz2
mpv-45a1edd1df1c48fad2ad3c6c8ef1e7ab3137d57a.tar.xz
Drop the deprecated sws_scale_ordered() at the next major version
bump. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28492 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c2
-rw-r--r--libswscale/swscale.h2
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);