diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 23:24:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:07:31 +0100 |
| commit | 4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch) | |
| tree | 795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /configure | |
| parent | 2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff) | |
| parent | febd022228660cb4b4d0e7b108bfec339b7dce92 (diff) | |
| download | ffmpeg-streaming-4478e9d8db65ca827f2b3ef3ef6ee806bffdba45.zip ffmpeg-streaming-4478e9d8db65ca827f2b3ef3ef6ee806bffdba45.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for dfa
mpegaudiodec: fix seeking.
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
threads: add sysconf based number of CPUs detection
threads: always include necessary headers for number of CPUs detection
threads: default to automatic thread count detection
Changelog: restore version <next> header
cook: K&R formatting cosmetics
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1229,6 +1229,7 @@ HAVE_LIST=" symver symver_asm_label symver_gnu_asm + sysconf sysctl sys_mman_h sys_param_h @@ -3008,6 +3009,7 @@ check_func setrlimit check_func strerror_r check_func strptime check_func sched_getaffinity +check_func sysconf check_func sysctl check_func_headers conio.h kbhit check_func_headers windows.h PeekNamedPipe |
