ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun May 3 01:29:41 2015 +0200| [40964e2e894f057f0afad575e48f87d1153d2914] | committer: Michael Niedermayer
Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da' * commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da': configure: Allow log2 with MSVC 2013 onwards. Conflicts: configure See: 4d93e758d732726fa7e20693db1f447985f1d6d8 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40964e2e894f057f0afad575e48f87d1153d2914 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog