diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
| commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
| tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /configure | |
| parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
| parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) | |
| download | ffmpeg-streaming-e847f4128543432a77fb8f85c313646a406c76f6.zip ffmpeg-streaming-e847f4128543432a77fb8f85c313646a406c76f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libspeexenc: add supported sample rates and channel layouts.
Replace usleep() calls with av_usleep()
lavu: add av_usleep() function
utvideo: mark interlaced frames as such
utvideo: Fix interlaced prediction for RGB utvideo.
cosmetics: do not use full path for local headers
lavu/file: include unistd.h only when available
configure: check for unistd.h
log: include unistd.h only when needed
lavf: include libavutil/time.h instead of redeclaring av_gettime()
Conflicts:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1239,6 +1239,7 @@ HAVE_LIST=" memalign mkstemp mmap + nanosleep netinet_sctp_h PeekNamedPipe poll_h @@ -1251,6 +1252,7 @@ HAVE_LIST=" sdl_video_size setmode setrlimit + Sleep sndio_h socklen_t soundcard_h @@ -1278,8 +1280,11 @@ HAVE_LIST=" threads trunc truncf + unistd_h + usleep vfp_args VirtualAlloc + windows_h winsock2_h xform_asm xmm_clobbers @@ -3159,6 +3164,7 @@ check_func strptime check_func sched_getaffinity check_func sysconf check_func sysctl +check_func usleep check_func_headers conio.h kbhit check_func_headers windows.h PeekNamedPipe check_func_headers io.h setmode @@ -3168,6 +3174,7 @@ check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetSystemTimeAsFileTime check_func_headers windows.h MapViewOfFile +check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_func_headers glob.h glob @@ -3181,8 +3188,10 @@ check_header sys/param.h check_header sys/resource.h check_header sys/select.h check_header termios.h +check_header unistd.h check_header vdpau/vdpau.h check_header vdpau/vdpau_x11.h +check_header windows.h check_header X11/extensions/XvMClib.h check_header asm/types.h |
