[FFmpeg-cvslog] Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

Michael Niedermayer git at videolan.org
Fri Mar 28 05:56:57 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 05:49:22 2014 +0100| [2b570c9569a2c8858f5f5f198efcf7000cfc4738] | committer: Michael Niedermayer

Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022':
  fate: add XBM tests

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list