diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:59:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:59:21 +0200 |
| commit | 1cba7fa364a9c95773d779ff5d5602be8391310e (patch) | |
| tree | 0b54487634827c984c861d025798d689e4e5b195 /libavfilter/version.h | |
| parent | 0061ba044a44517d7291b80427cdebc5a1470c69 (diff) | |
| parent | b472938233b98178ed6c1353c37e0dc7ab585902 (diff) | |
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 e665ed0b09..21f8d5f73a 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 3 -#define LIBAVFILTER_VERSION_MINOR 61 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 62 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |