Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Conflicts:
tests/fate/filter-audio.mak
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
File moved
Please
register
or
sign in
to comment