diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:00:10 +0100 |
| commit | 5f231d909f158e40d20281b88e7aecc2333057fe (patch) | |
| tree | 4a7a02aad0bc1d864181b156306dfb3c2aed0f32 /libavcodec/version.h | |
| parent | f3458a56c117674bf6003b59250c79a13308c05f (diff) | |
| parent | ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118 (diff) | |
| download | ffmpeg-5f231d909f158e40d20281b88e7aecc2333057fe.tar.gz | |
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
vdpau: add a convenience function for getting a decoder profile.
Conflicts:
doc/APIchanges
libavcodec/vdpau.c
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 0d18626935..d2fa0de842 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 41 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 42 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |