diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
| commit | fbe02459dc4f3c8f4d758c1a90ed8e35a800f3b9 (patch) | |
| tree | 66263011ff0784ce9a33b697a117516de48401fa /configure | |
| parent | 9a1963fbb872f08222a5b73fe96931708ca32732 (diff) | |
| parent | b4675d0fbf6606ab737e81c3c0fe6a05c8764334 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for CommandLineToArgvW
vc1dec: Do not use random pred_flag if motion vector data is skipped
vp8: Enclose pthread function calls in ifdefs
snow: refactor code to work around a compiler bug in MSVC.
vp8: Include the thread headers before using the pthread types
configure: Check for getaddrinfo in ws2tcpip.h, too
vp8: implement sliced threading
vp8: move data from VP8Context->VP8Macroblock
vp8: refactor decoding a single mb_row
doc: update api changes with the right commit hashes
mem: introduce av_malloc_array and av_mallocz_array
Conflicts:
configure
doc/APIchanges
libavcodec/vp8.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1190,6 +1190,7 @@ HAVE_LIST=" clock_gettime closesocket cmov + CommandLineToArgvW cpuid dcbzl dev_bktr_ioctl_bt848_h @@ -3182,7 +3183,8 @@ check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; } check_func clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; } check_func fcntl check_func fork -check_func getaddrinfo $network_extralibs +check_func getaddrinfo $network_extralibs || + check_func_headers ws2tcpip.h getaddrinfo $network_extralibs check_func gethrtime check_func getopt check_func getrusage @@ -3207,6 +3209,7 @@ check_func_headers conio.h kbhit check_func_headers windows.h PeekNamedPipe check_func_headers io.h setmode check_func_headers lzo/lzo1x.h lzo1x_999_compress +check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes |