diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 15:04:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 15:04:03 +0200 |
commit | a61899a0f13c0b8fca26472537cf60da04347c6d (patch) | |
tree | f0fb8d03ea22d04afcc01df1b94ad6e973b32359 /libavcodec/version.h | |
parent | 067d11bf71e87d6bcc6a12eb302d6281a0d2408d (diff) | |
parent | e3e158e81f0666b8fe66be9ce1cad63a535920e0 (diff) |
Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0'
* commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0':
vdpau: add av_vdpau_bind_context()
Conflicts:
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 0bbf453689..9520ba6c06 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 2 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 3 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |