Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 18:40:02 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 18:40:02 +0000 (20:40 +0200)
commit75ef907db80f77912f8e7815e75cf401dd68e2f2
treef6cec14931b494607ee2d5836ec513ada04bd073
parent01a39a978c143747b50d0b2660cd100c96722cbd
parent6dfd99c93808d6504dd5cb1fad847d68cb179352
Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'

* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/video.mak