diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:32:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:32:43 +0200 |
| commit | 8d9537228f034037e710146291a933f0f4f554be (patch) | |
| tree | ec0d82734940cb418d1f424b8c78936a8d703d32 /libavutil | |
| parent | 63208c034bf660ed7f15bf09fdd4c813a6e6bf7a (diff) | |
| parent | 06122c253394b10a694d3d95e00e503c89852134 (diff) | |
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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 6ff14facb5..76018a8a2f 100644 --- a/libavutil/internal.h +++ b/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 |