diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-23 03:00:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-23 03:25:51 +0100 |
| commit | d1c28e35300130f0ee28a3e5bbeb2cea403fad57 (patch) | |
| tree | a18d0b0989962e2e2cab201fbf6128ae8332d8a4 /configure | |
| parent | 9f50dafe9025555f11e66e3b09cf3db2cd53cfb2 (diff) | |
| parent | 4e8d6218c3cb8b9feffb70f8a53859540b975b36 (diff) | |
| download | ffmpeg-d1c28e35300130f0ee28a3e5bbeb2cea403fad57.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix standalone compilation of OMA muxer
build: fix standalone compilation of Microsoft XMV demuxer
build: fix standalone compilation of Core Audio Format demuxer
kvmc: fix invalid reads
4xm: Add a check in decode_i_frame to prevent buffer overreads
adpcm: fix IMA SMJPEG decoding
options: set minimum for "threads" to zero
bsd: use number of logical CPUs as automatic thread count
windows: use number of CPUs as automatic thread count
linux: use number of CPUs as automatic thread count
pthreads: reset active_thread_type when slice thread_init returrns early
v410dec: include correct headers
Drop ALT_ prefix from BITSTREAM_READER_LE name.
lavfi: always build vsrc_buffer.
ra144enc: zero the reflection coeffs if the filter is unstable
sws: readd PAL8 to isPacked()
mov: Don't stick the QuickTime field ordering atom in extradata.
truespeech: fix invalid reads in truespeech_apply_twopoint_filter()
Conflicts:
configure
libavcodec/4xm.c
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavformat/Makefile
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1174,6 +1174,7 @@ HAVE_LIST=" gethrtime GetProcessMemoryInfo GetProcessTimes + GetSystemInfo getrusage gnu_as ibm_asm @@ -1206,6 +1207,7 @@ HAVE_LIST=" posix_memalign round roundf + sched_getaffinity sdl sdl_video_size setmode @@ -1224,6 +1226,7 @@ HAVE_LIST=" symver symver_asm_label symver_gnu_asm + sysctl sys_mman_h sys_resource_h sys_select_h @@ -1654,14 +1657,13 @@ postproc_deps="gpl" # programs avconv_deps="avcodec avformat swscale" -avconv_select="buffer_filter" ffplay_deps="avcodec avformat swscale sdl" ffplay_select="buffersink_filter rdft" ffprobe_deps="avcodec avformat" ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer" ffserver_extralibs='$ldl' ffmpeg_deps="avcodec avformat swscale swresample" -ffmpeg_select="buffer_filter buffersink_filter" +ffmpeg_select="buffersink_filter" doc_deps="texi2html" @@ -3000,12 +3002,15 @@ check_func ${malloc_prefix}posix_memalign && enable posix_memalign check_func setrlimit check_func strerror_r check_func strptime +check_func sched_getaffinity +check_func sysctl 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 psapi.h" GetProcessMemoryInfo -lpsapi check_func_headers windows.h GetProcessTimes +check_func_headers windows.h GetSystemInfo check_func_headers windows.h MapViewOfFile check_func_headers windows.h VirtualAlloc |