* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352': fate: add tests for SGI RLE and MVC1&2 decoders Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352': fate: add tests for SGI RLE and MVC1&2 decoders Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>