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

[stefano]

Author: stefano
Date: Mon Feb  9 00:06:05 2009
New Revision: 28492

Log:
Drop the deprecated sws_scale_ordered() at the next major version
bump.

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

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Mon Feb  9 00:02:06 2009	(r28491)
+++ trunk/libswscale/swscale.c	Mon Feb  9 00:06:05 2009	(r28492)
@@ -2820,6 +2820,7 @@ int sws_scale(SwsContext *c, uint8_t* sr
     }
 }
 
+#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, uin
                       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,

Modified: trunk/libswscale/swscale.h
==============================================================================
--- trunk/libswscale/swscale.h	Mon Feb  9 00:02:06 2009	(r28491)
+++ trunk/libswscale/swscale.h	Mon Feb  9 00:06:05 2009	(r28492)
@@ -118,8 +118,10 @@ struct SwsContext *sws_getContext(int sr
                                   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);