From f4c444e17d137c786f0ed2da0e5943df505d5f9e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 6 Aug 2014 19:47:54 +0000 Subject: Postpone API-incompatible changes until the next bump. --- libavcodec/version.h | 56 ++++++++++++++++++++++++------------------------- libavfilter/version.h | 16 +++++++------- libavformat/version.h | 2 +- libavresample/version.h | 2 +- libavutil/version.h | 22 +++++++++---------- libswscale/version.h | 4 ++-- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 41e9ff635c..3085a27223 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -49,88 +49,88 @@ */ #ifndef FF_API_REQUEST_CHANNELS -#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_DEINTERLACE -#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_DESTRUCT_PACKET -#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_GET_BUFFER -#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_MISSING_SAMPLE -#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_LOWRES -#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_CAP_VDPAU -#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_BUFS_VDPAU -#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_VOXWARE -#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_SET_DIMENSIONS -#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_DEBUG_MV -#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_AC_VLC -#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_OLD_MSMPEG4 -#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_ASPECT_EXTENDED -#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_THREAD_OPAQUE -#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_CODEC_PKT -#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_ARCH_ALPHA -#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_ERROR_RATE -#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_QSCALE_TYPE -#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_MB_TYPE -#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_MAX_BFRAMES -#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_FAST_MALLOC -#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_NEG_LINESIZES -#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_EMU_EDGE -#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_ARCH_SH4 -#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_ARCH_SPARC -#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_UNUSED_MEMBERS -#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 57) #endif #ifndef FF_API_IDCT_XVIDMMX #define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 56) diff --git a/libavfilter/version.h b/libavfilter/version.h index d16f6663df..e3a06d8392 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -48,28 +48,28 @@ */ #ifndef FF_API_AVFILTERPAD_PUBLIC -#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_FOO_COUNT -#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_AVFILTERBUFFER -#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_OLD_FILTER_OPTS -#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_AVFILTER_OPEN -#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_AVFILTER_INIT_FILTER -#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_OLD_FILTER_REGISTER -#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_NOCONST_GET_NAME -#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 6) #endif #endif /* AVFILTER_VERSION_H */ diff --git a/libavformat/version.h b/libavformat/version.h index fbf5a0cc8b..db5dd26428 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -52,7 +52,7 @@ #define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56) #endif #ifndef FF_API_LAVF_BITEXACT -#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 56) +#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57) #endif #ifndef FF_API_LAVF_FRAC #define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 57) diff --git a/libavresample/version.h b/libavresample/version.h index e74087165b..2f50f7e888 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -48,7 +48,7 @@ */ #ifndef FF_API_RESAMPLE_CLOSE_OPEN -#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 2) +#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 3) #endif #endif /* AVRESAMPLE_VERSION_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 60bf0e41c6..4f0795f829 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,37 +79,37 @@ */ #ifndef FF_API_PIX_FMT -#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_CONTEXT_SIZE -#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_PIX_FMT_DESC -#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_AV_REVERSE -#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_AUDIOCONVERT -#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_CPU_FLAG_MMX2 -#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_LLS_PRIVATE -#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_AVFRAME_LAVC -#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_OPT_TYPE_METADATA -#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 54) +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_AVFRAME_COLORSPACE #define FF_API_AVFRAME_COLORSPACE (LIBAVUTIL_VERSION_MAJOR >= 54) diff --git a/libswscale/version.h b/libswscale/version.h index 7213ab350c..dfc1a1ac65 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -47,10 +47,10 @@ */ #ifndef FF_API_SWS_CPU_CAPS -#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3) +#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 4) #endif #ifndef FF_API_ARCH_BFIN -#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 3) +#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4) #endif #endif /* SWSCALE_VERSION_H */ -- cgit v1.2.1