diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:45 +0200 |
| commit | 3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4 (patch) | |
| tree | 4f0c33c423c6ef6929256e946b5bfd23cf251a11 /libavutil | |
| parent | 499ff6a052591d980ed36e10ac2019cef14c302b (diff) | |
| parent | f4c444e17d137c786f0ed2da0e5943df505d5f9e (diff) | |
| download | ffmpeg-3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4.tar.gz | |
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
Postpone API-incompatible changes until the next bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/version.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 85b02d6df3..190d3978be 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -90,37 +90,37 @@ #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 54) #endif #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_SAMPLES_UTILS_RETURN_ZERO #define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54) #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_LLS1 #define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 54) #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_GET_CHANNEL_LAYOUT_COMPAT #define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54) @@ -129,13 +129,13 @@ #define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 54) #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_INTFLOAT #define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54) #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 >= 52) |