diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:10:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:10:55 +0100 |
commit | 71cf094e1be086bce4c535b1fe0d96a0449486ae (patch) | |
tree | c1608e1f7216f00ac1485e6ee6a911ecfbcc0a52 /libavfilter/version.h | |
parent | f7c4b76c488b4901133addb3f7875ef3ac4ae9c4 (diff) | |
parent | 9f1223562e134bac6345a465870b9d56ff7d60cf (diff) |
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
lavfi: connect libavresample options to af_resample via AVFilterGraph
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h
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 f3fab7dc4c..a6a2024a24 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 39 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 40 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |