diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
| commit | e3755119fae71c9e34b630679c2805fcf1c97e2c (patch) | |
| tree | 59f417c9cbac3e3c8028be8a950435018de2c4ec /libavutil/version.h | |
| parent | 65da611d3415dd859d92c00d59fecbb5bba68692 (diff) | |
| parent | 5b1d9ceec715846a58fe029bc3889ed6fa62436a (diff) | |
| download | ffmpeg-e3755119fae71c9e34b630679c2805fcf1c97e2c.tar.gz | |
Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
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 73bf398dff..355eef344c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 18 +#define LIBAVUTIL_VERSION_MINOR 19 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |