Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure

@@ -4623,10 +4623,6 @@ fi
 
 enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
 
-if enabled msvc && ! enabled shared; then
-    echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")' >> $TMPH
-    echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")' >> $TMPH
-fi
 
 mkdir -p doc
 echo "@c auto-generated by configure" > doc/config.texi

libavutil/internal.h

@@ -112,6 +112,11 @@
 
 #include "libm.h"
 
+#if defined(_MSC_VER) && !CONFIG_SHARED
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
+#endif
+
 /**
  * Return NULL if CONFIG_SMALL is true, otherwise the argument
  * without modification. Used to disable the definition of strings