* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a': fate: Rename video filters file and add separate video filters target Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a': fate: Rename video filters file and add separate video filters target Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>