mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-26 18:12:20 +08: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>