diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:52:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:52:59 +0100 |
| commit | ddb9a24a7f11c448263ef9b163e8425832cb089c (patch) | |
| tree | c5b30aba2e7ad4170b4e885b646ba0a1908eaf66 /libavcodec/version.h | |
| parent | d16079abf473b51be7686d20f8014bb48a095722 (diff) | |
| parent | 6c99c92a42add7f6a462114d5a4a53c93c551058 (diff) | |
Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'
* commit '6c99c92a42add7f6a462114d5a4a53c93c551058':
libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag
Conflicts:
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 d85a2542c7..7e33da02d9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 17 +#define LIBAVCODEC_VERSION_MINOR 18 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |