-
Michael Niedermayer authored
* commit 'b384e031': lavfi: add volume filter Conflicts: Changelog libavfilter/Makefile libavfilter/af_volume.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
b38c79bf
* commit 'b384e031': lavfi: add volume filter Conflicts: Changelog libavfilter/Makefile libavfilter/af_volume.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>