diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:59:45 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:59:45 +0100 |
| commit | 8688d3af39e8cd8848e74407998777dd5aad3863 (patch) | |
| tree | 394a3e6029c58493b733c9420a78c99b01ae7998 /libavfilter/version.h | |
| parent | 28abb216cbd5736d65973165b830c08815ce0227 (diff) | |
| parent | 07a844f32ebb78503981df017fa3ebfedb75fe1c (diff) | |
| download | ffmpeg-8688d3af39e8cd8848e74407998777dd5aad3863.tar.gz | |
Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'
* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
lavfi: generic hardware surface upload and download filters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 4cb5a2e667..48b9d9a6e5 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 41 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 42 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |