diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 00:48:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 02:38:33 +0100 |
| commit | 0e5fbbd7768a6eb42809c08a5dd46093caf407d3 (patch) | |
| tree | e559aec3cdf6f48bb9774fb0cf4bb51b270cda70 /configure | |
| parent | ad1c50255735c20bd86572d3e8b3c88a5ca6c8f1 (diff) | |
| parent | bd96be6e2739dbe5b7a467a318ebfb6241c15eba (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: K&R cosmetics
doxygen: remove unreplaced variables from custom header and footer
threads: test for sys/param.h and include it for sysctl on OpenBSD
v4l2: remove unneded linux specific asm/types.h include
x86: Fix constraints for decode_significance*_x86
Conflicts:
libavcodec/mpegvideo_enc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1228,6 +1228,7 @@ HAVE_LIST=" symver_gnu_asm sysctl sys_mman_h + sys_param_h sys_resource_h sys_select_h sys_soundcard_h @@ -3020,6 +3021,7 @@ check_header libcrystalhd/libcrystalhd_if.h check_header malloc.h check_header poll.h check_header sys/mman.h +check_header sys/param.h check_header sys/resource.h check_header sys/select.h check_header termios.h |