[FFmpeg-cvslog] Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'
Michael Niedermayer
git at videolan.org
Sun Jul 26 23:18:34 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 22:58:09 2015 +0200| [867686997cbacd06cf5056c2741494bda23a7819] | committer: Michael Niedermayer
Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'
* commit '0cff125200ab53fa3ae70d85b4f614f269fe3426':
configure: Only add -FIstdlib.h for msvc/icl if necessary
Conflicts:
configure
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=867686997cbacd06cf5056c2741494bda23a7819
---
More information about the ffmpeg-cvslog
mailing list