From 3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sat, 14 Dec 2013 16:30:25 -0500 Subject: [PATCH] Bump libavutil major version to account for the LLS API/ABI changes. Commit 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 changed the LLS API, which was called from libavcodec. Thus using an old libavcodec with a new libavutil will break. All scheduled API changes are deferred to the next bump. --- doc/APIchanges | 2 +- libavutil/version.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 3d25e012dd..fd43319ab6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -8,7 +8,7 @@ libavfilter: 2012-06-22 libavformat: 2013-03-xx libavresample: 2012-10-05 libswscale: 2011-06-20 -libavutil: 2012-10-22 +libavutil: 2013-12-xx API changes, most recent first: diff --git a/libavutil/version.h b/libavutil/version.h index eafc521949..24d2b96846 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -36,8 +36,8 @@ * @{ */ -#define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 20 +#define LIBAVUTIL_VERSION_MAJOR 53 +#define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -62,37 +62,37 @@ */ #ifndef FF_API_PIX_FMT -#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_CONTEXT_SIZE -#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_PIX_FMT_DESC -#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_AV_REVERSE -#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_AUDIOCONVERT -#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_CPU_FLAG_MMX2 -#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_LLS_PRIVATE -#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_AVFRAME_LAVC -#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54) #endif #ifndef FF_API_INTFLOAT -#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 53) +#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54) #endif /**