swscale: Undeprecate sws_getContext()

sws_getCachedContext is not a full replacement for the function.

diff --git a/doc/APIchanges b/doc/APIchanges
index 344b3e56b6c82e504434a287c5f44448c927e43c..1d4f07fa17d9f003ea06342eb29dfb9725655143 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil:     2013-12-xx
 
 API changes, most recent first:
 
+2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h
+  sws_getCachedContext is not going to be removed in the future.
+
 2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
   reordered_opaque is not going to be removed in the future.
 

diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 715f559590558a37d066332099edc96b4998d501..8abbac4761b0ae745a44d784761428a93126daf9 100644 (file)
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -174,7 +174,6 @@ int sws_init_context(struct SwsContext *sws_context, SwsFilter *srcFilter, SwsFi
  */
 void sws_freeContext(struct SwsContext *swsContext);
 
-#if FF_API_SWS_GETCONTEXT
 /**
  * Allocate and return an SwsContext. You need it to perform
  * scaling/conversion operations using sws_scale().
@@ -189,13 +188,11 @@ void sws_freeContext(struct SwsContext *swsContext);
  * @return a pointer to an allocated context, or NULL in case of error
  * @note this function is to be removed after a saner alternative is
  *       written
- * @deprecated Use sws_getCachedContext() instead.
  */
 struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
                                   int dstW, int dstH, enum AVPixelFormat dstFormat,
                                   int flags, SwsFilter *srcFilter,
                                   SwsFilter *dstFilter, const double *param);
-#endif
 
 /**
  * Scale the image slice in srcSlice and put the resulting scaled

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 3a8531d0f0ac2dbeeecdaf42a0c3860398612cb9..32e304c66ab2a08aeb93113560759816f591e2f9 100644 (file)
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1318,7 +1318,6 @@ fail: // FIXME replace things by appropriate error codes
     return -1;
 }
 
-#if FF_API_SWS_GETCONTEXT
 SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
                            int dstW, int dstH, enum AVPixelFormat dstFormat,
                            int flags, SwsFilter *srcFilter,
@@ -1354,7 +1353,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
 
     return c;
 }
-#endif
 
 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
                                 float lumaSharpen, float chromaSharpen,

diff --git a/libswscale/version.h b/libswscale/version.h
index d402c68ae18e64413247e10a31629093d2c9330f..7213ab350c1e8266409a47bac226749220a9ef01 100644 (file)
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
 
 #define LIBSWSCALE_VERSION_MAJOR 2
 #define LIBSWSCALE_VERSION_MINOR 1
-#define LIBSWSCALE_VERSION_MICRO 2
+#define LIBSWSCALE_VERSION_MICRO 3
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                LIBSWSCALE_VERSION_MINOR, \
@@ -46,9 +46,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_SWS_GETCONTEXT
-#define FF_API_SWS_GETCONTEXT  (LIBSWSCALE_VERSION_MAJOR < 3)
-#endif
 #ifndef FF_API_SWS_CPU_CAPS
 #define FF_API_SWS_CPU_CAPS    (LIBSWSCALE_VERSION_MAJOR < 3)
 #endif