From 59b4e5ba49180942be3c8bb26dbf6820e015cb0d Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 30 Sep 2010 20:40:10 +0000 Subject: [PATCH] add FF_API_INOFFICIAL define to disable the deprecated 'inofficial' flag Originally committed as revision 25277 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 5 ++++- libavcodec/options.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 781cd29..2ab5ed9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -72,6 +72,9 @@ #ifndef FF_API_SET_STRING_OLD #define FF_API_SET_STRING_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_INOFFICIAL +#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -1411,7 +1414,7 @@ typedef struct AVCodecContext { #define FF_COMPLIANCE_VERY_STRICT 2 ///< Strictly conform to an older more strict version of the spec or reference software. #define FF_COMPLIANCE_STRICT 1 ///< Strictly conform to all the things in the spec no matter what consequences. #define FF_COMPLIANCE_NORMAL 0 -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_INOFFICIAL #define FF_COMPLIANCE_INOFFICIAL -1 ///< Allow inofficial extensions (deprecated - use FF_COMPLIANCE_UNOFFICIAL instead). #endif #define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions diff --git a/libavcodec/options.c b/libavcodec/options.c index e56ad44..6969d42 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -160,7 +160,7 @@ static const AVOption options[]={ {"very", "strictly conform to a older more strict version of the spec or reference software", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_VERY_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"}, {"strict", "strictly conform to all the things in the spec no matter what consequences", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"}, {"normal", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_NORMAL, INT_MIN, INT_MAX, V|D|E, "strict"}, -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_INOFFICIAL {"inofficial", "allow unofficial extensions (deprecated - use unofficial)", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_UNOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"}, #endif {"unofficial", "allow unofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_UNOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"}, -- 2.7.4