[FFmpeg-cvslog] Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'

Michael Niedermayer git at videolan.org
Sat Apr 19 20:56:04 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 20:40:02 2014 +0200| [75ef907db80f77912f8e7815e75cf401dd68e2f2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75ef907db80f77912f8e7815e75cf401dd68e2f2
---





More information about the ffmpeg-cvslog mailing list