Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'

* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
  build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index 7fe9d80eccc59123776536987ad377c91a0afc6c,2f6f6e7fcadee872cb001bc087c37189dc733cd0..175559bd551cbb8a0ef88d54b5b64ffaa99e5a62
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -5757,22 -4652,15 +5756,21 @@@ 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 direct.h
 +check_header dirent.h
  check_header dxgidebug.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
  check_header sys/resource.h
  check_header sys/select.h

diff --cc libswscale/utils.c
Simple merge