diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:18:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:27:02 +0100 |
| commit | 5d166de25853a41c6e2e2067f253271f22f94098 (patch) | |
| tree | f59bfda9ef35996ccf4b9a05bfb746bc46410b5a /libavcodec/wmv2dec.c | |
| parent | 96fc2908f0c04d2759d6c20275150d65798de4ac (diff) | |
| parent | 738f83582a3aaabb81309eacd4ab9c3d2acb4071 (diff) | |
| download | ffmpeg-5d166de25853a41c6e2e2067f253271f22f94098.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmv2dec.c')
0 files changed, 0 insertions, 0 deletions