diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:18:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:18:59 +0100 |
| commit | b38c79bf2327391d4fb8a7c271301ff408bdc71e (patch) | |
| tree | cd3c1092a34d8e417fe4c834b23f137227aa83e3 /libavfilter/version.h | |
| parent | 377d201790bbe08185b91b50c8bc4a3bbf951618 (diff) | |
| parent | b384e031daeb1ac612620985e3e5377bc587559c (diff) | |
| download | ffmpeg-b38c79bf2327391d4fb8a7c271301ff408bdc71e.tar.gz | |
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
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 694f4f0ab4..bf5f4969f0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 3 -#define LIBAVFILTER_VERSION_MINOR 24 +#define LIBAVFILTER_VERSION_MINOR 25 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |