diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:43:52 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:43:52 +0100 |
| commit | b975aeec02e4518a4e5f2996cf51d113e42e1727 (patch) | |
| tree | 2a2db1597eb4a20f4ad9f7be56d3992bbcfb8448 /libavcodec/version.h | |
| parent | 508957fd0fc398271f3ec87cde63ba4533678bf9 (diff) | |
| parent | 2c62fcdf5d617791a653d7957d449f75569eede0 (diff) | |
| download | ffmpeg-b975aeec02e4518a4e5f2996cf51d113e42e1727.tar.gz | |
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 5840cf6eb9..ec74bddabe 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 39 +#define LIBAVCODEC_VERSION_MINOR 40 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |