aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-06 14:46:31 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-06 22:55:28 +0200
commit0464ee9af2a3c17d78642f203cfeeb5d66c70bf2 (patch)
treee0fa7b37a655266bc5d8cb20e3d12242a9b05ad2
parent0ba832231dd557475ffb8c4438c2d794812a9216 (diff)
downloadffmpeg-0464ee9af2a3c17d78642f203cfeeb5d66c70bf2.tar.gz
swscale: postpone sws_getContext removal until next major bump.
The replacement isn't ready yet.
-rw-r--r--libswscale/swscale.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index ebdad30a5d..aae1a6cc7e 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -48,7 +48,7 @@
* They may change, break or disappear at any time.
*/
#ifndef FF_API_SWS_GETCONTEXT
-#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 1)
+#define FF_API_SWS_GETCONTEXT (LIBSWSCALE_VERSION_MAJOR < 2)
#endif
/**
@@ -185,9 +185,9 @@ void sws_freeContext(struct SwsContext *swsContext);
* @param dstFormat the destination image format
* @param flags specify which algorithm and options to use for rescaling
* @return a pointer to an allocated context, or NULL in case of error
- * @deprecated use sws_alloc_context() and sws_init_context()
+ * @note this function is to be removed after a saner alternative is
+ * written
*/
-attribute_deprecated
struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
int dstW, int dstH, enum PixelFormat dstFormat,
int flags, SwsFilter *srcFilter,