diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:41:24 +0200 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:51:32 +0200 |
commit | 6234fd2fa0123d8b6802a337d456cfb82ae57e49 (patch) | |
tree | 6a37b229f437929cbec5ffb1f5d3a89b630905f4 /libavfilter/version.h | |
parent | 4cda23f1f146211825edbf7a4aed0feeaa00711f (diff) | |
parent | 124e26971e69bb25f38c6c7cb3fa20c77cf10966 (diff) |
Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'
* commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966':
lavfi: Hardware map filter
Merged-by: Clément Bœsch <cboesch@gopro.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 a798e911b0..784fa391bc 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 78 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 79 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |