ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Aug 10 18:40:46 2014 +0200| [61b9ce00a30c8bb261678d9c210a06b5eefaed7a] | committer: Michael Niedermayer
Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86' * commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86': tiff: Improve grayscale support Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61b9ce00a30c8bb261678d9c210a06b5eefaed7a --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog