diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:39:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:39:38 +0200 |
| commit | a4557b7a98f78222d9616fb36cb8073cd16f11ff (patch) | |
| tree | 458602df0a2d7566f5f5f541e4cd40335729cbba /libavutil/internal.h | |
| parent | 56f0fe6b8434d25917c41a343323950291d8db21 (diff) | |
| parent | a6f19d6a9f8d1e08653d9d77581e8c823f4955c2 (diff) | |
| download | ffmpeg-a4557b7a98f78222d9616fb36cb8073cd16f11ff.tar.gz | |
Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'
* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
configure: Support MSVC 2015
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 61bc027630..8817ec3b0e 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -164,11 +164,6 @@ #include "libm.h" -#if defined(_MSC_VER) && _MSC_VER < 1900 -#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 @@ -241,6 +236,12 @@ void avpriv_request_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); #if HAVE_LIBC_MSVCRT +#include <crtversion.h> +#if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 +#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod") +#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf") +#endif + #define avpriv_open ff_open #define PTRDIFF_SPECIFIER "Id" #define SIZE_SPECIFIER "Iu" |