diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:29:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:29:00 +0100 |
| commit | 8ee7b3881bfe96981de28d6eedaf1dcb59fe3215 (patch) | |
| tree | 33a4bbe392eba0869b79b69c97ca8226fa2b6b00 /libavcodec/version.h | |
| parent | a601eb9543ecab09aa69a6673e553318daf7ea57 (diff) | |
| parent | 44e065d56c87d6a9d0effccec5f31517f72924ec (diff) | |
Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
vdpau: Add context and common helpers for hwaccel support
Conflicts:
Changelog
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index f9d87f40b1..f8b474d68d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 86 +#define LIBAVCODEC_VERSION_MINOR 87 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |