* qatar/master: fate: cosmetics: More sensible order for entries in video filter file Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>