diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:37:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:37:59 +0200 |
| commit | 7eb959bf0b961e308e3068f161ee94e82e02355d (patch) | |
| tree | 3dddbd13b59e7a3b42032b8022df5fa76b98992f /libavutil/version.h | |
| parent | 1b6172dcf619156b777fc29ae82e90fd42328fc0 (diff) | |
| parent | 04ccd584a70fad4ebb29ca340d704970ff313cbc (diff) | |
Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'
* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc':
pixfmt: mark further reserved values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 92a57765df..ae5dd65a4e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -57,7 +57,7 @@ #define LIBAVUTIL_VERSION_MAJOR 54 #define LIBAVUTIL_VERSION_MINOR 9 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |