aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-07 03:32:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-07 03:32:26 +0200
commitc0e51ec9c625ccd7b3a8c74754145e6c023a3848 (patch)
tree9b8e987ec11d8104cde5269008bb0d21aaac89b7 /libswscale
parent4b9c03b7f08f51fea3c8719f169368a46a0d3b63 (diff)
parent1f6265e011f6e56562b2f58c182bc0261062b3c4 (diff)
downloadffmpeg-c0e51ec9c625ccd7b3a8c74754145e6c023a3848.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 563d85ce80..aa12e08ae4 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,