[FFmpeg-cvslog] Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
Michael Niedermayer
git at videolan.org
Tue Apr 1 04:01:31 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 1 03:55:45 2014 +0200| [5628b9f5fb92a72fa35a46520cf6c4dc1942de25] | committer: Michael Niedermayer
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
sgi: remove redundant argument from read_uncompressed_sgi()
Conflicts:
libavcodec/sgidec.c
See: 0f65693529decc470e3f01cb950b1864ea982c06
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5628b9f5fb92a72fa35a46520cf6c4dc1942de25
---
More information about the ffmpeg-cvslog
mailing list