[FFmpeg-cvslog] Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'

Michael Niedermayer git at videolan.org
Tue Apr 1 21:09:13 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 21:00:26 2014 +0200| [909757fabdf8d7f9360a06a81625a58a5ec3e05c] | committer: Michael Niedermayer

Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'

* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
  fate: Explicitly use gray16le in fate-sgi-gray16

Conflicts:
	tests/fate/image.mak

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

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





More information about the ffmpeg-cvslog mailing list