mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-20 04:00:45 +00:00

* qatar/master: fate: add tests for SANM and VIMA Conflicts: tests/fate/video.mak tests/ref/fate/sanm See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11 Merged-by: Michael Niedermayer <michaelni@gmx.at>