Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Feb 2014 10:18:16 +0000 (11:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Feb 2014 10:27:02 +0000 (11:27 +0100)
commit5d166de25853a41c6e2e2067f253271f22f94098
treef59bfda9ef35996ccf4b9a05bfb746bc46410b5a
parent96fc2908f0c04d2759d6c20275150d65798de4ac
parent738f83582a3aaabb81309eacd4ab9c3d2acb4071
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: add compand audio filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand_fork.c
libavfilter/allfilters.c
libavfilter/version.h