mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-25 09:51:06 +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>