diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:03:57 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:03:57 +0000 |
| commit | 10424024a16a7646169b9c9008c5f7b77cbc2211 (patch) | |
| tree | ea852976be3a8b8d0cd3d57bc1beb918b89991d0 /libavfilter/version.h | |
| parent | 6992276acaaee32b33bd5f6e2f0d89588c4ae59a (diff) | |
| parent | b3dd30db0b2d857147fc0e1461a00bd6172a26a3 (diff) | |
Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'
* commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3':
lavfi: pass the hw frames context through the filter chain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 480c464cff..d8b8ff7bc8 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 35 +#define LIBAVFILTER_VERSION_MINOR 36 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |