[FFmpeg-cvslog] configure: Make compilable with VS2015 (missing hunk)

Peter Tissen git at videolan.org
Fri Mar 6 22:54:39 CET 2015


ffmpeg | branch: master | Peter Tissen <dravorek at gmail.com> | Fri Mar  6 19:39:27 2015 +0100| [79f83523f7718ddb292c8e03f27a0b5ee7047230] | committer: Michael Niedermayer

configure: Make compilable with VS2015 (missing hunk)

This hunk was missing in the github pull request when i downloaded it,
but is needed

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/internal.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 143e2db..08ee6e5 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -164,7 +164,7 @@
 
 #include "libm.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
 #pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
 #endif



More information about the ffmpeg-cvslog mailing list