diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:05:36 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 05:16:56 +0400 |
| commit | 95582b5ccc9a7f7adcb28751f731960c35527e05 (patch) | |
| tree | f972334e1c8dcdba8ea9eaef6f372b23acf7ff2c /libavcodec/version.h | |
| parent | 9e3c8f61feb2463c06aab4dad60de08dbee9d891 (diff) | |
| parent | 38389058c3308758c6365abd0f6b45c5e62bb90b (diff) | |
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
OpenEXR decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/exr.c
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 c4e33a9698..21f5dea786 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 55 -#define LIBAVCODEC_VERSION_MICRO 106 +#define LIBAVCODEC_VERSION_MICRO 107 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |