ffmpeg | branch: master | Clément Bœsch <[email protected]> | Wed Apr 26 16:38:10 2017 +0200| [9c1b09f73ec36b2470074358d343d9df999b4bee] | committer: Clément Bœsch
Merge commit 'ef9a711be718ed3802a263d1d9ed340a4aaef224' * commit 'ef9a711be718ed3802a263d1d9ed340a4aaef224': configure: put d3d11 check in alphabetical order Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c1b09f73ec36b2470074358d343d9df999b4bee --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f4bcbe2c9d..fc970cd86a 100755 --- a/configure +++ b/configure @@ -1844,6 +1844,7 @@ HEADERS_LIST=" cdio_paranoia_h cdio_paranoia_paranoia_h cuda_h + d3d11_h dispatch_dispatch_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -1853,7 +1854,6 @@ HEADERS_LIST=" direct_h dirent_h dlfcn_h - d3d11_h dxva_h ES2_gl_h gsm_h @@ -5618,10 +5618,10 @@ enabled xlib && check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext check_header AudioToolbox/AudioToolbox.h +check_header d3d11.h check_header direct.h check_header dirent.h check_header dlfcn.h -check_header d3d11.h check_header dxva.h check_header dxva2api.h -D_WIN32_WINNT=0x0600 check_header io.h ====================================================================== diff --cc configure index f4bcbe2c9d,25640ebb7f..fc970cd86a --- a/configure +++ b/configure @@@ -1840,10 -1511,10 +1840,11 @@@ HEADERS_LIST= alsa_asoundlib_h altivec_h arpa_inet_h + asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h + cuda_h + d3d11_h dispatch_dispatch_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@@ -1851,11 -1522,8 +1852,10 @@@ dev_video_bktr_ioctl_bt848_h dev_video_meteor_ioctl_meteor_h direct_h + dirent_h dlfcn_h - d3d11_h dxva_h + ES2_gl_h gsm_h io_h mach_mach_time_h @@@ -5613,22 -4529,15 +5613,22 @@@ check_func_headers windows.h SetConsole check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_struct windows.h "CONDITION_VARIABLE" Ptr +check_func_headers glob.h glob +enabled xlib && + check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext +check_header AudioToolbox/AudioToolbox.h + check_header d3d11.h check_header direct.h +check_header dirent.h check_header dlfcn.h - check_header d3d11.h check_header dxva.h -check_header dxva2api.h +check_header dxva2api.h -D_WIN32_WINNT=0x0600 check_header io.h +check_header libcrystalhd/libcrystalhd_if.h check_header mach/mach_time.h check_header malloc.h +check_header net/udplite.h check_header poll.h check_header sys/mman.h check_header sys/param.h _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
