mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-01-13 15:10:54 +00:00
267c5723e0
* 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>