diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 05:07:49 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 05:08:25 +0400 |
commit | 072278c777986fc87dba5b0c372e19115b711a35 (patch) | |
tree | a91e483f8830986ea72c949cc7dbfdca2a746e29 /libavcodec/version.h | |
parent | 190106e884a28a661251e72ced6177ecc7774bda (diff) | |
parent | 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1 (diff) |
Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
libxvid: add working lumimasking and variance AQ
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f
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 fa1aaa9529..2f9f7036fa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 58 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |