mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-13 21:26:33 +02:00
* qatar/master: fate: add Alias PIX tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master: fate: add Alias PIX tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>