diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:52:10 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:52:10 +0200 |
| commit | 2df52088ef5c4ce284af99775dfe7ad1fed03614 (patch) | |
| tree | 6bfbd8edcc8a3ff2ec5bbb11db4c65dfedc0f310 /libavutil | |
| parent | 6f6c025d6d11ef43918a32c521f487e1156f54bd (diff) | |
| parent | 4e649debcf7f71d35c6b38cdb7ee715eba95d64a (diff) | |
Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a'
* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
Postpone API-incompatible changes until the next bump
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index e2e4ca841b..0fd0d6f25a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -88,19 +88,19 @@ #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_VDPAU -#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55) +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT #define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 55) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_OPT_TYPE_METADATA -#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55) +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_DLOG -#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 55) +#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) #endif #ifndef FF_API_HMAC #define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55) |