diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:42:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-12 13:42:42 +0100 |
| commit | dae382b5b28df492e4bfbac35ac6b0cddc994337 (patch) | |
| tree | cfc66c3ea9c7a03b53b9e2683fb4f33898e48c28 /libavutil/version.h | |
| parent | 15daa8f9ddaf678b924ebe997f7b62381c0e2e0a (diff) | |
| parent | f89466ad6fd69ea570790e9227e612a751703a37 (diff) | |
| download | ffmpeg-dae382b5b28df492e4bfbac35ac6b0cddc994337.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
pixfmt: add picture format for VDPAU
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 e47e0d12b3..f59fd9baea 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 13 +#define LIBAVUTIL_VERSION_MINOR 14 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |