diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 23:40:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 23:42:17 +0200 |
| commit | ea5dab58e074a91330e1f076a4cbe8fece889afe (patch) | |
| tree | a94e47797fdd3adf9ac8b995cd562c2acf2fd2d3 /libavfilter/version.h | |
| parent | 841c1be57e59bc133cb615b48b0888ad9833156b (diff) | |
| parent | c89e428ed8c2c31396af2d18cab4342b7d82958f (diff) | |
| download | ffmpeg-ea5dab58e074a91330e1f076a4cbe8fece889afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: check malloc calls
ppc: Drop unused header regs.h
af_resample: remove an extra space in the log output
Convert vector_fmul range of functions to YASM and add AVX versions
lavfi: add an audio split filter
lavfi: rename vf_split.c to split.c
Conflicts:
doc/filters.texi
libavcodec/ppc/regs.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_split.c
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 8ca6ea3cdf..7ae29ec36e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 75 +#define LIBAVFILTER_VERSION_MINOR 76 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |