mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-13 02:20:07 +01:00
* 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>