[FFmpeg-cvslog] Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

Michael Niedermayer git at videolan.org
Tue Apr 1 04:24:48 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 04:19:27 2014 +0200| [767b1daf4b6a40e34ebe2a18f328074babfd8bd1] | committer: Michael Niedermayer

Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
	Changelog

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

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





More information about the ffmpeg-cvslog mailing list