diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:22:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:23:17 +0200 |
| commit | 40112e7b3589e1cf37cd80a7d2e8baad4cb8c523 (patch) | |
| tree | 29d5c5475e673228440935187610210e9ae85840 /libavutil/Makefile | |
| parent | 2bb62455c899cdccbdc2a6ad33f9582008ed9f05 (diff) | |
| parent | 2b3660084f03c9dbf052e64229b3316ac40c0edf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Allow setting the ld parameter from the config file
x86: dsputil: Do not redundantly check for CPU caps before calling init funcs
configure: Disable some warnings in MSVC
x86: vp56: cmov version of vp56_rac_get_prob requires inline asm
avopt: fix examples to match the same style about default values as the actual code.
configure: Add support for MSVC cl.exe/link.exe
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.
Conflicts:
libavutil/opt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index ef1f658bb4..75039b1887 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -94,6 +94,9 @@ OBJS = adler32.o \ utils.o \ xtea.o \ +OBJS-$(HAVE_MSVCRT) += ../compat/msvcrt/snprintf.o \ + ../compat/strtod.o + TESTPROGS = adler32 \ aes \ avstring \ |