[FFmpeg-cvslog] Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

Michael Niedermayer git at videolan.org
Fri Jul 24 00:53:06 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 24 00:44:58 2015 +0200| [da8b70b810bb2703f976d737af8c68d35716f5ea] | committer: Michael Niedermayer

Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list