diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 05:19:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 05:20:23 +0400 |
| commit | a7a82f2f22afaac9155ef46b8ff274ad4573b20e (patch) | |
| tree | f31420f2363aaf23a8ff355c21bd147dc46f4a57 /libavcodec/version.h | |
| parent | 072278c777986fc87dba5b0c372e19115b711a35 (diff) | |
| parent | c389a804943095ebf078daec6b64690d2c97069c (diff) | |
Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'
* commit 'c389a804943095ebf078daec6b64690d2c97069c':
libxvid: Add SSIM displaying through a libxvidcore plugin
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: 3b3c1ed0768af874c624cc555fbbd1fcea370200
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 2f9f7036fa..d50016abce 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 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |