Merge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'
authorClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:59:35 +0000 (11:59 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:59:35 +0000 (11:59 +0200)
* commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f':
  configure: Use proper compiler-specific speed flags for hostcc

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
configure

diff --combined configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  #
 -# Libav configure script
 +# FFmpeg configure script
  #
  # Copyright (c) 2000-2002 Fabrice Bellard
  # Copyright (c) 2005-2008 Diego Biurrun
@@@ -44,9 -44,9 +44,9 @@@ if test "$E1" != 0 || test "$E2" = 0; t
      echo "No compatible shell script interpreter found."
      echo "This configure script requires a POSIX-compatible shell"
      echo "such as bash or ksh."
 -    echo "THIS IS NOT A BUG IN LIBAV, DO NOT REPORT IT AS SUCH."
 +    echo "THIS IS NOT A BUG IN FFMPEG, DO NOT REPORT IT AS SUCH."
      echo "Instead, install a working POSIX-compatible shell."
 -    echo "Disabling this configure test will create a broken Libav."
 +    echo "Disabling this configure test will create a broken FFmpeg."
      if test "$BASH_VERSION" = '2.04.0(1)-release'; then
          echo "This bash version ($BASH_VERSION) is broken on your platform."
          echo "Upgrade to a later version if available."
@@@ -77,22 -77,17 +77,22 @@@ Help options
    --list-filters           show all available filters
  
  Standard options:
 -  --logfile=FILE           log tests and output to FILE [avbuild/config.log]
 +  --logfile=FILE           log tests and output to FILE [ffbuild/config.log]
    --disable-logging        do not log configure debug information
 +  --fatal-warnings         fail if any configure warning is generated
    --prefix=PREFIX          install in PREFIX [$prefix_default]
    --bindir=DIR             install binaries in DIR [PREFIX/bin]
 -  --datadir=DIR            install data files in DIR [PREFIX/share/avconv]
 -  --docdir=DIR             install documentation in DIR [PREFIX/share/doc/libav]
 +  --datadir=DIR            install data files in DIR [PREFIX/share/ffmpeg]
 +  --docdir=DIR             install documentation in DIR [PREFIX/share/doc/ffmpeg]
    --libdir=DIR             install libs in DIR [PREFIX/lib]
 -  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]
 +  --shlibdir=DIR           install shared libs in DIR [LIBDIR]
    --incdir=DIR             install includes in DIR [PREFIX/include]
    --mandir=DIR             install man page in DIR [PREFIX/share/man]
 -  --enable-rpath           use rpath when linking programs (USE WITH CARE)
 +  --pkgconfigdir=DIR       install pkg-config files in DIR [LIBDIR/pkgconfig]
 +  --enable-rpath           use rpath to allow installing libraries in paths
 +                           not part of the dynamic linker search path
 +                           use rpath when linking programs (USE WITH CARE)
 +  --install-name-dir=DIR   Darwin directory name for installed targets
  
  Licensing options:
    --enable-gpl             allow use of GPL code, the resulting libs
@@@ -105,40 -100,33 +105,40 @@@ Configuration options
    --disable-static         do not build static libraries [no]
    --enable-shared          build shared libraries [no]
    --enable-small           optimize for size instead of speed
 -  --enable-runtime-cpudetect detect CPU capabilities at runtime (bigger binary)
 +  --disable-runtime-cpudetect disable detecting CPU capabilities at runtime (smaller binary)
    --enable-gray            enable full grayscale support (slower color)
    --disable-swscale-alpha  disable alpha channel support in swscale
    --disable-all            disable building components, libraries and programs
  
  Program options:
    --disable-programs       do not build command line programs
 -  --disable-avconv         disable avconv build
 -  --disable-avplay         disable avplay build
 -  --disable-avprobe        disable avprobe build
 -  --disable-avserver       deprecated, does nothing
 +  --disable-ffmpeg         disable ffmpeg build
 +  --disable-ffplay         disable ffplay build
 +  --disable-ffprobe        disable ffprobe build
 +  --disable-ffserver       disable ffserver build
  
 -Component options:
 +Documentation options:
    --disable-doc            do not build documentation
 -  --disable-pod2man        do not build manual pages
 -  --disable-texi2html      do not build HTML documentation
 +  --disable-htmlpages      do not build HTML documentation pages
 +  --disable-manpages       do not build man documentation pages
 +  --disable-podpages       do not build POD documentation pages
 +  --disable-txtpages       do not build text documentation pages
 +
 +Component options:
    --disable-avdevice       disable libavdevice build
    --disable-avcodec        disable libavcodec build
    --disable-avformat       disable libavformat build
 -  --disable-avutil         disable libavutil build
 +  --disable-swresample     disable libswresample build
    --disable-swscale        disable libswscale build
 -  --disable-avfilter       disable video filter support [no]
 -  --disable-avresample     disable libavresample build [no]
 -  --disable-pthreads       disable pthreads [auto]
 -  --disable-w32threads     disable Win32 threads [auto]
 +  --disable-postproc       disable libpostproc build
 +  --disable-avfilter       disable libavfilter build
 +  --enable-avresample      enable libavresample build [no]
 +  --disable-pthreads       disable pthreads [autodetect]
 +  --disable-w32threads     disable Win32 threads [autodetect]
 +  --disable-os2threads     disable OS/2 threads [autodetect]
    --disable-network        disable network support [no]
    --disable-dct            disable DCT code
 +  --disable-dwt            disable DWT code
    --disable-error-resilience disable error resilience code
    --disable-lsp            disable LSP code
    --disable-lzo            disable LZO decoder code
    --disable-rdft           disable RDFT code
    --disable-fft            disable FFT code
    --disable-faan           disable floating point AAN (I)DCT code
 +  --disable-pixelutils     disable pixel utils in libavutil
  
  Individual component options:
    --disable-everything     disable all components listed below
  
  External library support:
  
 -  Using any of the following switches will allow Libav to link to the
 +  Using any of the following switches will allow FFmpeg to link to the
    corresponding external library. All the components depending on that library
    will become enabled, if all their other dependencies are met and they are not
    explicitly disabled. E.g. --enable-libwavpack will enable linking to
    libraries must be explicitly enabled.
  
    Also note that the following help text describes the purpose of the libraries
 -  themselves, not all their features will necessarily be usable by Libav.
 -
 -  --enable-avisynth          video frameserver
 -  --enable-avxsynth          Linux version of AviSynth
 -  --enable-bzlib             bzip2 compression [autodetect]
 -  --enable-frei0r            video filtering plugins
 -  --enable-gnutls            crypto
 -  --enable-libbs2b           Bauer stereophonic-to-binaural DSP
 -  --enable-libcdio           audio CD input
 -  --enable-libdc1394         IEEE 1394/Firewire camera input
 -  --enable-libdcadec         DCA audio decoding
 -  --enable-libfaac           AAC audio encoding
 -  --enable-libfdk-aac        AAC audio encoding/decoding
 -  --enable-libfontconfig     font configuration and management
 -  --enable-libfreetype       font rendering
 -  --enable-libgsm            GSM audio encoding/decoding
 -  --enable-libhdcd           HDCD decoding filter
 -  --enable-libilbc           ILBC audio encoding/decoding
 -  --enable-libkvazaar        HEVC video encoding
 -  --enable-libmp3lame        MP3 audio encoding
 -  --enable-libopencore-amrnb AMR-NB audio encoding/decoding
 -  --enable-libopencore-amrwb AMR-WB audio decoding
 -  --enable-libopencv         computer vision
 -  --enable-libopenh264       H.264 video encoding/decoding
 -  --enable-libopenjpeg       JPEG 2000 image encoding/decoding
 -  --enable-libopus           Opus audio encoding/decoding
 -  --enable-libpulse          Pulseaudio sound server
 -  --enable-librtmp           RTMP streaming
 -  --enable-libschroedinger   Dirac video encoding/decoding
 -  --enable-libsnappy         snappy compression
 -  --enable-libspeex          Speex audio encoding/decoding
 -  --enable-libtheora         Theora video encoding/decoding
 -  --enable-libtwolame        MP2 audio encoding
 -  --enable-libvo-aacenc      AAC audio encoding
 -  --enable-libvo-amrwbenc    AMR-WB audio encoding
 -  --enable-libvorbis         Vorbis audio encoding/decoding
 -  --enable-libvpx            VP* video encoding/decoding
 -  --enable-libwavpack        Wavpack audio encoding/decoding
 -  --enable-libwebp           WebP image encoding/decoding
 -  --enable-libx264           H.264 video encoding
 -  --enable-libx265           HEVC video encoding
 -  --enable-libxavs           Chinese AVS video encoding
 -  --enable-libxcb            X window system protocol communication
 -  --enable-libxcb-shm        X11 shm communication [auto]
 -  --enable-libxcb-xfixes     X11 mouse rendering [auto]
 -  --enable-libxvid           MPEG-4 ASP video encoding
 -  --enable-openssl           crypto
 -  --enable-zlib              compression [autodetect]
 +  themselves, not all their features will necessarily be usable by FFmpeg.
 +
 +  --enable-avisynth        enable reading of AviSynth script files [no]
 +  --disable-bzlib          disable bzlib [autodetect]
 +  --enable-chromaprint     enable audio fingerprinting with chromaprint [no]
 +  --enable-frei0r          enable frei0r video filtering [no]
 +  --enable-gcrypt          enable gcrypt, needed for rtmp(t)e support
 +                           if openssl, librtmp or gmp is not used [no]
 +  --enable-gmp             enable gmp, needed for rtmp(t)e support
 +                           if openssl or librtmp is not used [no]
 +  --enable-gnutls          enable gnutls, needed for https support
 +                           if openssl is not used [no]
 +  --disable-iconv          disable iconv [autodetect]
 +  --enable-jni             enable JNI support [no]
 +  --enable-ladspa          enable LADSPA audio filtering [no]
 +  --enable-libass          enable libass subtitles rendering,
 +                           needed for subtitles and ass filter [no]
 +  --enable-libbluray       enable BluRay reading using libbluray [no]
 +  --enable-libbs2b         enable bs2b DSP library [no]
 +  --enable-libcaca         enable textual display using libcaca [no]
 +  --enable-libcelt         enable CELT decoding via libcelt [no]
 +  --enable-libcdio         enable audio CD grabbing with libcdio [no]
 +  --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
 +                           and libraw1394 [no]
 +  --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
 +  --enable-libflite        enable flite (voice synthesis) support via libflite [no]
 +  --enable-libfontconfig   enable libfontconfig, useful for drawtext filter [no]
 +  --enable-libfreetype     enable libfreetype, needed for drawtext filter [no]
 +  --enable-libfribidi      enable libfribidi, improves drawtext filter [no]
 +  --enable-libgme          enable Game Music Emu via libgme [no]
 +  --enable-libgsm          enable GSM de/encoding via libgsm [no]
 +  --enable-libiec61883     enable iec61883 via libiec61883 [no]
 +  --enable-libilbc         enable iLBC de/encoding via libilbc [no]
 +  --enable-libkvazaar      enable HEVC encoding via libkvazaar [no]
 +  --enable-libmodplug      enable ModPlug via libmodplug [no]
 +  --enable-libmp3lame      enable MP3 encoding via libmp3lame [no]
 +  --enable-libnut          enable NUT (de)muxing via libnut,
 +                           native (de)muxer exists [no]
 +  --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
 +  --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
 +  --enable-libopencv       enable video filtering via libopencv [no]
 +  --enable-libopenh264     enable H.264 encoding via OpenH264 [no]
 +  --enable-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
 +  --enable-libopenmpt      enable decoding tracked files via libopenmpt [no]
 +  --enable-libopus         enable Opus de/encoding via libopus [no]
 +  --enable-libpulse        enable Pulseaudio input via libpulse [no]
 +  --enable-librsvg         enable SVG rasterization via librsvg [no]
 +  --enable-librubberband   enable rubberband needed for rubberband filter [no]
 +  --enable-librtmp         enable RTMP[E] support via librtmp [no]
 +  --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
 +  --enable-libshine        enable fixed-point MP3 encoding via libshine [no]
 +  --enable-libsmbclient    enable Samba protocol via libsmbclient [no]
 +  --enable-libsnappy       enable Snappy compression, needed for hap encoding [no]
 +  --enable-libsoxr         enable Include libsoxr resampling [no]
 +  --enable-libspeex        enable Speex de/encoding via libspeex [no]
 +  --enable-libssh          enable SFTP protocol via libssh [no]
 +  --enable-libtesseract    enable Tesseract, needed for ocr filter [no]
 +  --enable-libtheora       enable Theora encoding via libtheora [no]
 +  --enable-libtwolame      enable MP2 encoding via libtwolame [no]
 +  --enable-libv4l2         enable libv4l2/v4l-utils [no]
 +  --enable-libvidstab      enable video stabilization using vid.stab [no]
 +  --enable-libvo-amrwbenc  enable AMR-WB encoding via libvo-amrwbenc [no]
 +  --enable-libvorbis       enable Vorbis en/decoding via libvorbis,
 +                           native implementation exists [no]
 +  --enable-libvpx          enable VP8 and VP9 de/encoding via libvpx [no]
 +  --enable-libwavpack      enable wavpack encoding via libwavpack [no]
 +  --enable-libwebp         enable WebP encoding via libwebp [no]
 +  --enable-libx264         enable H.264 encoding via x264 [no]
 +  --enable-libx265         enable HEVC encoding via x265 [no]
 +  --enable-libxavs         enable AVS encoding via xavs [no]
 +  --enable-libxcb          enable X11 grabbing using XCB [autodetect]
 +  --enable-libxcb-shm      enable X11 grabbing shm communication [autodetect]
 +  --enable-libxcb-xfixes   enable X11 grabbing mouse rendering [autodetect]
 +  --enable-libxcb-shape    enable X11 grabbing shape rendering [autodetect]
 +  --enable-libxvid         enable Xvid encoding via xvidcore,
 +                           native MPEG-4/Xvid encoder exists [no]
 +  --enable-libzimg         enable z.lib, needed for zscale filter [no]
 +  --enable-libzmq          enable message passing via libzmq [no]
 +  --enable-libzvbi         enable teletext support via libzvbi [no]
 +  --disable-lzma           disable lzma [autodetect]
 +  --enable-decklink        enable Blackmagic DeckLink I/O support [no]
 +  --enable-mediacodec      enable Android MediaCodec support [no]
 +  --enable-netcdf          enable NetCDF, needed for sofalizer filter [no]
 +  --enable-openal          enable OpenAL 1.1 capture support [no]
 +  --enable-opencl          enable OpenCL code
 +  --enable-opengl          enable OpenGL rendering [no]
 +  --enable-openssl         enable openssl, needed for https support
 +                           if gnutls is not used [no]
 +  --disable-schannel       disable SChannel SSP, needed for TLS support on
 +                           Windows if openssl and gnutls are not used [autodetect]
 +  --disable-sdl2           disable sdl2 [autodetect]
 +  --disable-securetransport disable Secure Transport, needed for TLS support
 +                           on OSX if openssl and gnutls are not used [autodetect]
 +  --disable-xlib           disable xlib [autodetect]
 +  --disable-zlib           disable zlib [autodetect]
  
    The following libraries provide various hardware acceleration features:
 -  --enable-cuda    Nvidia CUDA (dynamically linked)
 -  --enable-d3d11va Microsoft Direct3D 11 video acceleration [auto]
 -  --enable-dxva2   Microsoft DirectX 9 video acceleration [auto]
 -  --enable-libmfx  Intel MediaSDK (AKA Quick Sync Video)
 -  --enable-libnpp  Nvidia CUDA processing
 -  --enable-mmal    Broadcom Multi-Media Abstraction Layer (Raspberry Pi)
 -  --enable-nvenc   Nvidia video encoding
 -  --enable-omx     OpenMAX IL
 -  --enable-omx-rpi OpenMAX IL for Raspberry Pi
 -  --enable-vaapi   Video Acceleration API (mainly Unix/Intel)
 -  --enable-vda     Apple Video Decode Acceleration [auto]
 -  --enable-vdpau   Nvidia Video Decode and Presentation API for Unix [auto]
 +  --disable-audiotoolbox   disable Apple AudioToolbox code [autodetect]
 +  --disable-cuda           disable dynamically linked Nvidia CUDA code [autodetect]
 +  --enable-cuda-sdk        enable CUDA features that require the CUDA SDK [no]
 +  --disable-cuvid          disable Nvidia CUVID support [autodetect]
 +  --disable-d3d11va        disable Microsoft Direct3D 11 video acceleration code [autodetect]
 +  --disable-dxva2          disable Microsoft DirectX 9 video acceleration code [autodetect]
 +  --enable-libmfx          enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no]
 +  --enable-libnpp          enable Nvidia Performance Primitives-based code [no]
 +  --enable-mmal            enable Broadcom Multi-Media Abstraction Layer (Raspberry Pi) via MMAL [no]
 +  --disable-nvenc          disable Nvidia video encoding code [autodetect]
 +  --enable-omx             enable OpenMAX IL code [no]
 +  --enable-omx-rpi         enable OpenMAX IL code for Raspberry Pi [no]
 +  --disable-vaapi          disable Video Acceleration API (mainly Unix/Intel) code [autodetect]
 +  --disable-vda            disable Apple Video Decode Acceleration code [autodetect]
 +  --disable-vdpau          disable Nvidia Video Decode and Presentation API for Unix code [autodetect]
 +  --disable-videotoolbox   disable VideoToolbox code [autodetect]
  
  Toolchain options:
    --arch=ARCH              select architecture [$arch]
    --cpu=CPU                select the minimum required CPU (affects
                             instruction selection, may crash on older CPUs)
    --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]
 +  --progs-suffix=SUFFIX    program name suffix []
    --enable-cross-compile   assume a cross-compiler is used
    --sysroot=PATH           root of cross-build tree
    --sysinclude=PATH        location of cross-build system headers
    --target-exec=CMD        command to run executables on target
    --target-path=DIR        path to view of build directory on target
    --target-samples=DIR     path to samples directory on target
 +  --tempprefix=PATH        force fixed dir/prefix instead of mktemp for checks
    --toolchain=NAME         set tool defaults according to NAME
 -  --nm=NM                  use nm tool
 +  --nm=NM                  use nm tool NM [$nm_default]
    --ar=AR                  use archive tool AR [$ar_default]
    --as=AS                  use assembler AS [$as_default]
 +  --ln_s=LN_S              use symbolic link tool LN_S [$ln_s_default]
 +  --strip=STRIP            use strip tool STRIP [$strip_default]
 +  --windres=WINDRES        use windows resource compiler WINDRES [$windres_default]
 +  --yasmexe=EXE            use yasm-compatible assembler EXE [$yasmexe_default]
    --cc=CC                  use C compiler CC [$cc_default]
 +  --cxx=CXX                use C compiler CXX [$cxx_default]
    --objcc=OCC              use ObjC compiler OCC [$cc_default]
    --dep-cc=DEPCC           use dependency generator DEPCC [$cc_default]
 -  --ld=LD                  use linker LD
 +  --nvcc=NVCC              use Nvidia CUDA compiler NVCC [$nvcc_default]
 +  --ld=LD                  use linker LD [$ld_default]
    --pkg-config=PKGCONFIG   use pkg-config tool PKGCONFIG [$pkg_config_default]
    --pkg-config-flags=FLAGS pass additional flags to pkgconf []
 +  --ranlib=RANLIB          use ranlib RANLIB [$ranlib_default]
 +  --doxygen=DOXYGEN        use DOXYGEN to generate API doc [$doxygen_default]
    --host-cc=HOSTCC         use host C compiler HOSTCC
    --host-cflags=HCFLAGS    use HCFLAGS when compiling for host
    --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
    --host-libs=HLIBS        use libs HLIBS when linking for host
    --host-os=OS             compiler host OS [$target_os]
    --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]
 +  --extra-cxxflags=ECFLAGS add ECFLAGS to CXXFLAGS [$CXXFLAGS]
    --extra-objcflags=FLAGS  add FLAGS to OBJCFLAGS [$CFLAGS]
    --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
    --extra-ldexeflags=ELDFLAGS add ELDFLAGS to LDEXEFLAGS [$LDEXEFLAGS]
 +  --extra-ldlibflags=ELDFLAGS add ELDFLAGS to LDLIBFLAGS [$LDLIBFLAGS]
    --extra-libs=ELIBS       add ELIBS [$ELIBS]
    --extra-version=STRING   version string suffix []
    --optflags=OPTFLAGS      override optimization-related compiler flags
 +  --nvccflags=NVCCFLAGS    override nvcc flags [$nvccflags_default]
 +  --build-suffix=SUFFIX    library name suffix []
    --enable-pic             build position-independent code
    --enable-thumb           compile for Thumb instruction set
    --enable-lto             use link-time optimization
@@@ -375,7 -297,7 +375,7 @@@ Advanced options (experts only)
    --disable-safe-bitstream-reader
                             disable buffer boundary checking in bitreaders
                             (faster, but may crash)
 -  --enable-sram            allow use of on-chip SRAM
 +  --sws-max-filter-size=N  the max filter size swscale uses [$sws_max_filter_size_default]
  
  Optimization options (experts only):
    --disable-asm            disable all assembly optimizations
    --disable-fma3           disable FMA3 optimizations
    --disable-fma4           disable FMA4 optimizations
    --disable-avx2           disable AVX2 optimizations
 +  --disable-aesni          disable AESNI optimizations
    --disable-armv5te        disable armv5te optimizations
    --disable-armv6          disable armv6 optimizations
    --disable-armv6t2        disable armv6t2 optimizations
    --disable-neon           disable NEON optimizations
    --disable-inline-asm     disable use of inline assembly
    --disable-yasm           disable use of nasm/yasm assembly
 -
 -Developer options (useful when working on Libav itself):
 +  --disable-mipsdsp        disable MIPS DSP ASE R1 optimizations
 +  --disable-mipsdspr2      disable MIPS DSP ASE R2 optimizations
 +  --disable-msa            disable MSA optimizations
 +  --disable-mipsfpu        disable floating point MIPS optimizations
 +  --disable-mmi            disable Loongson SIMD optimizations
 +  --disable-fast-unaligned consider unaligned accesses slow
 +
 +Developer options (useful when working on FFmpeg itself):
    --disable-debug          disable debugging symbols
    --enable-debug=LEVEL     set the debug level [$debuglevel]
    --disable-optimizations  disable compiler optimizations
    --enable-extra-warnings  enable more compiler warnings
 +  --disable-stripping      disable stripping of executables and shared libraries
 +  --assert-level=level     0(default), 1 or 2, amount of assertion testing,
 +                           2 causes a slowdown at runtime.
 +  --enable-memory-poisoning fill heap uninitialized allocated space with arbitrary data
 +  --valgrind=VALGRIND      run "make fate" tests through valgrind to detect memory
 +                           leaks and errors, using the specified valgrind binary.
 +                           Cannot be combined with --target-exec
 +  --enable-ftrapv          Trap arithmetic overflows
    --samples=PATH           location of test samples for FATE, if not set use
 -                           \$LIBAV_SAMPLES at make invocation time.
 +                           \$FATE_SAMPLES at make invocation time.
    --enable-neon-clobber-test check NEON registers for clobbering (should be
                             used only for debugging purposes)
    --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only;
    --random-seed=VALUE      seed value for --enable/disable-random
    --disable-valgrind-backtrace do not print a backtrace under Valgrind
                             (only applies to --disable-optimizations builds)
 +  --enable-osfuzz          Enable building fuzzer tool
 +  --libfuzzer=PATH         path to libfuzzer
    --ignore-tests=TESTS     comma-separated list (without "fate-" prefix
                             in the name) of tests whose result is ignored
  
@@@ -452,18 -357,6 +452,18 @@@ EO
  }
  
  quotes='""'
 +if test -t 1 && which tput >/dev/null 2>&1; then
 +    ncolors=$(tput colors)
 +    if test -n "$ncolors" && test $ncolors -ge 8; then
 +        bold_color=$(tput bold)
 +        warn_color=$(tput setaf 3)
 +        error_color=$(tput setaf 1)
 +        reset_color=$(tput sgr0)
 +    fi
 +    # 72 used instead of 80 since that's the default of pr
 +    ncols=$(tput cols)
 +fi
 +: ${ncols:=72}
  
  log(){
      echo "$@" >> $logfile
  
  log_file(){
      log BEGIN $1
 -    i=1
 -    while read line; do
 -        printf '%5s   %s\n' "${i}" "${line}"
 -        i=$(($i+1))
 -    done < $1 >> $logfile
 +    pr -n -t $1 >> $logfile
      log END $1
  }
  
 -echolog(){
 -    log "$@"
 -    echo "$@"
 -}
 -
  warn(){
      log "WARNING: $*"
      WARNINGS="${WARNINGS}WARNING: $*\n"
  }
  
  die(){
 -    echolog "$@"
 +    log "$@"
 +    echo "$error_color$bold_color$@$reset_color"
      cat <<EOF
  
  If you think configure made a mistake, make sure you are using the latest
  version from Git.  If the latest version fails, report the problem to the
 -libav-tools@libav.org mailing list or IRC #libav on irc.freenode.net.
 +ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.freenode.net.
  EOF
      if disabled logging; then
          cat <<EOF
@@@ -497,7 -398,7 +497,7 @@@ EO
      else
          cat <<EOF
  Include the log file "$logfile" produced by configure as this will help
 -solving the problem.
 +solve the problem.
  EOF
      fi
      exit 1
@@@ -523,7 -424,7 +523,7 @@@ sh_quote()
  }
  
  cleanws(){
 -    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//'
 +    echo "$@" | sed 's/^ *//;s/[[:space:]][[:space:]]*/ /g;s/ *$//'
  }
  
  filter(){
@@@ -603,13 -504,6 +603,13 @@@ popvar()
      done
  }
  
 +request(){
 +    for var in $*; do
 +        eval ${var}_requested=yes
 +        eval $var=
 +    done
 +}
 +
  enable(){
      set_all yes $*
  }
@@@ -666,18 -560,13 +666,18 @@@ enable_deep_weak()
      done
  }
  
 +requested(){
 +    test "${1#!}" = "$1" && op='=' || op=!=
 +    eval test "x\$${1#!}_requested" $op "xyes"
 +}
 +
  enabled(){
 -    test "${1#!}" = "$1" && op== || op=!=
 +    test "${1#!}" = "$1" && op='=' || op=!=
      eval test "x\$${1#!}" $op "xyes"
  }
  
  disabled(){
 -    test "${1#!}" = "$1" && op== || op=!=
 +    test "${1#!}" = "$1" && op='=' || op=!=
      eval test "x\$${1#!}" $op "xno"
  }
  
@@@ -742,9 -631,9 +742,9 @@@ do_check_deps()
  
          [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
          [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; }
 -        enabled_all  $dep_all || disable $cfg
 -        enabled_any  $dep_any || disable $cfg
 -        disabled_any $dep_sel && disable $cfg
 +        enabled_all  $dep_all || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not all dependencies are satisfied: $dep_all"; }
 +        enabled_any  $dep_any || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not any dependency is satisfied: $dep_any"; }
 +        disabled_any $dep_sel && { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some selected dependency is unsatisfied: $dep_sel"; }
  
          if enabled $cfg; then
              enable_deep $dep_sel
@@@ -787,12 -676,6 +787,12 @@@ print_config()
                  } else if (file ~ /\\.mak\$/) {
                      n = -v ? \"\" : \"!\";
                      printf(\"%s%s=yes\\n\", n, c) >>file;
 +                } else if (file ~ /\\.texi\$/) {
 +                    pre = -v ? \"\" : \"@c \";
 +                    yesno = \$2;
 +                    c2 = tolower(c);
 +                    gsub(/_/, \"-\", c2);
 +                    printf(\"%s@set %s %s\\n\", pre, c2, yesno) >>file;
                  }
              }
          }"
@@@ -839,10 -722,6 +839,10 @@@ add_cflags_headers()
      append CFLAGS_HEADERS $($cflags_filter "$@")
  }
  
 +add_cxxflags(){
 +    append CXXFLAGS $($cflags_filter "$@")
 +}
 +
  add_asflags(){
      append ASFLAGS $($asflags_filter "$@")
  }
@@@ -859,12 -738,8 +859,12 @@@ add_ldexeflags()
      append LDEXEFLAGS $($ldflags_filter "$@")
  }
  
 +add_ldlibflags(){
 +    append LDLIBFLAGS $($ldflags_filter "$@")
 +}
 +
  add_stripflags(){
 -    append STRIPFLAGS "$@"
 +    append ASMSTRIPFLAGS "$@"
  }
  
  add_extralibs(){
@@@ -894,11 -769,6 +894,11 @@@ check_cmd()
      "$@" >> $logfile 2>&1
  }
  
 +check_stat(){
 +    log check_stat "$@"
 +    stat "$1" >> $logfile 2>&1
 +}
 +
  cc_o(){
      eval printf '%s\\n' $CC_O
  }
@@@ -914,18 -784,11 +914,18 @@@ check_cc()
      check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC
  }
  
 +check_cxx(){
 +    log check_cxx "$@"
 +    cat > $TMPCPP
 +    log_file $TMPCPP
 +    check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
 +}
 +
  check_objcc(){
      log check_objcc "$@"
 -    cat > $TMPC
 -    log_file $TMPC
 -    check_cmd $objcc $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPC
 +    cat > $TMPM
 +    log_file $TMPM
 +    check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
  }
  
  check_cpp(){
@@@ -957,25 -820,6 +957,25 @@@ void foo(void){ __asm__ volatile($code)
  EOF
  }
  
 +check_inline_asm_flags(){
 +    log check_inline_asm_flags "$@"
 +    name="$1"
 +    code="$2"
 +    flags=''
 +    shift 2
 +    while [ "$1" != "" ]; do
 +      append flags $1
 +      shift
 +    done;
 +    disable $name
 +    cat > $TMPC <<EOF
 +void foo(void){ __asm__ volatile($code); }
 +EOF
 +    log_file $TMPC
 +    check_cmd $cc $CPPFLAGS $CFLAGS $flags "$@" $CC_C $(cc_o $TMPO) $TMPC &&
 +    enable $name && add_cflags $flags && add_asflags $flags && add_ldflags $flags
 +}
 +
  check_insn(){
      log check_insn "$@"
      check_inline_asm ${1}_inline "\"$2\""
@@@ -987,7 -831,7 +987,7 @@@ check_yasm()
      echo "$1" > $TMPS
      log_file $TMPS
      shift 1
 -    check_cmd $yasmexe $YASMFLAGS "$@" -o $TMPO $TMPS
 +    check_cmd $yasmexe $YASMFLAGS -Werror "$@" -o $TMPO $TMPS
  }
  
  ld_o(){
  
  check_ld(){
      log check_ld "$@"
 -    flags=$(filter_out '-l*' "$@")
 -    libs=$(filter '-l*' "$@")
 -    check_cc $($cflags_filter $flags) || return
 +    type=$1
 +    shift 1
 +    flags=$(filter_out '-l*|*.so' $@)
 +    libs=$(filter '-l*|*.so' $@)
 +    check_$type $($cflags_filter $flags) || return
      flags=$($ldflags_filter $flags)
      libs=$($ldflags_filter $libs)
 -    check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
 +    check_cmd $ld $LDFLAGS $LDEXEFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
  }
  
  print_include(){
@@@ -1047,14 -889,6 +1047,14 @@@ check_cflags()
      test_cflags "$@" && add_cflags "$@"
  }
  
 +check_cxxflags(){
 +    log check_cxxflags "$@"
 +    set -- $($cflags_filter "$@")
 +    check_cxx "$@" <<EOF && append CXXFLAGS "$@"
 +int x;
 +EOF
 +}
 +
  test_objcflags(){
      log test_objcflags "$@"
      set -- $($objcflags_filter "$@")
@@@ -1070,7 -904,7 +1070,7 @@@ check_objcflags()
  
  test_ldflags(){
      log test_ldflags "$@"
 -    check_ld "$@" <<EOF
 +    check_ld "cc" "$@" <<EOF
  int main(void){ return 0; }
  EOF
  }
@@@ -1086,7 -920,7 +1086,7 @@@ test_stripflags()
      check_cc <<EOF
  int main(void) { return 0; }
  EOF
 -    check_cmd $strip $STRIPFLAGS "$@" $TMPO
 +    check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
  }
  
  check_stripflags(){
@@@ -1105,44 -939,17 +1105,44 @@@ int x
  EOF
  }
  
 +check_header_objcc(){
 +    log check_header_objcc "$@"
 +    rm -f -- "$TMPO"
 +    header=$1
 +    shift
 +    disable_safe $header
 +    {
 +       echo "#include <$header>"
 +       echo "int main(void) { return 0; }"
 +    } | check_objcc && check_stat "$TMPO" && enable_safe $headers
 +}
 +
  check_func(){
      log check_func "$@"
      func=$1
      shift
      disable $func
 -    check_ld "$@" <<EOF && enable $func
 +    check_ld "cc" "$@" <<EOF && enable $func
  extern int $func();
  int main(void){ $func(); }
  EOF
  }
  
 +check_complexfunc(){
 +    log check_complexfunc "$@"
 +    func=$1
 +    narg=$2
 +    shift 2
 +    test $narg = 2 && args="f, g" || args="f * I"
 +    disable $func
 +    check_ld "cc" "$@" <<EOF && enable $func
 +#include <complex.h>
 +#include <math.h>
 +float foo(complex float f, complex float g) { return $func($args); }
 +int main(void){ return (int) foo; }
 +EOF
 +}
 +
  check_mathfunc(){
      log check_mathfunc "$@"
      func=$1
      shift 2
      test $narg = 2 && args="f, g" || args="f"
      disable $func
 -    check_ld "$@" <<EOF && enable $func
 +    check_ld "cc" "$@" <<EOF && enable $func
  #include <math.h>
  float foo(float f, float g) { return $func($args); }
 -int main(void){ return 0; }
 +int main(void){ return (int) foo; }
  EOF
  }
  
@@@ -1166,36 -973,11 +1166,36 @@@ check_func_headers()
          for hdr in $headers; do
              print_include $hdr
          done
 +        echo "#include <stdint.h>"
          for func in $funcs; do
              echo "long check_$func(void) { return (long) $func; }"
          done
 -        echo "int main(void) { return 0; }"
 -    } | check_ld "$@" && enable $funcs && enable_safe $headers
 +        echo "int main(void) { int ret = 0;"
 +        # LTO could optimize out the test functions without this
 +        for func in $funcs; do
 +            echo " ret |= ((intptr_t)check_$func) & 0xFFFF;"
 +        done
 +        echo "return ret; }"
 +    } | check_ld "cc" "$@" && enable $funcs && enable_safe $headers
 +}
 +
 +check_class_headers_cpp(){
 +    log check_class_headers_cpp "$@"
 +    headers=$1
 +    classes=$2
 +    shift 2
 +    {
 +        for hdr in $headers; do
 +            echo "#include <$hdr>"
 +        done
 +        echo "int main(void) { "
 +        i=1
 +        for class in $classes; do
 +            echo "$class obj$i;"
 +            i=$(expr $i + 1)
 +        done
 +        echo "return 0; }"
 +    } | check_ld "cxx" "$@" && enable $funcs && enable_safe $headers
  }
  
  check_cpp_condition(){
  EOF
  }
  
 -test_cflags_cpp(){
 -    log test_cflags_cpp "$@"
 +test_cflags_cc(){
 +    log test_cflags_cc "$@"
      flags=$1
 -    condition=$2
 -    shift 2
 +    header=$2
 +    condition=$3
 +    shift 3
      set -- $($cflags_filter "$flags")
 -    check_cpp "$@" <<EOF
 +    check_cc "$@" <<EOF
 +#include <$header>
  #if !($condition)
  #error "unsatisfied condition: $condition"
  #endif
@@@ -1237,14 -1017,6 +1237,14 @@@ check_lib()
          enable $name && add_extralibs "$@"
  }
  
 +check_lib_cpp(){
 +    log check_lib_cpp "$@"
 +    headers="$1"
 +    classes="$2"
 +    shift 2
 +    check_class_headers_cpp "$headers" "$classes" "$@" && add_extralibs "$@"
 +}
 +
  check_pkg_config(){
      log check_pkg_config "$@"
      pkg_version="$1"
  }
  
  check_exec(){
 -    check_ld "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
 +    check_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
  }
  
  check_exec_crash(){
@@@ -1322,7 -1094,7 +1322,7 @@@ check_builtin()
      builtin=$3
      shift 3
      disable "$name"
 -    check_code ld "$headers" "$builtin" "$@" && enable "$name"
 +    check_code ld "$headers" "$builtin" "cc" "$@" && enable "$name"
  }
  
  check_compile_assert(){
@@@ -1345,26 -1117,15 +1345,26 @@@ require()
      check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
  }
  
 -require_pkg_config(){
 -    log require_pkg_config "$@"
 -    pkg_version="$1"
 -    pkg="${1%% *}"
 -    check_pkg_config "$@" || die "ERROR: $pkg_version not found"
 +require_cpp(){
 +    name="$1"
 +    headers="$2"
 +    classes="$3"
 +    shift 3
 +    check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
 +}
 +
 +use_pkg_config(){
 +    log use_pkg_config "$@"
 +    pkg="$1"
 +    check_pkg_config "$@" || return 1
      add_cflags    $(get_safe "${pkg}_cflags")
      add_extralibs $(get_safe "${pkg}_extralibs")
  }
  
 +require_pkg_config(){
 +    use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message"
 +}
 +
  hostcc_e(){
      eval printf '%s\\n' $HOSTCC_E
  }
@@@ -1415,6 -1176,12 +1415,6 @@@ check_host_cpp_condition()
  EOF
  }
  
 -apply(){
 -    file=$1
 -    shift
 -    "$@" < "$file" > "$file.tmp" && mv "$file.tmp" "$file" || rm "$file.tmp"
 -}
 -
  cp_if_changed(){
      cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; } && return
      mkdir -p "$(dirname $2)"
@@@ -1458,49 -1225,36 +1458,49 @@@ COMPONENT_LIST=
  "
  
  EXAMPLE_LIST="
 +    avio_dir_cmd_example
 +    avio_reading_example
      decode_audio_example
      decode_video_example
 +    demuxing_decoding_example
      encode_audio_example
      encode_video_example
 +    extract_mvs_example
      filter_audio_example
 +    filtering_audio_example
 +    filtering_video_example
 +    http_multiclient_example
      metadata_example
 -    output_example
 +    muxing_example
      qsvdec_example
 +    remuxing_example
 +    resampling_audio_example
 +    scaling_video_example
      transcode_aac_example
 +    transcoding_example
  "
 -
 -HWACCEL_LIBRARY_NONFREE_LIST="
 -    cuda
 -    libnpp
 -"
 -HWACCEL_LIBRARY_LIST="
 -    $HWACCEL_LIBRARY_NONFREE_LIST
 -    d3d11va
 -    dxva2
 -    libmfx
 -    mmal
 -    nvenc
 -    omx
 -    vaapi
 -    vda
 -    vdpau
 +EXTERNAL_AUTODETECT_LIBRARY_LIST="
 +    bzlib
 +    iconv
 +    libxcb
 +    libxcb_shm
 +    libxcb_shape
 +    libxcb_xfixes
 +    lzma
 +    schannel
 +    sdl
 +    sdl2
 +    securetransport
 +    xlib
 +    zlib
  "
  
  EXTERNAL_LIBRARY_GPL_LIST="
 +    avisynth
 +    frei0r
      libcdio
 +    librubberband
 +    libvidstab
      libx264
      libx265
      libxavs
  "
  
  EXTERNAL_LIBRARY_NONFREE_LIST="
 -    libfaac
 +    decklink
      libfdk_aac
      openssl
  "
  
  EXTERNAL_LIBRARY_VERSION3_LIST="
 +    gmp
      libopencore_amrnb
      libopencore_amrwb
 -    libvo_aacenc
      libvo_amrwbenc
  "
  
 +EXTERNAL_LIBRARY_GPLV3_LIST="
 +    libsmbclient
 +"
 +
  EXTERNAL_LIBRARY_LIST="
 +    $EXTERNAL_AUTODETECT_LIBRARY_LIST
      $EXTERNAL_LIBRARY_GPL_LIST
      $EXTERNAL_LIBRARY_NONFREE_LIST
      $EXTERNAL_LIBRARY_VERSION3_LIST
 -    avisynth
 -    avxsynth
 -    bzlib
 -    frei0r
 +    $EXTERNAL_LIBRARY_GPLV3_LIST
 +    chromaprint
 +    crystalhd
 +    gcrypt
      gnutls
 +    jni
 +    ladspa
 +    libass
 +    libbluray
      libbs2b
 +    libcaca
 +    libcelt
      libdc1394
 -    libdcadec
 +    libflite
      libfontconfig
      libfreetype
 +    libfribidi
 +    libgme
      libgsm
 -    libhdcd
 +    libiec61883
      libilbc
      libkvazaar
 +    libmodplug
      libmp3lame
 +    libnut
      libopencv
      libopenh264
      libopenjpeg
 +    libopenmpt
      libopus
      libpulse
 +    librsvg
      librtmp
      libschroedinger
 +    libshine
 +    libsmbclient
      libsnappy
 +    libsoxr
      libspeex
 +    libssh
 +    libtesseract
      libtheora
      libtwolame
 +    libv4l2
      libvorbis
      libvpx
      libwavpack
      libwebp
 -    libxcb
 -    libxcb_shm
 -    libxcb_xfixes
 -    zlib
 +    libzimg
 +    libzmq
 +    libzvbi
 +    mediacodec
 +    netcdf
 +    openal
 +    opencl
 +    opengl
 +    videotoolbox
 +"
 +HWACCEL_AUTODETECT_LIBRARY_LIST="
 +    audiotoolbox
 +    cuda
 +    cuvid
 +    d3d11va
 +    dxva2
 +    nvenc
 +    vaapi
 +    vda
 +    vdpau
 +    videotoolbox_hwaccel
 +    xvmc
 +"
 +
 +HWACCEL_LIBRARY_NONFREE_LIST="
 +    cuda_sdk
 +    libnpp
 +"
 +
 +HWACCEL_LIBRARY_LIST="
 +    $HWACCEL_AUTODETECT_LIBRARY_LIST
 +    $HWACCEL_LIBRARY_NONFREE_LIST
 +    libmfx
 +    mmal
 +    omx
 +"
 +
 +DOCUMENT_LIST="
 +    doc
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
  "
  
  FEATURE_LIST="
 +    ftrapv
      gray
      hardcoded_tables
      omx_rpi
      safe_bitstream_reader
      shared
      small
 -    sram
      static
      swscale_alpha
  "
@@@ -1642,8 -1334,6 +1642,8 @@@ LIBRARY_LIST=
      avformat
      avresample
      avutil
 +    postproc
 +    swresample
      swscale
  "
  
@@@ -1654,30 -1344,26 +1654,30 @@@ LICENSE_LIST=
  "
  
  PROGRAM_LIST="
 -    avconv
 -    avplay
 -    avprobe
 +    ffplay
 +    ffprobe
 +    ffserver
 +    ffmpeg
  "
  
  SUBSYSTEM_LIST="
      dct
 -    doc
 +    dwt
      error_resilience
      faan
 +    fast_unaligned
      fft
      lsp
      lzo
      mdct
 +    pixelutils
      network
      rdft
  "
  
  # COMPONENT_LIST needs to come last to ensure correct dependency checking
  CONFIG_LIST="
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
      $HWACCEL_LIBRARY_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
      $SUBSYSTEM_LIST
 +    fontconfig
 +    memory_poisoning
      neon_clobber_test
 +    ossfuzz
      pic
 -    pod2man
 -    texi2html
      thumb
      valgrind_backtrace
      xmm_clobber_test
  
  THREADS_LIST="
      pthreads
 +    os2threads
      w32threads
  "
  
@@@ -1709,12 -1393,6 +1709,12 @@@ ATOMICS_LIST=
      atomics_win32
  "
  
 +AUTODETECT_LIBS="
 +    $EXTERNAL_AUTODETECT_LIBRARY_LIST
 +    $HWACCEL_AUTODETECT_LIBRARY_LIST
 +    $THREADS_LIST
 +"
 +
  ARCH_LIST="
      aarch64
      alpha
@@@ -1750,29 -1428,9 +1750,29 @@@ ARCH_EXT_LIST_ARM=
      neon
      vfp
      vfpv3
 +    setend
 +"
 +
 +ARCH_EXT_LIST_MIPS="
 +    mipsfpu
 +    mips32r2
 +    mips32r5
 +    mips64r2
 +    mips32r6
 +    mips64r6
 +    mipsdsp
 +    mipsdspr2
 +    msa
 +"
 +
 +ARCH_EXT_LIST_LOONGSON="
 +    loongson2
 +    loongson3
 +    mmi
  "
  
  ARCH_EXT_LIST_X86_SIMD="
 +    aesni
      amd3dnow
      amd3dnowext
      avx
@@@ -1805,12 -1463,22 +1805,12 @@@ ARCH_EXT_LIST_X86=
      i686
  "
  
 -ARCH_EXT_LIST_MIPS="
 -    loongson
 -    mips32r1
 -    mips64r1
 -    mips32r2
 -    mips64r2
 -    mips32r6
 -    mips64r6
 -"
 -
  ARCH_EXT_LIST="
      $ARCH_EXT_LIST_ARM
 -    $ARCH_EXT_LIST_MIPS
      $ARCH_EXT_LIST_PPC
      $ARCH_EXT_LIST_X86
 -    vis
 +    $ARCH_EXT_LIST_MIPS
 +    $ARCH_EXT_LIST_LOONGSON
  "
  
  ARCH_FEATURES="
@@@ -1831,7 -1499,6 +1831,7 @@@ BUILTIN_LIST=
      MemoryBarrier
      mm_empty
      rdtsc
 +    sarestart
      sem_timedwait
      sync_val_compare_and_swap
  "
@@@ -1847,13 -1514,12 +1847,13 @@@ HAVE_LIST_PUB=
  "
  
  HEADERS_LIST="
 -    AVFoundation_AVFoundation_h
      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_video_bktr_ioctl_bt848_h
      dev_video_meteor_ioctl_meteor_h
      direct_h
 +    dirent_h
      dlfcn_h
      dxva_h
 +    ES2_gl_h
      gsm_h
      io_h
      mach_mach_time_h
      machine_ioctl_bt848_h
      machine_ioctl_meteor_h
      malloc_h
 +    opencv2_core_core_c_h
 +    openjpeg_2_1_openjpeg_h
 +    openjpeg_2_0_openjpeg_h
 +    openjpeg_1_5_openjpeg_h
 +    OpenGL_gl3_h
      poll_h
      sndio_h
      soundcard_h
      sys_time_h
      sys_un_h
      sys_videoio_h
 +    termios_h
 +    udplite_h
      unistd_h
      valgrind_valgrind_h
      windows_h
@@@ -1901,24 -1558,14 +1901,24 @@@ INTRINSICS_LIST=
      intrinsics_neon
  "
  
 +COMPLEX_FUNCS="
 +    cabs
 +    cexp
 +"
 +
  MATH_FUNCS="
      atanf
      atan2f
 +    cbrt
      cbrtf
 +    copysign
      cosf
 +    erf
      exp2
      exp2f
      expf
 +    hypot
 +    isfinite
      isinf
      isnan
      ldexpf
  "
  
  SYSTEM_FUNCS="
 +    access
      aligned_malloc
 +    arc4random
      clock_gettime
      closesocket
      CommandLineToArgvW
      getrusage
      GetSystemTimeAsFileTime
      gettimeofday
 +    glob
 +    glXGetProcAddress
      gmtime_r
      inet_aton
      isatty
      jack_port_get_latency_range
 +    kbhit
      LoadLibrary
      localtime_r
 +    lstat
 +    lzo1x_999_compress
      mach_absolute_time
      MapViewOfFile
      memalign
      mmap
      mprotect
      nanosleep
 +    PeekNamedPipe
      posix_memalign
 +    pthread_cancel
      sched_getaffinity
      SetConsoleTextAttribute
 +    SetConsoleCtrlHandler
      setmode
      setrlimit
      Sleep
      sysconf
      sysctl
      usleep
 +    UTGetOSTypeFromString
      VirtualAlloc
 +    wglGetProcAddress
  "
  
  TOOLCHAIN_FEATURES="
      ebp_available
      ebx_available
      gnu_as
 +    gnu_windres
      ibm_asm
 +    inline_asm_direct_symbol_refs
      inline_asm_labels
 +    inline_asm_nonlocal_labels
      pragma_deprecated
 +    rsync_contimeout
      symver_asm_label
      symver_gnu_asm
      vfp_args
@@@ -2028,14 -1659,11 +2028,14 @@@ TYPES_LIST=
      struct_group_source_req
      struct_ip_mreq_source
      struct_ipv6_mreq
 +    struct_msghdr_msg_flags
      struct_pollfd
      struct_rusage_ru_maxrss
 +    struct_sctp_event_subscribe
      struct_sockaddr_in6
      struct_sockaddr_sa_len
      struct_sockaddr_storage
 +    struct_stat_st_mtim_tv_nsec
      struct_v4l2_frmivalenum_discrete
  "
  
@@@ -2044,9 -1672,7 +2044,9 @@@ HAVE_LIST=
      $(add_suffix _external $ARCH_EXT_LIST)
      $(add_suffix _inline   $ARCH_EXT_LIST)
      $ARCH_FEATURES
 +    $ATOMICS_LIST
      $BUILTIN_LIST
 +    $COMPLEX_FUNCS
      $HAVE_LIST_CMDLINE
      $HAVE_LIST_PUB
      $HEADERS_LIST
      $THREADS_LIST
      $TOOLCHAIN_FEATURES
      $TYPES_LIST
 +    alsa
 +    atomics_native
      dos_paths
      dxva2_lib
 +    dxva2api_cobj
 +    jack
      libc_msvcrt
 +    makeinfo
 +    makeinfo_html
      MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
 -    sdl
 +    perl
 +    pod2man
 +    sdl2
      section_data_rel_ro
 +    sndio
 +    texi2html
      threads
      vaapi_drm
      vaapi_x11
      vdpau_x11
 +    winrt
  "
  
  # options emitted with CONFIG_ prefix but not available on the command line
@@@ -2090,14 -1705,13 +2090,14 @@@ CONFIG_EXTRA=
      cabac
      dirac_parse
      dvprofile
 +    exif
      faandct
      faanidct
      fdctdsp
      flacdsp
      fmtconvert
 +    frame_thread_encoder
      g722dsp
 -    gmp
      golomb
      gplv3
      h263dsp
      h264parse
      h264pred
      h264qpel
 -    hevc_ps
 +    hevcparse
      hpeldsp
      huffman
      huffyuvdsp
      huffyuvencdsp
      idctdsp
      iirfilter
 -    imdct15
 +    mdct15
      intrax8
      iso_media
      ividsp
      jpegtables
 -    libx262
      lgplv3
 +    libx262
 +    llauddsp
 +    llviddsp
 +    llvidencdsp
      lpc
      lzf
      me_cmp
      vp3dsp
      vp56dsp
      vp8dsp
 +    vt_bt2020
      wma_freqs
      wmv2dsp
  "
@@@ -2175,7 -1785,6 +2175,7 @@@ CMDLINE_SELECT=
      lto
      optimizations
      rpath
 +    stripping
  "
  
  PATHS_LIST="
      incdir
      libdir
      mandir
 +    pkgconfigdir
      prefix
      shlibdir
 +    install_name_dir
  "
  
  CMDLINE_SET="
      ar
      arch
      as
 +    assert_level
 +    build_suffix
      cc
      objcc
      cpu
      cross_prefix
      custom_allocator
 +    cxx
      dep_cc
 +    doxygen
      env
      extra_version
 +    gas
      host_cc
      host_cflags
      host_extralibs
      host_ldflags
      host_os
      ignore_tests
 +    install
      ld
 +    ln_s
      logfile
      malloc_prefix
      nm
      optflags
 +    nvccflags
      pkg_config
      pkg_config_flags
 +    progs_suffix
      random_seed
 +    ranlib
      samples
 +    strip
 +    sws_max_filter_size
      sysinclude
      sysroot
      target_exec
      target_os
      target_path
      target_samples
 +    tempprefix
      toolchain
 +    valgrind
 +    yasmexe
  "
  
  CMDLINE_APPEND="
      extra_cflags
 +    extra_cxxflags
      extra_objcflags
      host_cppflags
  "
@@@ -2263,26 -1854,10 +2263,26 @@@ neon_deps_any="aarch64 arm
  intrinsics_neon_deps="neon"
  vfp_deps_any="aarch64 arm"
  vfpv3_deps="vfp"
 +setend_deps="arm"
  
  map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
  
 +loongson2_deps="mips"
 +loongson3_deps="mips"
 +mipsfpu_deps="mips"
 +mipsdsp_deps="mips"
 +mipsdspr2_deps="mips"
 +mips32r2_deps="mips"
 +mips32r5_deps="mips"
 +mips32r6_deps="mips"
 +mips64r2_deps="mips"
 +mips64r6_deps="mips"
 +msa_deps="mipsfpu"
 +mmi_deps="mips"
 +
  altivec_deps="ppc"
 +dcbzl_deps="ppc"
 +ldbrx_deps="ppc"
  ppc4xx_deps="ppc"
  vsx_deps="altivec"
  power8_deps="vsx"
@@@ -2302,7 -1877,6 +2302,7 @@@ sse3_deps="sse2
  ssse3_deps="sse3"
  sse4_deps="ssse3"
  sse42_deps="sse4"
 +aesni_deps="sse42"
  avx_deps="sse42"
  xop_deps="avx"
  fma3_deps="avx"
@@@ -2346,27 -1920,23 +2346,27 @@@ error_resilience_select="me_cmp
  faandct_deps="faan fdctdsp"
  faanidct_deps="faan idctdsp"
  h264dsp_select="startcode"
 -hevc_ps_select="golomb"
 +hevcparse_select="golomb"
 +frame_thread_encoder_deps="encoders threads"
  intrax8_select="blockdsp idctdsp"
  mdct_select="fft"
 -rdft_select="fft"
 +mdct15_select="fft"
  me_cmp_select="fdctdsp idctdsp pixblockdsp"
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp mpegaudioheader"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp"
 +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
  mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
  vc1dsp_select="h264chroma qpeldsp startcode"
 +rdft_select="fft"
  
  # decoders / encoders
 -aac_decoder_select="imdct15 mdct sinewin"
 -aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
 +aac_decoder_select="mdct15 mdct sinewin"
 +aac_fixed_decoder_select="mdct sinewin"
 +aac_encoder_select="audio_frame_queue iirfilter lpc mdct sinewin"
  aac_latm_decoder_select="aac_decoder aac_latm_parser"
  ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct"
 +ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
  ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
  ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
  adpcm_g722_decoder_select="g722dsp"
@@@ -2376,11 -1946,8 +2376,11 @@@ alac_encoder_select="lpc
  als_decoder_select="bswapdsp"
  amrnb_decoder_select="lsp"
  amrwb_decoder_select="lsp"
 -amv_decoder_select="sp5x_decoder"
 -ape_decoder_select="bswapdsp"
 +amv_decoder_select="sp5x_decoder exif"
 +amv_encoder_select="aandcttables jpegtables mpegvideoenc"
 +ape_decoder_select="bswapdsp llauddsp"
 +apng_decoder_select="zlib"
 +apng_encoder_select="llvidencdsp zlib"
  asv1_decoder_select="blockdsp bswapdsp idctdsp"
  asv1_encoder_select="bswapdsp fdctdsp pixblockdsp"
  asv2_decoder_select="blockdsp bswapdsp idctdsp"
@@@ -2388,7 -1955,6 +2388,7 @@@ asv2_encoder_select="bswapdsp fdctdsp p
  atrac1_decoder_select="mdct sinewin"
  atrac3_decoder_select="mdct"
  atrac3p_decoder_select="mdct sinewin"
 +avrn_decoder_select="exif jpegtables"
  bink_decoder_select="blockdsp hpeldsp"
  binkaudio_dct_decoder_select="mdct rdft dct sinewin wma_freqs"
  binkaudio_rdft_decoder_select="mdct rdft sinewin wma_freqs"
@@@ -2398,21 -1964,20 +2398,21 @@@ comfortnoise_encoder_select="lpc
  cook_decoder_select="audiodsp mdct sinewin"
  cscd_decoder_select="lzo"
  cscd_decoder_suggest="zlib"
 -dca_decoder_select="fmtconvert mdct"
 +dca_decoder_select="mdct"
  dds_decoder_select="texturedsp"
 +dirac_decoder_select="dirac_parse dwt golomb videodsp mpegvideoenc"
  dnxhd_decoder_select="blockdsp idctdsp"
  dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"
  dvvideo_decoder_select="dvprofile idctdsp"
  dvvideo_encoder_select="dvprofile fdctdsp me_cmp pixblockdsp"
 -dxa_decoder_deps="zlib"
 +dxa_decoder_select="zlib"
  dxv_decoder_select="lzf texturedsp"
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
 -eatgq_decoder_select="aandcttables idctdsp"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp"
 -exr_decoder_deps="zlib"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
@@@ -2420,31 -1985,29 +2420,31 @@@ ffvhuff_encoder_select="huffyuv_encoder
  fic_decoder_select="golomb"
  flac_decoder_select="flacdsp"
  flac_encoder_select="bswapdsp flacdsp lpc"
 -flashsv_decoder_deps="zlib"
 -flashsv_encoder_deps="zlib"
 -flashsv2_decoder_deps="zlib"
 +flashsv2_decoder_select="zlib"
 +flashsv2_encoder_select="zlib"
 +flashsv_decoder_select="zlib"
 +flashsv_encoder_select="zlib"
  flv_decoder_select="h263_decoder"
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="blockdsp bswapdsp"
  fraps_decoder_select="bswapdsp huffman"
 -g2m_decoder_deps="zlib"
 -g2m_decoder_select="blockdsp idctdsp jpegtables"
 -h261_decoder_select="mpeg_er mpegvideo"
 +g2m_decoder_select="blockdsp idctdsp jpegtables zlib"
 +g729_decoder_select="audiodsp"
 +h261_decoder_select="mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
 -h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
 +h263_decoder_select="h263_parser h263dsp mpegvideo qpeldsp"
  h263_encoder_select="aandcttables h263dsp mpegvideoenc"
  h263i_decoder_select="h263_decoder"
 +h263p_decoder_select="h263_decoder"
  h263p_encoder_select="h263_encoder"
  h264_decoder_select="cabac golomb h264chroma h264dsp h264parse h264pred h264qpel videodsp"
  h264_decoder_suggest="error_resilience"
  hap_decoder_select="snappy texturedsp"
  hap_encoder_deps="libsnappy"
  hap_encoder_select="texturedspenc"
 -hevc_decoder_select="bswapdsp cabac hevc_ps videodsp"
 -huffyuv_decoder_select="bswapdsp huffyuvdsp"
 -huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"
 +hevc_decoder_select="bswapdsp cabac golomb hevcparse videodsp"
 +huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 +huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llvidencdsp"
  iac_decoder_select="imc_decoder"
  imc_decoder_select="bswapdsp fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
@@@ -2453,17 -2016,16 +2453,17 @@@ indeo5_decoder_select="ividsp
  interplay_video_decoder_select="hpeldsp"
  jpegls_decoder_select="mjpeg_decoder"
  jv_decoder_select="blockdsp"
 -lagarith_decoder_select="huffyuvdsp"
 -ljpeg_encoder_select="aandcttables idctdsp jpegtables"
 -magicyuv_decoder_select="huffyuvdsp"
 +lagarith_decoder_select="llviddsp"
 +ljpeg_encoder_select="aandcttables idctdsp jpegtables mpegvideoenc"
 +magicyuv_decoder_select="llviddsp"
  mdec_decoder_select="blockdsp idctdsp mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
 -mjpeg_decoder_select="blockdsp hpeldsp idctdsp jpegtables"
 +mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"
  mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc"
  mjpegb_decoder_select="mjpeg_decoder"
  mlp_decoder_select="mlp_parser"
 +mlp_encoder_select="lpc"
  motionpixels_decoder_select="bswapdsp"
  mp1_decoder_select="mpegaudio"
  mp1float_decoder_select="mpegaudio"
@@@ -2479,81 -2041,67 +2479,81 @@@ mpc7_decoder_select="bswapdsp mpegaudio
  mpc8_decoder_select="mpegaudiodsp"
  mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
  mpeg_xvmc_decoder_select="mpeg2video_decoder"
 -mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg1video_encoder_select="aandcttables mpegvideoenc"
 -mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg2video_encoder_select="aandcttables mpegvideoenc"
 +mpegvideo_decoder_select="mpegvideo"
 +mpeg1video_decoder_select="mpegvideo"
 +mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp"
 +mpeg2video_decoder_select="mpegvideo"
 +mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp"
  mpeg4_decoder_select="h263_decoder mpeg4video_parser"
  mpeg4_encoder_select="h263_encoder"
  msa1_decoder_select="mss34dsp"
 +mscc_decoder_select="zlib"
  msmpeg4v1_decoder_select="h263_decoder"
  msmpeg4v2_decoder_select="h263_decoder"
  msmpeg4v2_encoder_select="h263_encoder"
  msmpeg4v3_decoder_select="h263_decoder"
  msmpeg4v3_encoder_select="h263_encoder"
 -mss2_decoder_select="error_resilience mpeg_er mpegvideo qpeldsp vc1_decoder"
 +mss2_decoder_select="mpegvideo qpeldsp vc1_decoder"
  mts2_decoder_select="mss34dsp"
  mxpeg_decoder_select="mjpeg_decoder"
  nellymoser_decoder_select="mdct sinewin"
  nellymoser_encoder_select="audio_frame_queue mdct sinewin"
  nuv_decoder_select="idctdsp lzo"
  on2avc_decoder_select="mdct"
 -opus_decoder_deps="avresample"
 -opus_decoder_select="imdct15"
 -png_decoder_deps="zlib"
 -png_encoder_deps="zlib"
 -png_encoder_select="huffyuvencdsp"
 -prores_decoder_select="idctdsp"
 +opus_decoder_deps="swresample"
 +opus_decoder_select="mdct15"
 +opus_encoder_select="audio_frame_queue mdct15"
 +png_decoder_select="zlib"
 +png_encoder_select="llvidencdsp zlib"
 +prores_decoder_select="blockdsp idctdsp"
  prores_encoder_select="fdctdsp"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
 -ra_144_encoder_select="audio_frame_queue lpc"
 +ra_144_decoder_select="audiodsp"
 +ra_144_encoder_select="audio_frame_queue lpc audiodsp"
  ralf_decoder_select="golomb"
 -rscc_decoder_deps="zlib"
 -rv10_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
 +rawvideo_decoder_select="bswapdsp"
 +rscc_decoder_select="zlib"
 +rtjpeg_decoder_select="me_cmp"
 +rv10_decoder_select="h263_decoder"
  rv10_encoder_select="h263_encoder"
 -rv20_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
 +rv20_decoder_select="h263_decoder"
  rv20_encoder_select="h263_encoder"
 -rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp"
 -rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp"
 -screenpresso_decoder_deps="zlib"
 +rv30_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 +rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 +screenpresso_decoder_select="zlib"
 +shorten_decoder_select="bswapdsp"
  sipr_decoder_select="lsp"
 +snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp"
 +snow_encoder_select="aandcttables dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb rangecoder"
 +sonic_encoder_select="golomb rangecoder"
 +sonic_ls_encoder_select="golomb rangecoder"
  sp5x_decoder_select="mjpeg_decoder"
 +srgc_decoder_select="zlib"
  svq1_decoder_select="hpeldsp"
  svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
  svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp"
  svq3_decoder_suggest="zlib"
  tak_decoder_select="audiodsp"
 -tdsc_decoder_deps="zlib"
 -tdsc_decoder_select="mjpeg_decoder"
 +tdsc_decoder_select="zlib mjpeg_decoder"
  theora_decoder_select="vp3_decoder"
  thp_decoder_select="mjpeg_decoder"
 -tiff_decoder_suggest="zlib"
 +tiff_decoder_suggest="zlib lzma"
  tiff_encoder_suggest="zlib"
 -truehd_decoder_select="mlp_decoder"
 +truehd_decoder_select="mlp_parser"
 +truehd_encoder_select="lpc"
  truemotion2_decoder_select="bswapdsp"
  truespeech_decoder_select="bswapdsp"
 -tscc_decoder_deps="zlib"
 -txd_decoder_select="texturedsp"
 +tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
 -utvideo_decoder_select="bswapdsp"
 -utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
 -vble_decoder_select="huffyuvdsp"
 -vc1_decoder_select="blockdsp error_resilience h263_decoder h264qpel intrax8 mpeg_er mpegvideo vc1dsp"
 +txd_decoder_select="texturedsp"
 +utvideo_decoder_select="bswapdsp llviddsp"
 +utvideo_encoder_select="bswapdsp huffman llvidencdsp"
 +vble_decoder_select="llviddsp"
 +vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo vc1dsp"
 +vc1_qsv_decoder_deps="libmfx"
 +vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
  vc1image_decoder_select="vc1_decoder"
  vorbis_decoder_select="mdct"
  vorbis_encoder_select="mdct"
@@@ -2564,9 -2112,8 +2564,9 @@@ vp6a_decoder_select="vp6_decoder
  vp6f_decoder_select="vp6_decoder"
  vp7_decoder_select="h264pred videodsp vp8dsp"
  vp8_decoder_select="h264pred videodsp vp8dsp"
 -vp9_decoder_select="videodsp vp9_superframe_split_bsf"
 -webp_decoder_select="vp8_decoder"
 +vp9_decoder_select="videodsp vp9_parser"
 +webp_decoder_select="vp8_decoder exif"
 +wmalossless_decoder_select="llauddsp"
  wmapro_decoder_select="mdct sinewin wma_freqs"
  wmav1_decoder_select="mdct sinewin wma_freqs"
  wmav1_encoder_select="mdct sinewin wma_freqs"
@@@ -2579,45 -2126,25 +2579,45 @@@ wmv2_decoder_select="blockdsp error_res
  wmv2_encoder_select="h263_encoder wmv2dsp"
  wmv3_decoder_select="vc1_decoder"
  wmv3image_decoder_select="wmv3_decoder"
 -zerocodec_decoder_deps="zlib"
 -zlib_decoder_deps="zlib"
 -zlib_encoder_deps="zlib"
 -zmbv_decoder_deps="zlib"
 -zmbv_encoder_deps="zlib"
 +xma1_decoder_select="wmapro_decoder"
 +xma2_decoder_select="wmapro_decoder"
 +zerocodec_decoder_select="zlib"
 +zlib_decoder_select="zlib"
 +zlib_encoder_select="zlib"
 +zmbv_decoder_select="zlib"
 +zmbv_encoder_select="zlib"
 +
 +# platform codecs
 +audiotoolbox_deps="AudioToolbox_AudioToolbox_h"
 +audiotoolbox_extralibs="-framework CoreFoundation -framework AudioToolbox -framework CoreMedia"
  
  # hardware accelerators
 -d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
 +cuda_deps_any="dlopen LoadLibrary"
 +cuvid_deps="cuda"
 +d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
  dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
 +dxva2_extralibs="-luser32"
  dxva2_lib_deps="dxva2"
 -vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
 -vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
 +vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h"
 +vda_framework_extralibs="-framework VideoDecodeAcceleration"
 +vda_deps="vda_framework pthreads"
 +vda_extralibs="-framework CoreFoundation -framework QuartzCore"
 +videotoolbox_hwaccel_deps="videotoolbox pthreads"
 +videotoolbox_hwaccel_extralibs="-framework QuartzCore"
 +xvmc_deps="X11_extensions_XvMClib_h"
  
  h263_vaapi_hwaccel_deps="vaapi"
  h263_vaapi_hwaccel_select="h263_decoder"
 +h263_videotoolbox_hwaccel_deps="videotoolbox"
 +h263_videotoolbox_hwaccel_select="h263_decoder"
 +h264_cuvid_hwaccel_deps="cuda cuvid"
 +h264_cuvid_hwaccel_select="h264_cuvid_decoder"
  h264_d3d11va_hwaccel_deps="d3d11va"
  h264_d3d11va_hwaccel_select="h264_decoder"
  h264_dxva2_hwaccel_deps="dxva2"
  h264_dxva2_hwaccel_select="h264_decoder"
 +h264_mediacodec_hwaccel_deps="mediacodec"
  h264_mmal_hwaccel_deps="mmal"
  h264_qsv_hwaccel_deps="libmfx"
  h264_vaapi_hwaccel_deps="vaapi"
@@@ -2628,13 -2155,8 +2628,13 @@@ h264_vda_old_hwaccel_deps="vda
  h264_vda_old_hwaccel_select="h264_decoder"
  h264_vdpau_hwaccel_deps="vdpau"
  h264_vdpau_hwaccel_select="h264_decoder"
 +h264_videotoolbox_hwaccel_deps="videotoolbox"
 +h264_videotoolbox_hwaccel_select="h264_decoder"
 +hevc_cuvid_hwaccel_deps="cuda cuvid"
 +hevc_cuvid_hwaccel_select="hevc_cuvid_decoder"
  hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
  hevc_d3d11va_hwaccel_select="hevc_decoder"
 +hevc_mediacodec_hwaccel_deps="mediacodec"
  hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
  hevc_dxva2_hwaccel_select="hevc_decoder"
  hevc_qsv_hwaccel_deps="libmfx"
@@@ -2642,77 -2164,43 +2642,77 @@@ hevc_vaapi_hwaccel_deps="vaapi VAPictur
  hevc_vaapi_hwaccel_select="hevc_decoder"
  hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
  hevc_vdpau_hwaccel_select="hevc_decoder"
 +mjpeg_cuvid_hwaccel_deps="cuda cuvid"
 +mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
 +mpeg_xvmc_hwaccel_deps="xvmc"
 +mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
 +mpeg1_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"
  mpeg1_vdpau_hwaccel_deps="vdpau"
  mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
 +mpeg1_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"
 +mpeg1_xvmc_hwaccel_deps="xvmc"
 +mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
 +mpeg2_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"
  mpeg2_d3d11va_hwaccel_deps="d3d11va"
  mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
  mpeg2_dxva2_hwaccel_deps="dxva2"
  mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
  mpeg2_mmal_hwaccel_deps="mmal"
  mpeg2_qsv_hwaccel_deps="libmfx"
 +mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
  mpeg2_vaapi_hwaccel_deps="vaapi"
  mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
  mpeg2_vdpau_hwaccel_deps="vdpau"
  mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
 +mpeg2_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"
 +mpeg2_xvmc_hwaccel_deps="xvmc"
 +mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
 +mpeg4_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
 +mpeg4_mediacodec_hwaccel_deps="mediacodec"
 +mpeg4_mmal_hwaccel_deps="mmal"
  mpeg4_vaapi_hwaccel_deps="vaapi"
  mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
  mpeg4_vdpau_hwaccel_deps="vdpau"
  mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
 +mpeg4_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"
 +vc1_cuvid_hwaccel_deps="cuda cuvid"
 +vc1_cuvid_hwaccel_select="vc1_cuvid_decoder"
  vc1_d3d11va_hwaccel_deps="d3d11va"
  vc1_d3d11va_hwaccel_select="vc1_decoder"
  vc1_dxva2_hwaccel_deps="dxva2"
  vc1_dxva2_hwaccel_select="vc1_decoder"
  vc1_mmal_hwaccel_deps="mmal"
  vc1_qsv_hwaccel_deps="libmfx"
 +vc1_qsv_hwaccel_select="qsvdec_vc1"
  vc1_vaapi_hwaccel_deps="vaapi"
  vc1_vaapi_hwaccel_select="vc1_decoder"
  vc1_vdpau_hwaccel_deps="vdpau"
  vc1_vdpau_hwaccel_select="vc1_decoder"
 +vp8_cuvid_hwaccel_deps="cuda cuvid"
 +vp8_cuvid_hwaccel_select="vp8_cuvid_decoder"
 +vp9_cuvid_hwaccel_deps="cuda cuvid"
 +vp9_cuvid_hwaccel_select="vp9_cuvid_decoder"
 +vp8_mediacodec_hwaccel_deps="mediacodec"
  vp8_qsv_hwaccel_deps="libmfx"
 -vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8"
 -vp8_vaapi_hwaccel_select="vp8_decoder"
 +vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
 +vp9_d3d11va_hwaccel_select="vp9_decoder"
 +vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
 +vp9_dxva2_hwaccel_select="vp9_decoder"
 +vp9_mediacodec_hwaccel_deps="mediacodec"
 +vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"
 +vp9_vaapi_hwaccel_select="vp9_decoder"
  wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
  wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
  wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
  
  # hardware-accelerated codecs
 -nvenc_deps_any="dlopen LoadLibrary"
 -nvenc_extralibs='$ldl'
  omx_deps="dlopen pthreads"
  omx_extralibs='$ldl'
  omx_rpi_select="omx"
@@@ -2721,18 -2209,8 +2721,18 @@@ qsvenc_select="qsv
  vaapi_encode_deps="vaapi"
  
  hwupload_cuda_filter_deps="cuda"
 -scale_npp_filter_deps="cuda libnpp"
 +scale_npp_filter_deps="cuda_sdk libnpp"
 +scale_cuda_filter_deps="cuda_sdk"
 +
 +nvenc_deps="cuda"
 +nvenc_deps_any="dlopen LoadLibrary"
 +nvenc_encoder_deps="nvenc"
  
 +h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
 +h264_cuvid_decoder_deps="cuda cuvid"
 +h264_cuvid_decoder_select="h264_mp4toannexb_bsf"
 +h264_mediacodec_decoder_deps="mediacodec"
 +h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser"
  h264_mmal_decoder_deps="mmal"
  h264_nvenc_encoder_deps="nvenc"
  h264_omx_encoder_deps="omx"
@@@ -2742,116 -2220,52 +2742,116 @@@ h264_qsv_encoder_deps="libmfx
  h264_qsv_encoder_select="qsvenc"
  h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
  h264_vaapi_encoder_select="vaapi_encode golomb"
 +h264_vda_decoder_deps="vda"
 +h264_vda_decoder_select="h264_decoder"
 +h264_vdpau_decoder_deps="vdpau"
 +h264_vdpau_decoder_select="h264_decoder"
 +hevc_cuvid_decoder_deps="cuda cuvid"
 +hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
 +hevc_mediacodec_decoder_deps="mediacodec"
 +hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_nvenc_encoder_deps="nvenc"
  hevc_qsv_decoder_deps="libmfx"
 -hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
 +hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
  hevc_qsv_encoder_deps="libmfx"
 -hevc_qsv_encoder_select="hevc_ps qsvenc"
 +hevc_qsv_encoder_select="hevcparse qsvenc"
  hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
  hevc_vaapi_encoder_select="vaapi_encode golomb"
 +mjpeg_cuvid_decoder_deps="cuda cuvid"
  mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
  mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 +mpeg1_cuvid_decoder_deps="cuda cuvid"
 +mpeg1_vdpau_decoder_deps="vdpau"
 +mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 +mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg2_cuvid_decoder_deps="cuda cuvid"
  mpeg2_mmal_decoder_deps="mmal"
  mpeg2_qsv_decoder_deps="libmfx"
 -mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
 +mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
  mpeg2_qsv_encoder_deps="libmfx"
  mpeg2_qsv_encoder_select="qsvenc"
 +mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
 +mpeg2_vaapi_encoder_select="vaapi_encode"
 +mpeg4_crystalhd_decoder_select="crystalhd"
 +mpeg4_cuvid_decoder_deps="cuda cuvid"
 +mpeg4_mediacodec_decoder_deps="mediacodec"
 +mpeg4_mmal_decoder_deps="mmal"
  mpeg4_omx_encoder_deps="omx"
 +mpeg4_vdpau_decoder_deps="vdpau"
 +mpeg4_vdpau_decoder_select="mpeg4_decoder"
 +mpeg_vdpau_decoder_deps="vdpau"
 +mpeg_vdpau_decoder_select="mpeg2video_decoder"
 +msmpeg4_crystalhd_decoder_select="crystalhd"
 +nvenc_h264_encoder_select="h264_nvenc_encoder"
 +nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 +vc1_crystalhd_decoder_select="crystalhd"
 +vc1_cuvid_decoder_deps="cuda cuvid"
  vc1_mmal_decoder_deps="mmal"
 -vc1_qsv_decoder_deps="libmfx"
 -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
 +vc1_vdpau_decoder_deps="vdpau"
 +vc1_vdpau_decoder_select="vc1_decoder"
 +vp8_cuvid_decoder_deps="cuda cuvid"
 +vp8_mediacodec_decoder_deps="mediacodec"
  vp8_qsv_decoder_deps="libmfx"
  vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"
 -
 -nvenc_h264_encoder_select="h264_nvenc_encoder"
 -nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 +vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
 +vp8_vaapi_encoder_select="vaapi_encode"
 +vp9_cuvid_decoder_deps="cuda cuvid"
 +vp9_mediacodec_decoder_deps="mediacodec"
 +wmv3_crystalhd_decoder_select="crystalhd"
 +wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  
  # parsers
  h264_parser_select="golomb h264dsp h264parse"
 -hevc_parser_select="hevc_ps"
 +hevc_parser_select="hevcparse"
  mpegaudio_parser_select="mpegaudioheader"
  mpegvideo_parser_select="mpegvideo"
 -mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
 +mpeg4video_parser_select="h263dsp mpegvideo qpeldsp"
  vc1_parser_select="vc1dsp"
  
  # bitstream_filters
  mjpeg2jpeg_bsf_select="jpegtables"
  
  # external libraries
 -avisynth_deps="LoadLibrary"
 -avxsynth_deps="dlopen"
 -avisynth_demuxer_deps_any="avisynth avxsynth"
 +aac_at_decoder_deps="audiotoolbox"
 +ac3_at_decoder_deps="audiotoolbox"
 +ac3_at_decoder_select="ac3_parser"
 +adpcm_ima_qt_at_decoder_deps="audiotoolbox"
 +alac_at_decoder_deps="audiotoolbox"
 +amr_nb_at_decoder_deps="audiotoolbox"
 +avisynth_deps_any="dlopen LoadLibrary"
 +avisynth_demuxer_deps="avisynth"
  avisynth_demuxer_select="riffdec"
 -libdcadec_decoder_deps="libdcadec"
 -libfaac_encoder_deps="libfaac"
 -libfaac_encoder_select="audio_frame_queue"
 +eac3_at_decoder_deps="audiotoolbox"
 +eac3_at_decoder_select="ac3_parser"
 +gsm_ms_at_decoder_deps="audiotoolbox"
 +ilbc_at_decoder_deps="audiotoolbox"
 +mp1_at_decoder_deps="audiotoolbox"
 +mp2_at_decoder_deps="audiotoolbox"
 +mp3_at_decoder_deps="audiotoolbox"
 +mp1_at_decoder_select="mpegaudioheader"
 +mp2_at_decoder_select="mpegaudioheader"
 +mp3_at_decoder_select="mpegaudioheader"
 +pcm_alaw_at_decoder_deps="audiotoolbox"
 +pcm_mulaw_at_decoder_deps="audiotoolbox"
 +qdmc_at_decoder_deps="audiotoolbox"
 +qdm2_at_decoder_deps="audiotoolbox"
 +aac_at_encoder_deps="audiotoolbox"
 +aac_at_encoder_select="audio_frame_queue"
 +alac_at_encoder_deps="audiotoolbox"
 +alac_at_encoder_select="audio_frame_queue"
 +ilbc_at_encoder_deps="audiotoolbox"
 +ilbc_at_encoder_select="audio_frame_queue"
 +pcm_alaw_at_encoder_deps="audiotoolbox"
 +pcm_alaw_at_encoder_select="audio_frame_queue"
 +pcm_mulaw_at_encoder_deps="audiotoolbox"
 +pcm_mulaw_at_encoder_select="audio_frame_queue"
 +chromaprint_muxer_deps="chromaprint"
 +h264_videotoolbox_encoder_deps="videotoolbox_encoder pthreads"
 +libcelt_decoder_deps="libcelt"
  libfdk_aac_decoder_deps="libfdk_aac"
  libfdk_aac_encoder_deps="libfdk_aac"
  libfdk_aac_encoder_select="audio_frame_queue"
 +libgme_demuxer_deps="libgme"
  libgsm_decoder_deps="libgsm"
  libgsm_encoder_deps="libgsm"
  libgsm_ms_decoder_deps="libgsm"
@@@ -2859,7 -2273,6 +2859,7 @@@ libgsm_ms_encoder_deps="libgsm
  libilbc_decoder_deps="libilbc"
  libilbc_encoder_deps="libilbc"
  libkvazaar_encoder_deps="libkvazaar"
 +libmodplug_demuxer_deps="libmodplug"
  libmp3lame_encoder_deps="libmp3lame"
  libmp3lame_encoder_select="audio_frame_queue mpegaudioheader"
  libopencore_amrnb_decoder_deps="libopencore_amrnb"
@@@ -2871,22 -2284,19 +2871,22 @@@ libopenh264_decoder_select="h264_mp4toa
  libopenh264_encoder_deps="libopenh264"
  libopenjpeg_decoder_deps="libopenjpeg"
  libopenjpeg_encoder_deps="libopenjpeg"
 +libopenmpt_demuxer_deps="libopenmpt"
  libopus_decoder_deps="libopus"
  libopus_encoder_deps="libopus"
  libopus_encoder_select="audio_frame_queue"
 +librsvg_decoder_deps="librsvg"
  libschroedinger_decoder_deps="libschroedinger"
  libschroedinger_encoder_deps="libschroedinger"
 +libshine_encoder_deps="libshine"
 +libshine_encoder_select="audio_frame_queue"
  libspeex_decoder_deps="libspeex"
  libspeex_encoder_deps="libspeex"
  libspeex_encoder_select="audio_frame_queue"
  libtheora_encoder_deps="libtheora"
  libtwolame_encoder_deps="libtwolame"
 -libvo_aacenc_encoder_deps="libvo_aacenc"
 -libvo_aacenc_encoder_select="audio_frame_queue"
  libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
 +libvorbis_decoder_deps="libvorbis"
  libvorbis_encoder_deps="libvorbis"
  libvorbis_encoder_select="audio_frame_queue"
  libvpx_vp8_decoder_deps="libvpx"
@@@ -2896,51 -2306,32 +2896,51 @@@ libvpx_vp9_encoder_deps="libvpx
  libwavpack_encoder_deps="libwavpack"
  libwavpack_encoder_select="audio_frame_queue"
  libwebp_encoder_deps="libwebp"
 +libwebp_anim_encoder_deps="libwebp"
  libx262_encoder_deps="libx262"
  libx264_encoder_deps="libx264"
 +libx264rgb_encoder_deps="libx264 x264_csp_bgr"
 +libx264rgb_encoder_select="libx264_encoder"
  libx265_encoder_deps="libx265"
  libxavs_encoder_deps="libxavs"
 -libxvid_encoder_deps="libxvid mkstemp"
 +libxvid_encoder_deps="libxvid"
 +libzvbi_teletext_decoder_deps="libzvbi"
 +videotoolbox_deps="VideoToolbox_VideoToolbox_h"
 +videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo"
 +videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
 +videotoolbox_encoder_suggest="vda_framework vt_bt2020"
 +vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020"
  
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"
 +aiff_muxer_select="iso_media"
  asf_demuxer_select="riffdec"
 +asf_o_demuxer_select="riffdec"
  asf_muxer_select="riffenc"
  asf_stream_muxer_select="asf_muxer"
 -avi_demuxer_select="iso_media riffdec"
 +avi_demuxer_select="iso_media riffdec exif"
  avi_muxer_select="riffenc"
  caf_demuxer_select="iso_media riffdec"
 +caf_muxer_select="iso_media"
  dash_muxer_select="mp4_muxer"
  dirac_demuxer_select="dirac_parser"
 +dts_demuxer_select="dca_parser"
 +dtshd_demuxer_select="dca_parser"
  dv_demuxer_select="dvprofile"
  dv_muxer_select="dvprofile"
  dxa_demuxer_select="riffdec"
  eac3_demuxer_select="ac3_parser"
  f4v_muxer_select="mov_muxer"
 +fifo_muxer_deps="threads"
  flac_demuxer_select="flac_parser"
  hds_muxer_select="flv_muxer"
  hls_muxer_select="mpegts_muxer"
 +image2_alias_pix_demuxer_select="image2_demuxer"
 +image2_brender_pix_demuxer_select="image2_demuxer"
  ipod_muxer_select="mov_muxer"
  ismv_muxer_select="mov_muxer"
 +libnut_demuxer_deps="libnut"
 +libnut_muxer_deps="libnut"
  matroska_audio_muxer_select="matroska_muxer"
  matroska_demuxer_select="iso_media riffdec"
  matroska_demuxer_suggest="bzlib lzo zlib"
@@@ -2956,16 -2347,13 +2956,16 @@@ mpegts_demuxer_select="iso_media
  mpegts_muxer_select="adts_muxer latm_muxer"
  mpegtsraw_demuxer_select="mpegts_demuxer"
  mxf_d10_muxer_select="mxf_muxer"
 +mxf_opatom_muxer_select="mxf_muxer"
  nut_muxer_select="riffenc"
  nuv_demuxer_select="riffdec"
  oga_muxer_select="ogg_muxer"
  ogg_demuxer_select="dirac_parse"
 +ogv_muxer_select="ogg_muxer"
  opus_muxer_select="ogg_muxer"
  psp_muxer_select="mov_muxer"
  rtp_demuxer_select="sdp_demuxer"
 +rtp_muxer_select="golomb"
  rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol srtp"
  rtsp_demuxer_select="http_protocol rtpdec"
  rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
@@@ -2979,73 -2367,43 +2979,73 @@@ swf_demuxer_suggest="zlib
  tak_demuxer_select="tak_parser"
  tg2_muxer_select="mov_muxer"
  tgp_muxer_select="mov_muxer"
 +vobsub_demuxer_select="mpegps_demuxer"
  w64_demuxer_select="wav_demuxer"
 +w64_muxer_select="wav_muxer"
  wav_demuxer_select="riffdec"
  wav_muxer_select="riffenc"
  webm_muxer_select="iso_media riffenc"
 -webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
 +webm_dash_manifest_demuxer_select="matroska_demuxer"
  wtv_demuxer_select="mpegts_demuxer riffdec"
 +wtv_muxer_select="mpegts_muxer riffenc"
  xmv_demuxer_select="riffdec"
  xwma_demuxer_select="riffdec"
  
  # indevs / outdevs
  alsa_indev_deps="alsa"
  alsa_outdev_deps="alsa"
 -avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
 +avfoundation_indev_deps="pthreads"
  avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 +caca_outdev_deps="libcaca"
 +decklink_indev_deps="decklink threads"
 +decklink_indev_extralibs="-lstdc++"
 +decklink_outdev_deps="decklink threads"
 +decklink_outdev_extralibs="-lstdc++"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
  dv1394_indev_deps="dv1394"
  dv1394_indev_select="dv_demuxer"
  fbdev_indev_deps="linux_fb_h"
 +fbdev_outdev_deps="linux_fb_h"
 +gdigrab_indev_deps="CreateDIBSection"
 +gdigrab_indev_extralibs="-lgdi32"
 +gdigrab_indev_select="bmp_decoder"
 +iec61883_indev_deps="libiec61883"
  jack_indev_deps="jack"
  jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +libv4l2_indev_deps="libv4l2"
 +openal_indev_deps="openal"
 +opengl_outdev_deps="opengl"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
  pulse_indev_deps="libpulse"
 +pulse_outdev_deps="libpulse"
 +qtkit_indev_extralibs="-framework QTKit -framework Foundation -framework QuartzCore"
 +qtkit_indev_select="qtkit"
 +sdl2_outdev_deps="sdl2"
  sndio_indev_deps="sndio"
  sndio_outdev_deps="sndio"
 +v4l_indev_deps="linux_videodev_h"
  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
 +v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h"
  vfwcap_indev_deps="vfw32 vfwcap_defines"
  xcbgrab_indev_deps="libxcb"
 +xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute"
 +xv_outdev_extralibs="-lXv -lX11 -lXext"
  
  # protocols
 +async_protocol_deps="threads"
 +bluray_protocol_deps="libbluray"
  ffrtmpcrypt_protocol_deps="!librtmp_protocol"
 -ffrtmpcrypt_protocol_deps_any="gmp openssl"
 +ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl"
  ffrtmpcrypt_protocol_select="tcp_protocol"
  ffrtmphttp_protocol_deps="!librtmp_protocol"
  ffrtmphttp_protocol_select="http_protocol"
 +ftp_protocol_select="tcp_protocol"
  gopher_protocol_select="network"
  http_protocol_select="tcp_protocol"
  httpproxy_protocol_select="tcp_protocol"
@@@ -3056,8 -2414,6 +3056,8 @@@ librtmpe_protocol_deps="librtmp
  librtmps_protocol_deps="librtmp"
  librtmpt_protocol_deps="librtmp"
  librtmpte_protocol_deps="librtmp"
 +libsmbclient_protocol_deps="libsmbclient gplv3"
 +libssh_protocol_deps="libssh"
  mmsh_protocol_select="http_protocol"
  mmst_protocol_select="network"
  rtmp_protocol_deps="!librtmp_protocol"
@@@ -3069,142 -2425,53 +3069,142 @@@ rtmpt_protocol_select="ffrtmphttp_proto
  rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol"
  rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
  rtp_protocol_select="udp_protocol"
 -sctp_protocol_deps="struct_sctp_event_subscribe"
 +sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags"
  sctp_protocol_select="network"
  srtp_protocol_select="rtp_protocol srtp"
  tcp_protocol_select="network"
 -tls_gnutls_protocol_deps="gnutls"
 +tls_gnutls_protocol_deps="gnutls !tls_schannel_protocol !tls_securetransport_protocol"
  tls_gnutls_protocol_select="tcp_protocol"
 -tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
 +tls_openssl_protocol_deps="openssl !tls_schannel_protocol !tls_securetransport_protocol !tls_gnutls_protocol"
  tls_openssl_protocol_select="tcp_protocol"
 -tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
 +tls_schannel_protocol_deps="schannel"
 +tls_schannel_protocol_select="tcp_protocol"
 +tls_securetransport_protocol_deps="securetransport"
 +tls_securetransport_protocol_select="tcp_protocol"
 +tls_protocol_deps_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
  udp_protocol_select="network"
 +udplite_protocol_select="network"
  unix_protocol_deps="sys_un_h"
  unix_protocol_select="network"
  
  # filters
 -asyncts_filter_deps="avresample"
 +afftfilt_filter_deps="avcodec"
 +afftfilt_filter_select="fft"
 +afir_filter_deps="avcodec"
 +afir_filter_select="fft"
 +amovie_filter_deps="avcodec avformat"
 +aresample_filter_deps="swresample"
 +ass_filter_deps="libass"
 +atempo_filter_deps="avcodec"
 +atempo_filter_select="rdft"
 +azmq_filter_deps="libzmq"
  blackframe_filter_deps="gpl"
  boxblur_filter_deps="gpl"
  bs2b_filter_deps="libbs2b"
 +colormatrix_filter_deps="gpl"
 +cover_rect_filter_deps="avcodec avformat gpl"
  cropdetect_filter_deps="gpl"
  deinterlace_qsv_filter_deps="libmfx"
  deinterlace_vaapi_filter_deps="vaapi"
  delogo_filter_deps="gpl"
 +deshake_filter_select="pixelutils"
  drawtext_filter_deps="libfreetype"
 +elbg_filter_deps="avcodec"
 +eq_filter_deps="gpl"
 +fftfilt_filter_deps="avcodec"
 +fftfilt_filter_select="rdft"
 +find_rect_filter_deps="avcodec avformat gpl"
 +firequalizer_filter_deps="avcodec"
 +firequalizer_filter_select="rdft"
 +flite_filter_deps="libflite"
 +framerate_filter_select="pixelutils"
  frei0r_filter_deps="frei0r dlopen"
 -frei0r_filter_extralibs='$ldl'
  frei0r_src_filter_deps="frei0r dlopen"
 -frei0r_src_filter_extralibs='$ldl'
 -hdcd_filter_deps="libhdcd"
 +fspp_filter_deps="gpl"
 +geq_filter_deps="gpl"
 +histeq_filter_deps="gpl"
  hqdn3d_filter_deps="gpl"
  interlace_filter_deps="gpl"
 +kerndeint_filter_deps="gpl"
 +ladspa_filter_deps="ladspa dlopen"
 +mcdeint_filter_deps="avcodec gpl"
  movie_filter_deps="avcodec avformat"
 +mpdecimate_filter_deps="gpl"
 +mpdecimate_filter_select="pixelutils"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
 +nnedi_filter_deps="gpl"
 +ocr_filter_deps="libtesseract"
  ocv_filter_deps="libopencv"
 +owdenoise_filter_deps="gpl"
 +pan_filter_deps="swresample"
 +perspective_filter_deps="gpl"
 +phase_filter_deps="gpl"
 +pp7_filter_deps="gpl"
 +pp_filter_deps="gpl postproc"
 +pullup_filter_deps="gpl"
 +removelogo_filter_deps="avcodec avformat swscale"
 +repeatfields_filter_deps="gpl"
  resample_filter_deps="avresample"
 +rubberband_filter_deps="librubberband"
 +sab_filter_deps="gpl swscale"
 +scale2ref_filter_deps="swscale"
  scale_filter_deps="swscale"
  scale_qsv_filter_deps="libmfx"
 +select_filter_select="pixelutils"
 +showcqt_filter_deps="avcodec avformat swscale"
 +showcqt_filter_select="fft"
 +showfreqs_filter_deps="avcodec"
 +showfreqs_filter_select="fft"
 +showspectrum_filter_deps="avcodec"
 +showspectrum_filter_select="fft"
 +showspectrumpic_filter_deps="avcodec"
 +showspectrumpic_filter_select="fft"
 +signature_filter_deps="gpl avcodec avformat"
 +smartblur_filter_deps="gpl swscale"
 +sofalizer_filter_deps="netcdf avcodec"
 +sofalizer_filter_select="fft"
 +spectrumsynth_filter_deps="avcodec"
 +spectrumsynth_filter_select="fft"
 +spp_filter_deps="gpl avcodec"
 +spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
 +stereo3d_filter_deps="gpl"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_filter_deps="gpl"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
 +uspp_filter_deps="gpl avcodec"
 +vaguedenoiser_filter_deps="gpl"
 +vidstabdetect_filter_deps="libvidstab"
 +vidstabtransform_filter_deps="libvidstab"
 +zmq_filter_deps="libzmq"
 +zoompan_filter_deps="swscale"
 +zscale_filter_deps="libzimg"
  scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer"
  
  # examples
 +avio_dir_cmd_deps="avformat avutil"
 +avio_reading_deps="avformat avcodec avutil"
  decode_audio_example_deps="avcodec avutil"
  decode_video_example_deps="avcodec avutil"
 +demuxing_decoding_example_deps="avcodec avformat avutil"
  encode_audio_example_deps="avcodec avutil"
  encode_video_example_deps="avcodec avutil"
 +extract_mvs_example_deps="avcodec avformat avutil"
  filter_audio_example_deps="avfilter avutil"
 +filtering_audio_example_deps="avfilter avcodec avformat avutil"
 +filtering_video_example_deps="avfilter avcodec avformat avutil"
 +http_multiclient_example_deps="avformat avutil fork"
  metadata_example_deps="avformat avutil"
 -output_example_deps="avcodec avformat avresample avutil swscale"
 +muxing_example_deps="avcodec avformat avutil swscale"
  qsvdec_example_deps="avcodec avutil libmfx h264_qsv_decoder"
 -transcode_aac_example_deps="avcodec avformat avresample"
 +remuxing_example_deps="avcodec avformat avutil"
 +resampling_audio_example_deps="avutil swresample"
 +scaling_video_example_deps="avutil swscale"
 +transcode_aac_example_deps="avcodec avformat swresample"
 +transcoding_example_deps="avfilter avcodec avformat avutil"
  
  # libraries, in linking order
  avcodec_deps="avutil"
@@@ -3213,106 -2480,82 +3213,106 @@@ avdevice_deps="avformat avcodec avutil
  avfilter_deps="avutil"
  avformat_deps="avcodec avutil"
  avresample_deps="avutil"
 +postproc_deps="avutil gpl"
 +swresample_deps="avutil"
  swscale_deps="avutil"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale"
 -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 -               fps_filter null_filter resample_filter scale_filter
 +ffmpeg_deps="avcodec avfilter avformat swresample"
 +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
 +               null_filter
                 trim_filter"
 -avplay_deps="avcodec avfilter avformat avresample sdl"
 -avplay_extralibs='$sdl_extralibs'
 -avplay_select="rdft format_filter transpose_filter hflip_filter vflip_filter"
 -avprobe_deps="avcodec avformat"
 +ffplay_deps="avcodec avformat swscale swresample sdl2"
 +ffplay_extralibs='$sdl2_extralibs'
 +ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat fork sarestart"
 +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
  
  # documentation
 -pod2man_deps="doc"
 -texi2html_deps="doc"
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="perl"
 +htmlpages_deps_any="makeinfo_html texi2html"
 +txtpages_deps="perl makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters
  
 -logfile="avbuild/config.log"
 +logfile="ffbuild/config.log"
  
  # installation paths
  prefix_default="/usr/local"
  bindir_default='${prefix}/bin'
 -datadir_default='${prefix}/share/avconv'
 -docdir_default='${prefix}/share/doc/libav'
 +datadir_default='${prefix}/share/ffmpeg'
 +docdir_default='${prefix}/share/doc/ffmpeg'
  incdir_default='${prefix}/include'
  libdir_default='${prefix}/lib'
  mandir_default='${prefix}/share/man'
 -shlibdir_default="$libdir_default"
  
  # toolchain
  ar_default="ar"
  cc_default="gcc"
 +cxx_default="g++"
  host_cc_default="gcc"
 -ln_s="ln -s -f"
 +doxygen_default="doxygen"
 +install="install"
 +ln_s_default="ln -s -f"
  nm_default="nm -g"
  objformat="elf"
  pkg_config_default=pkg-config
 -ranlib="ranlib"
 -strip="strip"
 +ranlib_default="ranlib"
 +strip_default="strip"
  version_script='--version-script'
 -yasmexe="yasm"
 -
 -# machine
 -arch_default=$(uname -m)
 -cpu="generic"
 -intrinsics="none"
 +yasmexe_default="yasm"
 +windres_default="windres"
 +nvcc_default="nvcc"
 +nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
  
  # OS
  target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
 +# machine
 +if test "$target_os_default" = aix; then
 +    arch_default=$(uname -p)
 +    strip_default="strip -X32_64"
 +else
 +    arch_default=$(uname -m)
 +fi
 +cpu="generic"
 +intrinsics="none"
 +
  # configurable options
 -enable $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
 +enable $PROGRAM_LIST
 +enable $DOCUMENT_LIST
 +enable $EXAMPLE_LIST
 +enable $(filter_out avresample $LIBRARY_LIST)
 +enable stripping
  
  enable asm
  enable debug
  enable doc
  enable faan faandct faanidct
  enable optimizations
 +enable runtime_cpudetect
  enable safe_bitstream_reader
  enable static
  enable swscale_alpha
  enable valgrind_backtrace
  
 -# By default, enable only those hwaccels that have no external dependencies.
 -enable d3d11va dxva2 vda vdpau
 +sws_max_filter_size_default=256
 +set_default sws_max_filter_size
  
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
  LIBPREF="lib"
  LIBSUF=".a"
 -LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)'
 +FULLNAME='$(NAME)$(BUILDSUF)'
 +LIBNAME='$(LIBPREF)$(FULLNAME)$(LIBSUF)'
  SLIBPREF="lib"
  SLIBSUF=".so"
 -SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
 +SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
  SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
  SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
  LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
@@@ -3329,8 -2572,6 +3329,8 @@@ AS_O='-o $@
  CC_C='-c'
  CC_E='-E -o $@'
  CC_O='-o $@'
 +CXX_C='-c'
 +CXX_O='-o $@'
  OBJCC_C='-c'
  OBJCC_E='-E -o $@'
  OBJCC_O='-o $@'
@@@ -3341,8 -2582,6 +3341,8 @@@ HOSTCC_C='-c
  HOSTCC_E='-E -o $@'
  HOSTCC_O='-o $@'
  HOSTLD_O='-o $@'
 +NVCC_C='-c'
 +NVCC_O='-o $@'
  
  host_extralibs='-lm'
  host_cflags_filter=echo
@@@ -3352,7 -2591,7 +3352,7 @@@ target_path='$(CURDIR)
  
  # since the object filename is not given with the -MM flag, the compiler
  # is only able to print the basename, and we must add the path ourselves
 -DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o," > $(@:.o=.d)'
 +DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>/dev/null | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(@F),$(@D)/$(@F)," > $(@:.o=.d)'
  DEPFLAGS='-MM'
  
  # find source path
@@@ -3360,9 -2599,8 +3360,9 @@@ if test -f configure; the
      source_path=.
  else
      source_path=$(cd $(dirname "$0"); pwd)
 -    echo "$source_path" | grep -q '[[:blank:]]' &&
 -        die "Out of tree builds are impossible with whitespace in source path."
 +    case "$source_path" in
 +        *[[:blank:]]*) die "Out of tree builds are impossible with whitespace in source path." ;;
 +    esac
      test -e "$source_path/config.h" &&
          die "Out of tree builds are impossible with config.h in source dir."
  fi
@@@ -3371,7 -2609,7 +3371,7 @@@ for v in "$@"; d
      r=${v#*=}
      l=${v%"$r"}
      r=$(sh_quote "$r")
 -    LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}"
 +    FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
  done
  
  find_things(){
@@@ -3429,15 -2667,14 +3429,15 @@@ die_unknown()
      exit 1
  }
  
 -print_3_columns() {
 -    printf "%-25s %-25s %-25s\n" $(cat | tr ' ' '\n' | sort)
 +print_in_columns() {
 +    cols=$(expr $ncols / 24)
 +    cat | tr ' ' '\n' | sort | pr -r "-$cols" -w $ncols -t
  }
  
  show_list() {
      suffix=_$1
      shift
 -    echo $* | sed s/$suffix//g | print_3_columns
 +    echo $* | sed s/$suffix//g | print_in_columns
      exit 0
  }
  
@@@ -3471,9 -2708,6 +3471,9 @@@ for opt d
          --extra-ldexeflags=*)
              add_ldexeflags $optval
          ;;
 +        --extra-ldlibflags=*)
 +            add_ldlibflags $optval
 +        ;;
          --extra-libs=*)
              add_extralibs $optval
          ;;
          --disable-all)
              map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
              disable $LIBRARY_LIST $PROGRAM_LIST doc
 +            enable avutil
          ;;
          --enable-random|--disable-random)
              action=${opt%%-random}
              is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt"
              eval list=\$$(toupper $thing)_LIST
              name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing}
 -            $action $(filter "$name" $list)
 -        ;;
 -        --enable-avserver|--disable-avserver*)
 -            warn "avserver has been removed, the ${opt} option is only"\
 -                 "provided for compatibility and will be removed in the future"
 +            list=$(filter "$name" $list)
 +            [ "$list" = "" ] && warn "Option $opt did not match anything"
 +            $action $list
          ;;
          --enable-?*|--disable-?*)
              eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
          ;;
          --quiet|-q) quiet=yes
          ;;
 +        --fatal-warnings) enable fatal_warnings
 +        ;;
 +        --libfuzzer=*)
 +            libfuzzer_path="$optval"
 +        ;;
          *)
              optname="${opt%%=*}"
              optname="${optname#--}"
@@@ -3556,35 -2786,16 +3556,35 @@@ for e in $env; d
      eval "export $e"
  done
  
 +# Mark specifically enabled, but normally autodetected libraries as requested.
 +for lib in $AUTODETECT_LIBS; do
 +    enabled $lib && request $lib
 +done
 +
 +# Enable platform codecs by default.
 +enable_weak audiotoolbox
 +
 +# Enable hwaccels by default.
 +enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
 +enable_weak xlib
 +
 +enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
 +
  disabled logging && logfile=/dev/null
  
 -# Die early if licensing-related configure options are incompatible.
  die_license_disabled() {
      enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; }
  }
  
 -map "die_license_disabled gpl"      $EXTERNAL_LIBRARY_GPL_LIST
 -map "die_license_disabled nonfree"  $EXTERNAL_LIBRARY_NONFREE_LIST $HWACCEL_LIBRARY_NONFREE_LIST
 -map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST
 +die_license_disabled_gpl() {
 +    enabled $1 || { enabled $v && die "$v is incompatible with the gpl and --enable-$1 is not specified."; }
 +}
 +
 +map "die_license_disabled gpl"      $EXTERNAL_LIBRARY_GPL_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
 +map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
 +
 +enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST
 +map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST
  
  enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
  
@@@ -3600,17 -2811,10 +3600,17 @@@ disable_components()
  
  map 'disable_components $v' $LIBRARY_LIST
  
 -mkdir -p avbuild
 -echo "# $0 $LIBAV_CONFIGURATION" > $logfile
 +mkdir -p ffbuild
 +echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
  set >> $logfile
  
 +test -n "$valgrind" && toolchain="valgrind-memcheck"
 +
 +enabled ossfuzz && {
 +    add_cflags  -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp -fno-omit-frame-pointer
 +    add_ldflags -fsanitize=address,undefined -fsanitize-coverage=trace-pc-guard,trace-cmp
 +}
 +
  case "$toolchain" in
      *-asan)
          cc_default="${toolchain%-asan}"
          cc_default="${toolchain%-usan}"
          add_cflags  -fsanitize=undefined
          add_ldflags -fsanitize=undefined
 -        case "$toolchain" in
 -            clang-usan)
 -                add_cflags -O1
 -                ;;
 -        esac
      ;;
      valgrind-*)
          target_exec_default="valgrind"
          case "$toolchain" in
              valgrind-massif)
 -                target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
 +                target_exec_args="--tool=massif --alloc-fn=av_malloc --alloc-fn=av_mallocz --alloc-fn=av_calloc --alloc-fn=av_fast_padded_malloc --alloc-fn=av_fast_malloc --alloc-fn=av_realloc_f --alloc-fn=av_fast_realloc --alloc-fn=av_realloc"
                  ;;
              valgrind-memcheck)
 -                target_exec_args="--track-origins=yes --leak-check=full"
 +                target_exec_args="--error-exitcode=1 --malloc-fill=0x2a --track-origins=yes --leak-check=full --gen-suppressions=all --suppressions=$source_path/tests/fate-valgrind.supp"
                  ;;
          esac
      ;;
      msvc)
          # Check whether the current MSVC version needs the C99 converter.
          # From MSVC 2013 (compiler major version 18) onwards, it does actually
 -        # support enough of C99 to build libav. Default to the new
 +        # support enough of C99 to build ffmpeg. Default to the new
          # behaviour if the regexp was unable to match anything, since this
          # successfully parses the version number of existing supported
          # versions that require the converter (MSVC 2010 and 2012).
          cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
          if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
              cc_default="cl"
 +            cxx_default="cl"
          else
              cc_default="c99wrap cl"
 +            cxx_default="c99wrap cl"
          fi
          ld_default="$source_path/compat/windows/mslink"
          nm_default="dumpbin -symbols"
          add_cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
          add_cflags   -fno-strict-overflow -fstack-protector-all
          add_ldflags  -Wl,-z,relro -Wl,-z,now
 +        add_cflags   -fPIE
 +        add_ldexeflags -fPIE -pie
      ;;
      ?*)
          die "Unknown toolchain $toolchain"
  
  ar_default="${cross_prefix}${ar_default}"
  cc_default="${cross_prefix}${cc_default}"
 -occ_default="${cross_prefix}${occ_default}"
 +cxx_default="${cross_prefix}${cxx_default}"
  nm_default="${cross_prefix}${nm_default}"
  pkg_config_default="${cross_prefix}${pkg_config_default}"
 -ranlib="${cross_prefix}${ranlib}"
 -strip="${cross_prefix}${strip}"
 +if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then
 +    ranlib_default="${cross_prefix}${ranlib_default} -D"
 +else
 +    ranlib_default="${cross_prefix}${ranlib_default}"
 +fi
 +strip_default="${cross_prefix}${strip_default}"
 +windres_default="${cross_prefix}${windres_default}"
  
  sysinclude_default="${sysroot}/usr/include"
  
 -set_default arch cc pkg_config sysinclude target_exec target_os
 +set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
 +    target_exec target_os yasmexe nvcc
  enabled cross_compile || host_cc_default=$cc
  set_default host_cc
  
 +pkg_config_fail_message=""
  if ! $pkg_config --version >/dev/null 2>&1; then
      warn "$pkg_config not found, library detection may fail."
      pkg_config=false
 +elif is_in -static $cc $LDFLAGS && ! is_in --static $pkg_config $pkg_config_flags; then
 +    pkg_config_fail_message="
 +Note: When building a static binary, add --pkg-config-flags=\"--static\"."
 +fi
 +
 +if test $doxygen != $doxygen_default && \
 +  ! $doxygen --version >/dev/null 2>&1; then
 +    warn "Specified doxygen \"$doxygen\" not found, API documentation will fail to build."
  fi
  
  exesuf() {
@@@ -3762,11 -2952,7 +3762,11 @@@ HOSTEXESUF=$(exesuf $host_os
  : ${TMPDIR:=$TMP}
  : ${TMPDIR:=/tmp}
  
 -if ! check_cmd mktemp -u XXXXXX; then
 +if [ -n "$tempprefix" ] ; then
 +    mktemp(){
 +        echo $tempprefix.${HOSTNAME}.${UID}
 +    }
 +elif ! check_cmd mktemp -u XXXXXX; then
      # simple replacement for missing mktemp
      # NOT SAFE FOR GENERAL USE
      mktemp(){
@@@ -3786,10 -2972,8 +3786,10 @@@ trap 'rm -f -- $TMPFILES' EXI
  
  tmpfile TMPASM .asm
  tmpfile TMPC   .c
 +tmpfile TMPCPP .cpp
  tmpfile TMPE   $EXESUF
  tmpfile TMPH   .h
 +tmpfile TMPM   .m
  tmpfile TMPO   .o
  tmpfile TMPS   .S
  tmpfile TMPSH  .sh
@@@ -3872,9 -3056,7 +3872,9 @@@ msvc_common_flags()
              -march=*)             ;;
              -lz)                  echo zlib.lib ;;
              -lx264)               echo libx264.lib ;;
 +            -lstdc++)             ;;
              -l*)                  echo ${flag#-l}.lib ;;
 +            -LARGEADDRESSAWARE)   echo $flag ;;
              -L*)                  echo -libpath:${flag#-L} ;;
              *)                    echo $flag ;;
          esac
@@@ -3888,7 -3070,6 +3888,7 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
 +                                       -wd4307 \
                                         -wd4273 -wd4554 -wd4701 -wd4703 ;;
          esac
      done
@@@ -3902,16 -3083,6 +3902,16 @@@ icl_flags()
              # on Windows, does enable remarks so disable them here.
              -Wall)                echo $flag -Qdiag-disable:remark ;;
              -std=c99)             echo -Qstd=c99 ;;
 +            -flto)                echo -ipo ;;
 +        esac
 +    done
 +}
 +
 +icc_flags(){
 +    for flag; do
 +        case $flag in
 +            -flto)                echo -ipo ;;
 +            *)                    echo $flag ;;
          esac
      done
  }
@@@ -3944,16 -3115,9 +3944,16 @@@ suncc_flags()
                      prescott|nocona)    echo -xarch=sse3 -xchip=pentium4 ;;
                      *-sse3)             echo -xarch=sse3                 ;;
                      core2)              echo -xarch=ssse3 -xchip=core2   ;;
 -                    corei7)           echo -xarch=sse4_2 -xchip=nehalem  ;;
 -                    corei7-avx)       echo -xarch=avx -xchip=sandybridge ;;
 -                    amdfam10|barcelona|bdver*) echo -xarch=sse4_1        ;;
 +                    bonnell)                   echo -xarch=ssse3         ;;
 +                    corei7|nehalem)            echo -xtarget=nehalem     ;;
 +                    westmere)                  echo -xtarget=westmere    ;;
 +                    silvermont)                echo -xarch=sse4_2        ;;
 +                    corei7-avx|sandybridge)    echo -xtarget=sandybridge ;;
 +                    core-avx*|ivybridge|haswell|broadwell|skylake*|knl)
 +                                               echo -xarch=avx           ;;
 +                    amdfam10|barcelona)        echo -xtarget=barcelona   ;;
 +                    btver1)                    echo -xarch=amdsse4a      ;;
 +                    btver2|bdver*|znver*)      echo -xarch=avx           ;;
                      athlon-4|athlon-[mx]p)     echo -xarch=ssea          ;;
                      k8|opteron|athlon64|athlon-fx)
                                                 echo -xarch=sse2a         ;;
@@@ -4003,16 -3167,13 +4003,16 @@@ tms470_flags()
  probe_cc(){
      pfx=$1
      _cc=$2
 +    first=$3
  
      unset _type _ident _cc_c _cc_e _cc_o _flags _cflags
      unset _ld_o _ldflags _ld_lib _ld_path
      unset _depflags _DEPCMD _DEPFLAGS
      _flags_filter=echo
  
 -    if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
 +    if $_cc --version 2>&1 | grep -q '^GNU assembler'; then
 +        true # no-op to avoid reading stdin in following checks
 +    elif $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
          _type=llvm_gcc
          gcc_extra_ver=$(expr "$($_cc --version 2>/dev/null | head -n1)" : '.*\((.*)\)')
          _ident="llvm-gcc $($_cc -dumpversion 2>/dev/null) $gcc_extra_ver"
          gcc_pkg_ver=$(expr "$gcc_version" : '[^ ]* \(([^)]*)\)')
          gcc_ext_ver=$(expr "$gcc_version" : ".*$gcc_pkg_ver $gcc_basever \\(.*\\)")
          _ident=$(cleanws "gcc $gcc_basever $gcc_pkg_ver $gcc_ext_ver")
 -        if ! $_cc -dumpversion | grep -q '^2\.'; then
 -            _depflags='-MMD -MF $(@:.o=.d) -MT $@'
 +        case $gcc_basever in
 +            2) ;;
 +            2.*) ;;
 +            *) _depflags='-MMD -MF $(@:.o=.d) -MT $@' ;;
 +        esac
 +        if [ "$first" = true ]; then
 +            case $gcc_basever in
 +                4.2*)
 +                warn "gcc 4.2 is outdated and may miscompile FFmpeg. Please use a newer compiler." ;;
 +            esac
          fi
          _cflags_speed='-O3'
          _cflags_size='-Os'
          _cflags_speed='-O3'
          _cflags_size='-Os'
          _cflags_noopt='-O1'
 +        _flags_filter=icc_flags
      elif $_cc -v 2>&1 | grep -q xlc; then
          _type=xlc
          _ident=$($_cc -qversion 2>/dev/null | head -n1)
          _ident=$($_cc --version 2>/dev/null | head -n1)
          _depflags='-MMD -MF $(@:.o=.d) -MT $@'
          _cflags_speed='-O3'
 -        _cflags_size='-Os'
 +        _cflags_size='-Oz'
      elif $_cc -V 2>&1 | grep -q Sun; then
          _type=suncc
          _ident=$($_cc -V 2>&1 | head -n1 | cut -d' ' -f 2-)
          opt_common='-alias=ansi -Mdse -Mlre -Mpre'
          _cflags_speed="-O3 -Mautoinline -Munroll=c:4 $opt_common"
          _cflags_size="-O2 -Munroll=c:1 $opt_common"
 -        _cflags_noopt="-O1"
 +        _cflags_noopt="-O"
          _flags_filter=pgi_flags
      elif $_cc 2>&1 | grep -q 'Microsoft.*ARM.*Assembler'; then
          _type=armasm
          # 4509: "This form of conditional instruction is deprecated"
          _flags="-nologo -ignore 4509"
          _flags_filter=armasm_flags
 -    elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
 -        _type=msvc
 -        _ident=$($_cc 2>&1 | head -n1)
 -        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
 -        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
 -        _cflags_speed="-O2"
 -        _cflags_size="-O1"
 -        _cflags_noopt="-O1"
 -        if $_cc -nologo- 2>&1 | grep -q Linker; then
 -            _ld_o='-out:$@'
 -        else
 -            _ld_o='-Fe$@'
 -        fi
 -        _cc_o='-Fo$@'
 -        _cc_e='-P -Fi$@'
 -        _flags_filter=msvc_flags
 -        _ld_lib='lib%.a'
 -        _ld_path='-libpath:'
 -        _flags='-nologo'
      elif $_cc 2>&1 | grep -q Intel; then
          _type=icl
          _ident=$($_cc 2>&1 | head -n1)
          _ld_path='-libpath:'
          # -Qdiag-error to make icl error when seeing certain unknown arguments
          _flags='-nologo -Qdiag-error:4044,10157'
 -        # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
 +        # -Qvec- -Qsimd- to prevent miscompilation, -GS, fp:precise for consistency
          # with MSVC which enables it by default.
 -        _cflags='-Qms0 -Qvec- -Qsimd- -GS'
 +        _cflags='-Qms0 -Qvec- -Qsimd- -GS -fp:precise'
 +        disable stripping
      elif $_cc -? 2>/dev/null | grep -q 'LLVM.*Linker'; then
          # lld can emulate multiple different linkers; in ms link.exe mode,
          # the -? parameter gives the help output which contains an identifyable
          _flags_filter=msvc_flags
          _ld_lib='lib%.a'
          _ld_path='-libpath:'
 +    elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
 +        _type=msvc
 +        _ident=$($_cc 2>&1 | head -n1)
 +        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
 +        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
 +        _cflags_speed="-O2"
 +        _cflags_size="-O1"
 +        _cflags_noopt="-O1"
 +        if $_cc -nologo- 2>&1 | grep -q Linker; then
 +            _ld_o='-out:$@'
 +        else
 +            _ld_o='-Fe$@'
 +        fi
 +        _cc_o='-Fo$@'
 +        _cc_e='-P -Fi$@'
 +        _flags_filter=msvc_flags
 +        _ld_lib='lib%.a'
 +        _ld_path='-libpath:'
 +        _flags='-nologo'
 +        disable stripping
      elif $_cc --version 2>/dev/null | grep -q ^cparser; then
          _type=cparser
          _ident=$($_cc --version | head -n1)
@@@ -4211,7 -3361,7 +4211,7 @@@ set_ccvars()
      fi
  }
  
 -probe_cc cc "$cc"
 +probe_cc cc "$cc" "true"
  cflags_filter=$_flags_filter
  cflags_speed=$_cflags_speed
  cflags_size=$_cflags_size
@@@ -4219,10 -3369,10 +4219,11 @@@ cflags_noopt=$_cflags_noop
  add_cflags $_flags $_cflags
  cc_ldflags=$_ldflags
  set_ccvars CC
 +set_ccvars CXX
  
  probe_cc hostcc "$host_cc"
  host_cflags_filter=$_flags_filter
+ host_cflags_speed=$_cflags_speed
  add_host_cflags  $_flags $_cflags
  set_ccvars HOSTCC
  
@@@ -4234,7 -3384,7 +4235,7 @@@ test -n "$cc_type" && enable $cc_type |
  : ${dep_cc_default:=$cc}
  : ${ld_default:=$cc}
  : ${host_ld_default:=$host_cc}
 -set_default ar as objcc dep_cc ld host_ld
 +set_default ar as objcc dep_cc ld ln_s host_ld windres
  
  probe_cc as "$as"
  asflags_filter=$_flags_filter
@@@ -4275,16 -3425,12 +4276,16 @@@ elif $ar 2>&1 | grep -q 'Texas Instrume
  elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then
      arflags='-Xany -r -c'
      ar_o='$@'
 +elif $ar 2>&1 | grep -q "\[D\] "; then
 +    arflags="rcD"
 +    ar_o='$@'
  else
      arflags="rc"
      ar_o='$@'
  fi
  
  add_cflags $extra_cflags
 +add_cxxflags $extra_cxxflags
  add_objcflags $extra_objcflags
  add_asflags $extra_cflags
  
@@@ -4293,9 -3439,6 +4294,9 @@@ if test -n "$sysroot"; the
          gcc|llvm_gcc|clang)
              add_cppflags --sysroot="$sysroot"
              add_ldflags --sysroot="$sysroot"
 +# On Darwin --sysroot may be ignored, -isysroot always affects headers and linking
 +            add_cppflags -isysroot "$sysroot"
 +            add_ldflags -isysroot "$sysroot"
          ;;
          tms470)
              add_cppflags -I"$sysinclude"
@@@ -4320,17 -3463,6 +4321,17 @@@ if test "$cpu" = host; the
              }
              cpu=$(check_native -march || check_native -mcpu)
          ;;
 +        clang)
 +            check_native(){
 +                $cc $1=native -v -c -o $TMPO $TMPC >$TMPE 2>&1 || return
 +                sed -n "/cc1.*-target-cpu /{
 +                            s/.*-target-cpu \\([^ ]*\\).*/\\1/
 +                            p
 +                            q
 +                        }" $TMPE
 +            }
 +            cpu=$(check_native -march)
 +        ;;
      esac
  
      test "${cpu:-host}" = host &&
@@@ -4342,7 -3474,7 +4343,7 @@@ case "$arch" i
      aarch64|arm64)
          arch="aarch64"
      ;;
 -    arm*)
 +    arm*|iPad*|iPhone*)
          arch="arm"
      ;;
      mips*|IP*)
      sh4|sh)
          arch="sh4"
      ;;
 -    sun4u|sparc*)
 +    sun4*|sparc*)
          arch="sparc"
      ;;
      tilegx|tile-gx)
          arch="tilegx"
      ;;
 -    i[3-6]86|i86pc|BePC|x86pc|x86_64|amd64)
 +    i[3-6]86*|i86pc|BePC|x86pc|x86_64|x86_32|amd64)
          arch="x86"
      ;;
  esac
@@@ -4455,10 -3587,7 +4456,10 @@@ elif enabled arm; the
  
      case "$subarch" in
          armv5t*)    enable fast_clz                ;;
 -        armv[6-8]*) enable fast_clz fast_unaligned ;;
 +        armv[6-8]*)
 +            enable fast_clz
 +            disabled fast_unaligned || enable fast_unaligned
 +            ;;
      esac
  
  elif enabled avr32; then
@@@ -4490,98 -3619,6 +4491,98 @@@ elif enabled mips; the
  
      cpuflags="-march=$cpu"
  
 +    if [ "$cpu" != "generic" ]; then
 +        disable mips32r2
 +        disable mips32r5
 +        disable mips64r2
 +        disable mips32r6
 +        disable mips64r6
 +        disable loongson2
 +        disable loongson3
 +
 +        case $cpu in
 +            24kc|24kf*|24kec|34kc|1004kc|24kef*|34kf*|1004kf*|74kc|74kf)
 +                enable mips32r2
 +                disable msa
 +            ;;
 +            p5600|i6400|p6600)
 +                disable mipsdsp
 +                disable mipsdspr2
 +            ;;
 +            loongson*)
 +                enable loongson2
 +                enable loongson3
 +                enable local_aligned_8 local_aligned_16 local_aligned_32
 +                enable simd_align_16
 +                enable fast_64bit
 +                enable fast_clz
 +                enable fast_cmov
 +                enable fast_unaligned
 +                disable aligned_stack
 +                disable mipsfpu
 +                disable mipsdsp
 +                disable mipsdspr2
 +                case $cpu in
 +                    loongson3*)
 +                        cpuflags="-march=loongson3a -mhard-float -fno-expensive-optimizations"
 +                    ;;
 +                    loongson2e)
 +                        cpuflags="-march=loongson2e -mhard-float -fno-expensive-optimizations"
 +                    ;;
 +                    loongson2f)
 +                        cpuflags="-march=loongson2f -mhard-float -fno-expensive-optimizations"
 +                    ;;
 +                esac
 +            ;;
 +            *)
 +                # Unknown CPU. Disable everything.
 +                warn "unknown CPU. Disabling all MIPS optimizations."
 +                disable mipsfpu
 +                disable mipsdsp
 +                disable mipsdspr2
 +                disable msa
 +                disable mmi
 +            ;;
 +        esac
 +
 +        case $cpu in
 +            24kc)
 +                disable mipsfpu
 +                disable mipsdsp
 +                disable mipsdspr2
 +            ;;
 +            24kf*)
 +                disable mipsdsp
 +                disable mipsdspr2
 +            ;;
 +            24kec|34kc|1004kc)
 +                disable mipsfpu
 +                disable mipsdspr2
 +            ;;
 +            24kef*|34kf*|1004kf*)
 +                disable mipsdspr2
 +            ;;
 +            74kc)
 +                disable mipsfpu
 +            ;;
 +            p5600)
 +                enable mips32r5
 +                check_cflags "-mtune=p5600" && check_cflags "-msched-weight -mload-store-pairs -funroll-loops"
 +            ;;
 +            i6400)
 +                enable mips64r6
 +                check_cflags "-mtune=i6400 -mabi=64" && check_cflags "-msched-weight -mload-store-pairs -funroll-loops" && check_ldflags "-mabi=64"
 +            ;;
 +            p6600)
 +                enable mips64r6
 +                check_cflags "-mtune=p6600 -mabi=64" && check_cflags "-msched-weight -mload-store-pairs -funroll-loops" && check_ldflags "-mabi=64"
 +            ;;
 +        esac
 +    else
 +        # We do not disable anything. Is up to the user to disable the unwanted features.
 +        warn 'generic cpu selected'
 +    fi
 +
  elif enabled ppc; then
  
      disable ldbrx
          ;;
          power[7-8]*)
              cpuflags="-mcpu=$cpu"
 -            enable ldbrx
          ;;
          cell)
              cpuflags="-mcpu=cell"
@@@ -4668,9 -3706,7 +4669,9 @@@ elif enabled x86; the
              disable i686
          ;;
          # targets that do support nopl and conditional mov (cmov)
 -        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
 +        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx\
 +        |core*|atom|bonnell|nehalem|westmere|silvermont|sandybridge|ivybridge|haswell|broadwell|skylake*|knl\
 +        |amdfam10|barcelona|b[dt]ver*|znver*)
              cpuflags="-march=$cpu"
              enable i686
              enable fast_cmov
@@@ -4705,12 -3741,10 +4706,12 @@@ if test "$?" != 0; the
  fi
  
  add_cppflags -D_ISOC99_SOURCE
 +add_cxxflags -D__STDC_CONSTANT_MACROS
 +check_cxxflags -std=c++11 || check_cxxflags -std=c++0x
  
  # some compilers silently accept -std=c11, so we also need to check that the
  # version macro is defined properly
 -if test_cflags_cpp -std=c11 "__STDC_VERSION__ >= 201112L"; then
 +if test_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L"; then
      add_cflags -std=c11
  else
      check_cflags -std=c99
@@@ -4726,7 -3760,7 +4727,7 @@@ EO
  add_host_cppflags -D_ISOC99_SOURCE
  check_host_cflags -std=c99
  check_host_cflags -Wall
- check_host_cflags -O3
+ check_host_cflags $host_cflags_speed
  
  check_64bit(){
      arch32=$1
@@@ -4762,18 -3796,10 +4763,18 @@@ case "$arch" i
      ;;
      x86)
          check_64bit x86_32 x86_64 'sizeof(void *) > 4'
 +        # Treat x32 as x64 for now. Note it also needs spic=$shared
 +        test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' &&
 +            subarch=x86_64
          if test "$subarch" = "x86_64"; then
              spic=$shared
          fi
      ;;
 +    ppc)
 +        check_cc <<EOF && subarch="ppc64"
 +        int test[(int)sizeof(char*) - 7];
 +EOF
 +    ;;
  esac
  
  enable $subarch
@@@ -4802,7 -3828,6 +4803,7 @@@ case $target_os i
          SHFLAGS='-shared -Wl,-h,$$(@F)'
          enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
          network_extralibs="-lsocket -lnsl"
 +        add_cppflags -D__EXTENSIONS__
          # When using suncc to build, the Solaris linker will mark
          # an executable with each instruction set encountered by
          # the Solaris assembler.  As our libraries contain their own
          disable symver
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
 +        enabled gcc || check_ldflags -Wl,-zmuldefs
          ;;
      openbsd|bitrig)
          disable symver
          ;;
      bsd/os)
          add_extralibs -lpoll -lgnugetopt
 +        strip="strip -d"
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
 -        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
 +        install_name_dir_default='$(SHLIBDIR)'
 +        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(INSTALL_NAME_DIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
 +        strip="${strip} -x"
          add_ldflags -Wl,-dynamic,-search_paths_first
          SLIBSUF=".dylib"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
 +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
 +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
          objformat="macho"
          enabled x86_64 && objformat="macho64"
 -        enabled_any pic shared ||
 +        enabled_any pic shared x86_64 ||
              { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
          check_header dispatch/dispatch.h &&
              add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'
 +        version_script='-exported_symbols_list'
 +        VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
          ;;
      msys*)
          die "Native MSYS builds are discouraged, please use the MINGW environment."
          elif enabled arm; then
              LIBTARGET=arm-wince
          fi
 -        check_ldflags -Wl,--nxcompat
 -        check_ldflags -Wl,--dynamicbase
 +        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
 +        enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"
          SLIBPREF=""
          SLIBSUF=".dll"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
 -        SLIB_EXTRA_CMD=-'sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def) > $$(@:$(SLIBSUF)=.def); $(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
 +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
 +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
 +        dlltool="${cross_prefix}dlltool"
 +        if check_cmd lib.exe -list; then
 +            SLIB_EXTRA_CMD=-'sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def) > $$(@:$(SLIBSUF)=.def); lib.exe -nologo -machine:$(LIBTARGET) -def:$$(@:$(SLIBSUF)=.def) -out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)'
 +            if enabled x86_64; then
 +                LIBTARGET=x64
 +            fi
 +        elif check_cmd $dlltool --version; then
 +            SLIB_EXTRA_CMD=-'sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def) > $$(@:$(SLIBSUF)=.def); $(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
 +        fi
          SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
          SLIB_INSTALL_LINKS=
          SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)'
          SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
 -        SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.orig.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
 +        SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.orig.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--disable-auto-image-base'
          objformat="win32"
 -        dlltool="${cross_prefix}dlltool"
          ranlib=:
          enable dos_paths
 +        check_ldflags -Wl,--nxcompat,--dynamicbase
 +        # Lets work around some stupidity in binutils.
 +        # ld will strip relocations from executables even though we need them
 +        # for dynamicbase (ASLR).  Using -pie does retain the reloc section
 +        # however ld then forgets what the entry point should be (oops) so we
 +        # have to manually (re)set it.
 +        if enabled x86_32; then
 +            disabled debug && add_ldexeflags -Wl,--pic-executable,-e,_mainCRTStartup
 +        elif enabled x86_64; then
 +            disabled debug && add_ldexeflags -Wl,--pic-executable,-e,mainCRTStartup
 +            check_ldflags -Wl,--high-entropy-va # binutils 2.25
 +            # Set image base >4GB for extra entropy with HEASLR
 +            add_ldexeflags -Wl,--image-base,0x140000000
 +            append SHFLAGS -Wl,--image-base,0x180000000
 +        fi
          ;;
      win32|win64)
          disable symver
              # Cannot build both shared and static libs with MSVC or icl.
              disable static
          fi
 +        enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"
          SLIBPREF=""
          SLIBSUF=".dll"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
 +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
 +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
          SLIB_CREATE_DEF_CMD='$(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)'
          SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
          SLIB_INSTALL_LINKS=
          shlibdir_default="$bindir_default"
          SLIBPREF="cyg"
          SLIBSUF=".dll"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
 +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
 +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
          SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
          SLIB_INSTALL_LINKS=
 -        SLIB_INSTALL_EXTRA_LIB='lib$(NAME).dll.a'
 -        SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(NAME).dll.a'
 +        SLIB_INSTALL_EXTRA_LIB='lib$(FULLNAME).dll.a'
 +        SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
          objformat="win32"
          enable dos_paths
 +        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
 +        add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
          ;;
      *-dos|freedos|opendos)
          network_extralibs="-lsocket"
          ranlib="echo ignoring ranlib"
          ;;
      os/2*)
 -        ln_s="cp -f"
 +        strip="lxlite -CS"
          objformat="aout"
          add_cppflags -D_GNU_SOURCE
          add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap
          LIBSUF="_s.a"
          SLIBPREF=""
          SLIBSUF=".dll"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
 -        SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
 -            echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
 -            echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
 -            echo EXPORTS >> $(SUBDIR)$(NAME).def; \
 -            emxexp $(OBJS) >> $(SUBDIR)$(NAME).def'
 -        SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \
 -            emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
 -        SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
 +        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
 +        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(FULLNAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
 +        SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(FULLNAME).def; \
 +            echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(FULLNAME).def; \
 +            echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(FULLNAME).def; \
 +            echo EXPORTS >> $(SUBDIR)$(FULLNAME).def; \
 +            emxexp $(OBJS) >> $(SUBDIR)$(FULLNAME).def'
 +        SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(FULLNAME)_dll.a $(SUBDIR)$(FULLNAME).def; \
 +            emximp -o $(SUBDIR)$(LIBPREF)$(FULLNAME)_dll.lib $(SUBDIR)$(FULLNAME).def;'
 +        SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
 +        SLIB_INSTALL_LINKS=
 +        SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(FULLNAME)_dll.a $(LIBPREF)$(FULLNAME)_dll.lib'
          enable dos_paths
 +        enable_weak os2threads
          ;;
      gnu/kfreebsd)
          add_cppflags -D_BSD_SOURCE
          ;;
  esac
  
 +# test if creating links works
 +link_dest=$(mktemp -u $TMPDIR/dest_XXXXXXXX)
 +link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX)
 +mkdir "$link_dest"
 +$ln_s "$link_dest" "$link_name"
 +touch "$link_dest/test_file"
 +if [ "$source_path" != "." ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
 +    # create link to source path
 +    [ -e src ] && rm src
 +    $ln_s "$source_path" src
 +    source_link=src
 +else
 +    # creating directory links doesn't work
 +    # fall back to using the full source path
 +    source_link="$source_path"
 +fi
 +# cleanup
 +rm -r "$link_dest"
 +rm -r "$link_name"
 +
  # determine libc flavour
  
  probe_libc(){
      # MinGW64 is backwards compatible with MinGW32, so check for it first.
      elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
          eval ${pfx}libc_type=mingw64
 +        if check_${pfx}cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
 +            add_compat msvcrt/snprintf.o
 +            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +        fi
          add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
          eval test \$${pfx_no_}cc_type = "gcc" &&
              add_${pfx}cppflags -D__printf__=__gnu_printf__
              (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
              die "ERROR: MinGW32 runtime version must be >= 3.15."
          add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
 +        check_${pfx}cpp_condition _mingw.h "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0502" ||
 +            add_${pfx}cppflags -D_WIN32_WINNT=0x0502
          check_${pfx}cpp_condition _mingw.h "__MSVCRT_VERSION__ < 0x0700__" &&
              add_${pfx}cppflags -D__MSVCRT_VERSION__=0x0700
          eval test \$${pfx_no_}cc_type = "gcc" &&
  EOF
          if [ "$pfx" = "" ]; then
              check_func strtoll || add_cflags -Dstrtoll=_strtoi64
 +            check_func strtoull || add_cflags -Dstrtoull=_strtoui64
          fi
      elif check_${pfx}cpp_condition stddef.h "defined __KLIBC__"; then
          eval ${pfx}libc_type=klibc
      elif check_${pfx}cpp_condition sys/brand.h "defined LABELED_BRAND_NAME"; then
          eval ${pfx}libc_type=solaris
          add_${pfx}cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
 -    else
 -        eval ${pfx}libc_type=default
 -        add_${pfx}cppflags -D_DEFAULT_SOURCE
      fi
 +    check_${pfx}cc <<EOF
 +#include <time.h>
 +void *v = localtime_r;
 +EOF
 +test "$?" != 0 && check_${pfx}cc -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 <<EOF && add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
 +#include <time.h>
 +void *v = localtime_r;
 +EOF
 +
  }
  
  probe_libc
@@@ -5170,14 -4128,10 +5171,14 @@@ esc()
      echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
  }
  
 -echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" > avbuild/config.fate
 +echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate
  
  check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
  
 +set_default libdir
 +: ${shlibdir_default:="$libdir"}
 +: ${pkgconfigdir_default:="$libdir/pkgconfig"}
 +
  set_default $PATHS_LIST
  set_default nm
  
@@@ -5192,7 -4146,7 +5193,7 @@@ EO
      exit 1
  fi
  
 -disabled optimizations || check_cflags -fomit-frame-pointer
 +disabled optimizations || enabled ossfuzz || check_cflags -fomit-frame-pointer
  
  enable_weak_pic() {
      disabled pic && return
@@@ -5244,10 -4198,6 +5245,10 @@@ unsigned int endian = 'B' << 24 | 'I' <
  EOF
  od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
 +if ! enabled ppc64 || enabled bigendian; then
 +    disable vsx
 +fi
 +
  check_gas() {
      log "check_gas using '$as' as AS"
      # :vararg is used on aarch64, arm and ppc altivec
@@@ -5268,7 -4218,7 +5269,7 @@@ EO
  if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
      nogas=:
      enabled_any arm aarch64 && nogas=die
 -    enabled_all ppc altivec && nogas=warn
 +    enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
      as_noop=-v
  
      case $as_type in
  
      [ $target_os = "darwin" ] && gaspp_as_type="apple-$gaspp_as_type"
  
 -    check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as $as_noop &&
 -        gas="gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as"
 +    test "${as#*gas-preprocessor.pl}" != "$as" ||
 +    check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- ${as:=$cc} $as_noop &&
 +        gas="${gas:=gas-preprocessor.pl} -arch $arch -as-type $gaspp_as_type -- ${as:=$cc}"
  
      if ! check_gas ; then
          as=${gas:=$as}
  
  check_inline_asm inline_asm_labels '"1:\n"'
  
 +check_inline_asm inline_asm_nonlocal_labels '"Label:\n"'
 +
  if enabled aarch64; then
      enabled armv8 && check_insn armv8 'prfm   pldl1strm, [x0]'
      # internal assembler in clang 3.3 does not support this instruction
@@@ -5314,11 -4261,7 +5315,11 @@@ elif enabled alpha; the
  elif enabled arm; then
  
      enabled msvc && check_cpp_condition stddef.h "defined _M_ARMT" && enable thumb
 -    check_cpp_condition stddef.h "defined __thumb__" && enable_weak thumb
 +
 +    check_cpp_condition stddef.h "defined __thumb__" && check_cc <<EOF && enable_weak thumb
 +float func(float a, float b){ return a+b; }
 +EOF
 +
      enabled thumb && check_cflags -mthumb || check_cflags -marm
  
      if     check_cpp_condition stddef.h "defined __ARM_PCS_VFP"; then
      elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then
          case "${cross_prefix:-$cc}" in
              *hardfloat*)         enable vfp_args;   fpabi=vfp ;;
 -            *) check_ld <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;
 +            *) check_ld "cc" <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;
  __asm__ (".eabi_attribute 28, 1");
  int main(void) { return 0; }
  EOF
      enabled neon    && check_insn neon    'vadd.i16 q0, q0, q0'
      enabled vfp     && check_insn vfp     'fadds s0, s0, s0'
      enabled vfpv3   && check_insn vfpv3   'vmov.f32 s0, #1.0'
 +    enabled setend  && check_insn setend  'setend be'
  
      [ $target_os = linux ] || [ $target_os = android ] ||
          map 'enabled_any ${v}_external ${v}_inline || disable $v' \
  
  elif enabled mips; then
  
 -    check_inline_asm loongson '"dmult.g $1, $2, $3"'
 -
 -    # make sure that only an instruction set is enabled
 -    disable mips64r6 mips32r6 mips64r2 mips32r2 mips64r1 mips32r1
 +    enabled loongson2 && check_inline_asm loongson2 '"dmult.g $8, $9, $10"'
 +    enabled loongson3 && check_inline_asm loongson3 '"gsldxc1 $f0, 0($2, $3)"'
 +    enabled mmi && check_inline_asm mmi '"punpcklhw $f0, $f0, $f0"'
  
 +    # Enable minimum ISA based on selected options
      if enabled mips64; then
 -        check_inline_asm mips64r6 '"dlsa $0, $0, $0, 1"' ||
 -            check_inline_asm mips64r2 '"dext $0, $0, 0, 1"' ||
 -                check_inline_asm mips64r1 '"daddi $0, $0, 0"'
 +        enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
 +        enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
 +        disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
      else
 -        check_inline_asm mips32r6 '"aui $0, $0, 0"' ||
 -            check_inline_asm mips32r2 '"ext $0, $0, 0, 1"' ||
 -                check_inline_asm mips32r1 '"addi $0, $0, 0"'
 +        enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
 +        enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
 +        enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
 +        disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
      fi
  
 +    enabled mipsfpu && check_inline_asm_flags mipsfpu '"cvt.d.l $f0, $f2"' '-mhard-float'
 +    enabled mipsfpu && (enabled mips32r5 || enabled mips32r6 || enabled mips64r6) && check_inline_asm_flags mipsfpu '"cvt.d.l $f0, $f1"' '-mfp64'
 +    enabled mipsfpu && enabled msa && check_inline_asm_flags msa '"addvi.b $w0, $w1, 1"' '-mmsa' && check_header msa.h || disable msa
 +    enabled mipsdsp && check_inline_asm_flags mipsdsp '"addu.qb $t0, $t1, $t2"' '-mdsp'
 +    enabled mipsdspr2 && check_inline_asm_flags mipsdspr2 '"absq_s.qb $t0, $t1"' '-mdspr2'
 +
  elif enabled parisc; then
  
      if enabled gcc; then
          case $($cc -dumpversion) in
 -            4.[3-8].*) check_cflags -fno-optimize-sibling-calls ;;
 +            4.[3-9].*) check_cflags -fno-optimize-sibling-calls ;;
          esac
      fi
  
@@@ -5459,9 -4394,6 +5460,9 @@@ EO
      # check whether xmm clobbers are supported
      check_inline_asm xmm_clobbers '"":::"%xmm0"'
  
 +    check_inline_asm inline_asm_direct_symbol_refs '"movl '$extern_prefix'test, %eax"' ||
 +        check_inline_asm inline_asm_direct_symbol_refs '"movl '$extern_prefix'test(%rip), %eax"'
 +
      # check whether binutils is new enough to compile SSSE3/MMXEXT
      enabled ssse3  && check_inline_asm ssse3_inline  '"pabsw %xmm0, %xmm0"'
      enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
          elif check_cmd nasm -v; then
              yasmexe=nasm
              yasm_debug="-g -F dwarf"
 -            enabled x86_64 && test "$objformat" = elf && objformat=elf64
 +            if enabled x86_64; then
 +                case "$objformat" in
 +                    elf)   objformat=elf64 ;;
 +                    win32) objformat=win64 ;;
 +                esac
 +            fi
          fi
  
          YASMFLAGS="-f $objformat $yasm_extra"
              die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
          check_yasm "vextracti128 xmm0, ymm0, 0"      || disable avx2_external
          check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
 -        check_yasm "vfmadd132ps ymm0, ymm1, ymm2"    || disable fma3_external
          check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
          check_yasm "CPU amdnop" || disable cpunop
      fi
  check_code cc arm_neon.h "int16x8_t test = vdupq_n_s16(0)" && enable intrinsics_neon
  
  check_ldflags -Wl,--as-needed
 +check_ldflags -Wl,-z,noexecstack
  
 -if check_func dlopen; then
 +if check_func dlopen && check_func dlsym; then
      ldl=
 -elif check_func dlopen -ldl; then
 +elif check_func dlopen -ldl && check_func dlsym -ldl; then
      ldl=-ldl
  fi
  
 +avisynth_demuxer_extralibs='$ldl'
 +cuda_extralibs='$ldl'
 +decklink_outdev_extralibs="$decklink_outdev_extralibs $ldl"
 +decklink_indev_extralibs="$decklink_indev_extralibs $ldl"
 +frei0r_filter_extralibs='$ldl'
 +frei0r_src_filter_extralibs='$ldl'
 +ladspa_filter_extralibs='$ldl'
 +nvenc_extralibs='$ldl'
 +coreimage_filter_extralibs="-framework QuartzCore -framework AppKit -framework OpenGL"
 +coreimagesrc_filter_extralibs="-framework QuartzCore -framework AppKit -framework OpenGL"
 +
  if ! disabled network; then
      check_func getaddrinfo $network_extralibs
      check_func inet_aton $network_extralibs
      check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE
      check_type poll.h "struct pollfd"
      check_type netinet/sctp.h "struct sctp_event_subscribe"
 +    check_struct "sys/socket.h" "struct msghdr" msg_flags
      check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
      check_type netinet/in.h "struct sockaddr_in6"
      check_type "sys/types.h sys/socket.h" "struct sockaddr_storage"
  check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomic_cas_ptr(ptr, oldval, newval)"
  check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
  check_builtin MemoryBarrier windows.h "MemoryBarrier()"
 +check_builtin sarestart signal.h "SA_RESTART"
 +check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" -lpthread
  check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)"
 +check_builtin gmtime_r time.h "time_t *time; struct tm *tm; gmtime_r(time, tm)"
 +check_builtin localtime_r time.h "time_t *time; struct tm *tm; localtime_r(time, tm)"
 +check_builtin x264_csp_bgr "stdint.h x264.h" "X264_CSP_BGR"
  
  case "$custom_allocator" in
      jemalloc)
@@@ -5591,65 -4501,53 +5592,65 @@@ check_func_headers malloc.h _aligned_ma
  check_func  ${malloc_prefix}memalign            && enable memalign
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
  
 -check_cpp_condition unistd.h "defined(_POSIX_MONOTONIC_CLOCK)" &&
 -    check_func_headers time.h clock_gettime ||
 -        { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; }
 -
 +check_func  access
 +check_func_headers stdlib.h arc4random
 +check_func_headers time.h clock_gettime ||
 +    { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; }
  check_func  fcntl
  check_func  fork
  check_func  gethrtime
  check_func  getopt
  check_func  getrusage
  check_func  gettimeofday
 -check_func  gmtime_r
  check_func  isatty
 -check_func  localtime_r
  check_func  mach_absolute_time
  check_func  mkstemp
  check_func  mmap
  check_func  mprotect
  # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
 -check_func_headers time.h nanosleep || check_lib nanosleep time.h nanosleep -lrt
 +check_func_headers time.h nanosleep ||
 +    { check_lib nanosleep time.h nanosleep -lrt && LIBRT="-lrt"; }
  check_func  sched_getaffinity
  check_func  setrlimit
 +check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE
  check_func  strerror_r
  check_func  sysconf
  check_func  sysctl
  check_func  usleep
  
 +check_func_headers conio.h kbhit
  check_func_headers io.h setmode
 +check_func_headers lzo/lzo1x.h lzo1x_999_compress
  check_func_headers stdlib.h getenv
 +check_func_headers sys/stat.h lstat
  
  check_func_headers windows.h GetProcessAffinityMask
  check_func_headers windows.h GetProcessTimes
  check_func_headers windows.h GetSystemTimeAsFileTime
  check_func_headers windows.h LoadLibrary
  check_func_headers windows.h MapViewOfFile
 +check_func_headers windows.h PeekNamedPipe
  check_func_headers windows.h SetConsoleTextAttribute
 +check_func_headers windows.h SetConsoleCtrlHandler
  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 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
@@@ -5657,100 -4555,65 +5658,100 @@@ check_header sys/resource.
  check_header sys/select.h
  check_header sys/time.h
  check_header sys/un.h
 +check_header termios.h
  check_header unistd.h
  check_header valgrind/valgrind.h
  check_header VideoDecodeAcceleration/VDADecoder.h
 +check_header VideoToolbox/VideoToolbox.h
 +check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox
 +enabled videotoolbox && check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferColorPrimaries_ITU_R_2020 -framework CoreVideo
  check_header windows.h
  check_header X11/extensions/XvMClib.h
 +check_header asm/types.h
  
  # it seems there are versions of clang in some distros that try to use the
  # gcc headers, which explodes for stdatomic
  # so we also check that atomics actually work here
 -check_builtin stdatomic_h stdatomic.h "atomic_int foo; atomic_store(&foo, 0)"
 +check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)"
  
  check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
  check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom       -ladvapi32
  check_lib psapi    "windows.h psapi.h"    GetProcessMemoryInfo -lpsapi
  
 +check_lib coreservices "CoreServices/CoreServices.h" UTGetOSTypeFromString "-framework CoreServices"
 +
  check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
  
  check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
 +check_type "windows.h dxva.h" "DXVA_PicParams_VP9" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
  check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
 +check_type "windows.h d3d11.h" "ID3D11VideoContext"
  check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
  
  check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
 -check_type "va/va.h va/va_dec_vp8.h" "VAPictureParameterBufferVP8"
 +check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
  check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
  check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
  check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
  check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
 +check_type "va/va.h va/va_enc_mpeg2.h" "VAEncPictureParameterBufferMPEG2"
 +check_type "va/va.h va/va_enc_vp8.h"  "VAEncPictureParameterBufferVP8"
  
  check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
  
 +check_cpp_condition windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" && enable winrt || disable winrt
 +
  if ! disabled w32threads && ! enabled pthreads; then
 -    check_lib w32threads "windows.h process.h" _beginthreadex
 +    check_func_headers "windows.h process.h" _beginthreadex &&
 +        enable w32threads || disable w32threads
 +    if ! enabled w32threads && enabled winrt; then
 +        check_func_headers "windows.h" CreateThread &&
 +            enable w32threads || disable w32threads
 +    fi
  fi
  
  # check for some common methods of building with pthread support
  # do this before the optional library checks as some of them require pthreads
 -if ! disabled pthreads && ! enabled w32threads; then
 -    if check_lib pthreads pthread.h pthread_join -pthread; then
 +if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
 +    if check_lib pthreads pthread.h pthread_join   -pthread &&
 +       check_lib pthreads pthread.h pthread_create -pthread; then
          add_cflags -pthread
 -    elif check_lib pthreads pthread.h pthread_join -pthreads; then
 +    elif check_lib pthreads pthread.h pthread_join   -pthreads &&
 +         check_lib pthreads pthread.h pthread_create -pthreads; then
          add_cflags -pthreads
 -    elif check_lib pthreads pthread.h pthread_join -lpthreadGC2; then
 +    elif check_lib pthreads pthread.h pthread_join   -ldl -pthread &&
 +         check_lib pthreads pthread.h pthread_create -ldl -pthread; then
 +        add_cflags -ldl -pthread
 +    elif check_lib pthreads pthread.h pthread_join   -lpthreadGC2 &&
 +         check_lib pthreads pthread.h pthread_create -lpthreadGC2; then
          :
 -    elif check_lib pthreads pthread.h pthread_join -lpthread; then
 +    elif check_lib pthreads pthread.h pthread_join   -lpthread &&
 +         check_lib pthreads pthread.h pthread_create -lpthread; then
          :
 -    elif check_func pthread_join; then
 +    elif check_func pthread_join && check_func pthread_create; then
          enable pthreads
      fi
 +    check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads
 +fi
 +
 +
 +if enabled pthreads; then
 +  check_func pthread_cancel
  fi
  
  enabled pthreads &&
      check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)"
  
 -disabled  zlib || check_lib  zlib  zlib.h      zlibVersion -lz
 -disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
 +disabled  zlib || check_lib zlib   zlib.h      zlibVersion    -lz
 +disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion    -lbz2
 +disabled  lzma || check_lib lzma   lzma.h lzma_version_number -llzma
  
  check_lib libm math.h sin -lm && LIBM="-lm"
 +disabled crystalhd || check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
  
  atan2f_args=2
 +copysign_args=2
 +hypot_args=2
  ldexpf_args=2
  powf_args=2
  
@@@ -5758,153 -4621,78 +5759,153 @@@ for func in $MATH_FUNCS; d
      eval check_mathfunc $func \${${func}_args:-1} $LIBM
  done
  
 +for func in $COMPLEX_FUNCS; do
 +    eval check_complexfunc $func \${${func}_args:-1}
 +done
 +
  # these are off by default, so fail if requested and not available
 -enabled avisynth          && { check_header avisynth/avisynth_c.h || die "ERROR: avisynth/avisynth_c.h header not found"; }
 -enabled avxsynth          && require avxsynth "avxsynth/avxsynth_c.h dlfcn.h" dlopen -ldl
 -enabled cuda              && require cuda cuda.h cuInit -lcuda
 +enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; }
 +enabled avfoundation_indev && { check_lib avfoundation_indev CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics ||
 +                                check_lib avfoundation_indev ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; }
 +enabled cuda_sdk          && require cuda_sdk cuda.h cuCtxCreate -lcuda
 +enabled cuvid             && { enabled cuda ||
 +                               die "ERROR: CUVID requires CUDA"; }
 +enabled chromaprint       && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
 +enabled coreimage_filter  && { check_header_objcc QuartzCore/CoreImage.h || disable coreimage_filter; }
 +enabled coreimagesrc_filter && { check_header_objcc QuartzCore/CoreImage.h || disable coreimagesrc_filter; }
 +enabled decklink          && { { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; } &&
 +                               { check_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR: Decklink API version must be >= 10.6.1."; } }
  enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
 +enabled gmp               && require gmp gmp.h mpz_export -lgmp
  enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
 +enabled jni               && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; }
 +enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
 +enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
 +enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
 +enabled libbluray         && require_pkg_config libbluray libbluray/bluray.h bd_open
  enabled libbs2b           && require_pkg_config libbs2b bs2b.h bs2b_open
 +enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
 +                             { check_lib libcelt celt/celt.h celt_decoder_create_custom -lcelt0 ||
 +                               die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 +enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
  enabled libdc1394         && require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new
 -enabled libdcadec         && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
 -enabled libfaac           && require libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 -enabled libfdk_aac        && require_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen
 +enabled libfdk_aac        && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
 +                               { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
 +                                 warn "using libfdk without pkg-config"; } }
 +flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
 +enabled libflite          && require libflite "flite/flite.h" flite_init $flite_extralibs
 +enabled fontconfig        && enable libfontconfig
  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 +enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
 +enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
                                 done || die "ERROR: libgsm not found"; }
 -enabled libhdcd           && require_pkg_config libhdcd "hdcd/hdcd_simple.h" hdcd_new
  enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
  enabled libkvazaar        && require_pkg_config "kvazaar >= 0.8.1" kvazaar.h kvz_api_get
 -enabled libmfx            && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
 +# While it may appear that require is being used as a pkg-config
 +# fallback for libmfx, it is actually being used to detect a different
 +# installation route altogether.  If libmfx is installed via the Intel
 +# Media SDK or Intel Media Server Studio, these don't come with
 +# pkg-config support.  Instead, users should make sure that the build
 +# can find the libraries and headers through other means.
 +enabled libmfx            && { use_pkg_config libmfx "mfx/mfxvideo.h" MFXInit ||
 +                               { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } }
 +enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
  enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
 +enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
  enabled libnpp            && require libnpp npp.h nppGetLibVersion -lnppi -lnppc
  enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
  enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
 -enabled libopencv         && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
 +enabled libopencv         && { check_header opencv2/core/core_c.h &&
 +                               { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
 +                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
 +                               require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
  enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
 -enabled libopenjpeg       && { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
 -                               require_pkg_config libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; }
 -enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
 -enabled libpulse          && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
 +enabled libopenjpeg       && { { check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 +                               check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
 +                               { check_lib libopenjpeg openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 +                               { check_lib libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 +                               { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
 +                               die "ERROR: libopenjpeg not found"; }
 +enabled libopenmpt        && require_pkg_config "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create
 +enabled libopus           && {
 +    enabled libopus_decoder && {
 +        require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
 +    }
 +    enabled libopus_encoder && {
 +        require_pkg_config opus opus_multistream.h opus_multistream_surround_encoder_create
 +    }
 +}
 +enabled libpulse          && require_pkg_config libpulse pulse/pulseaudio.h pa_context_new
 +enabled librsvg           && require_pkg_config librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
  enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
 +enabled librubberband     && require_pkg_config "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new
  enabled libschroedinger   && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
 +enabled libshine          && require_pkg_config shine shine/layer3.h shine_encode_buffer
 +enabled libsmbclient      && { use_pkg_config smbclient libsmbclient.h smbc_init ||
 +                               require smbclient libsmbclient.h smbc_init -lsmbclient; }
  enabled libsnappy         && require libsnappy snappy-c.h snappy_compress -lsnappy
 +enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
 +enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
  enabled libspeex          && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
 +enabled libtesseract      && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame
 -enabled libvo_aacenc      && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc
 +enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
 +                             { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
 +                               die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
 +enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
 +enabled libvidstab        && require_pkg_config "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
  enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
  enabled libvorbis         && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
 -enabled libvpx            && require_pkg_config "vpx >= 1.3.0" vpx/vpx_codec.h vpx_codec_version && {
 +
 +enabled libvpx            && {
      enabled libvpx_vp8_decoder && {
 -        check_pkg_config vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
 -            disable libvpx_vp8_decoder;
 +        use_pkg_config "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
 +            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
 +                die "ERROR: libvpx decoder version must be >=0.9.1";
      }
      enabled libvpx_vp8_encoder && {
 -        check_pkg_config vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
 -            disable libvpx_vp8_encoder;
 +        use_pkg_config "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
 +            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx ||
 +                die "ERROR: libvpx encoder version must be >=0.9.7";
      }
      enabled libvpx_vp9_decoder && {
 -        check_pkg_config vpx "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
 -            disable libvpx_vp9_decoder;
 +        use_pkg_config "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
 +            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx
      }
      enabled libvpx_vp9_encoder && {
 -        check_pkg_config vpx "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
 -            disable libvpx_vp9_encoder;
 +        use_pkg_config "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
 +            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx
      }
      if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
          die "libvpx enabled but no supported decoders found"
      fi
  }
 +
  enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
 -enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
 -enabled libx264           && require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode &&
 +enabled libwebp           && {
 +    enabled libwebp_encoder      && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
 +    enabled libwebp_anim_encoder && { use_pkg_config "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit || disable libwebp_anim_encoder; } }
 +enabled libx264           && { use_pkg_config x264 "stdint.h x264.h" x264_encoder_encode ||
 +                               { require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 &&
 +                                 warn "using libx264 without pkg-config"; } } &&
                               { check_cpp_condition x264.h "X264_BUILD >= 118" ||
 -                               die "ERROR: libx264 version must be >= 0.118."; } &&
 +                               die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }
  enabled libx265           && require_pkg_config x265 x265.h x265_api_get &&
 -                             { check_cpp_condition x265.h "X265_BUILD >= 57" ||
 -                               die "ERROR: libx265 version must be >= 57."; }
 +                             { check_cpp_condition x265.h "X265_BUILD >= 68" ||
 +                               die "ERROR: libx265 version must be >= 68."; }
  enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
  enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 +enabled libzimg           && require_pkg_config "zimg >= 2.3.0" zimg.h zimg_get_api_version
 +enabled libzmq            && require_pkg_config libzmq zmq.h zmq_ctx_new
 +enabled libzvbi           && require libzvbi libzvbi.h vbi_decoder_new -lzvbi &&
 +                             { check_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" ||
 +                               enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; }
 +enabled mediacodec        && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
  enabled mmal              && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
                                 { ! enabled cross_compile &&
                                   add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
                                   check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
                                 die "ERROR: mmal not found" &&
                                 check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
 +enabled netcdf            && require_pkg_config netcdf netcdf.h nc_inq_libvers
 +enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do
 +                               check_lib openal 'AL/al.h' alGetError "${al_extralibs}" && break; done } ||
 +                               die "ERROR: openal not found"; } &&
 +                             { check_cpp_condition "AL/al.h" "defined(AL_VERSION_1_1)" ||
 +                               die "ERROR: openal must be installed and version must be 1.1 or compatible"; }
 +enabled opencl            && { check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
 +                               check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
 +                               die "ERROR: opencl not found"; } &&
 +                             { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               die "ERROR: opencl must be installed and version must be 1.2 or compatible"; }
 +enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL" ||
 +                               check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
 +                               check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
 +                               check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
 +                               die "ERROR: opengl not found."
 +                             }
  enabled omx_rpi           && { check_header OMX_Core.h ||
                                 { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } ||
                                 die "ERROR: OpenMAX IL headers not found"; }
  enabled omx               && { check_header OMX_Core.h || die "ERROR: OpenMAX IL headers not found"; }
 -enabled openssl           && { { check_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl ||
 -                                 check_pkg_config openssl openssl/ssl.h SSL_library_init; } && {
 -                               add_cflags $openssl_cflags && add_extralibs $openssl_extralibs; } ||
 +enabled openssl           && { use_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl ||
 +                               use_pkg_config openssl openssl/ssl.h SSL_library_init ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
                                 die "ERROR: openssl not found"; }
 +enabled qtkit_indev      && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; }
 +
 +if enabled gcrypt; then
 +    GCRYPT_CONFIG="${cross_prefix}libgcrypt-config"
 +    if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then
 +        gcrypt_cflags=$("${GCRYPT_CONFIG}" --cflags)
 +        gcrypt_extralibs=$("${GCRYPT_CONFIG}" --libs)
 +        check_func_headers gcrypt.h gcry_mpi_new $gcrypt_cflags $gcrypt_extralibs ||
 +            die "ERROR: gcrypt not found"
 +        add_cflags $gcrypt_cflags && add_extralibs $gcrypt_extralibs
 +    else
 +        require gcrypt gcrypt.h gcry_mpi_new -lgcrypt
 +    fi
 +fi
  
 -enabled gnutls            && check_lib gmp gmp.h mpz_export -lgmp
 -
 -if enabled nvenc; then
 -    check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."
 -    check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" ||
 -        die "ERROR: NVENC API version 5 or older is not supported"
 +disabled sdl && disable sdl2
 +if ! disabled sdl2; then
 +    SDL2_CONFIG="${cross_prefix}sdl2-config"
 +    if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
 +        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags &&
 +        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags &&
 +        check_func SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2
 +    else
 +      if "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
 +        sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
 +        sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
 +        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags &&
 +        check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags &&
 +        check_func SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2
 +      fi
 +    fi
 +    if test $target_os = "mingw32"; then
 +        sdl2_extralibs="$sdl2_extralibs -mconsole"
 +    fi
  fi
 +enabled sdl2 && enable sdl && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs
  
 -if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
 -    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
 -    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
 -    enable sdl
 +if enabled decklink; then
 +    case $target_os in
 +        mingw32*|mingw64*|win32|win64)
 +            decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32"
 +            decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32"
 +            ;;
 +    esac
  fi
  
 -! disabled pod2man   && check_cmd pod2man --help     && enable pod2man   || disable pod2man
 -! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html
 +disabled securetransport || { check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" &&
 +    check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security"; }
 +
 +disabled schannel || { check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 &&
 +                       check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && enable schannel && add_extralibs -lsecur32; }
 +
 +makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 +enabled makeinfo \
 +    && [ 0$(makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \
 +    && enable makeinfo_html || disable makeinfo_html
 +disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 +perl -v            > /dev/null 2>&1 && enable perl      || disable perl
 +pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 +rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
  
  check_header linux/fb.h
 +check_header linux/videodev.h
  check_header linux/videodev2.h
 -check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
 -
 -check_header AVFoundation/AVFoundation.h
 +check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_header sys/videoio.h
 +check_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_lib user32 "windows.h winuser.h" GetShellWindow -luser32
  check_lib vfw32 "windows.h vfw.h" capCreateCaptureWindow -lvfw32
  # w32api 3.12 had it defined wrong
  check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_defines
  
 +check_type "dshow.h" IBaseFilter
 +
  # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
  { check_header dev/bktr/ioctl_meteor.h &&
    check_header dev/bktr/ioctl_bt848.h; } ||
    check_header dev/video/bktr/ioctl_bt848.h; } ||
  check_header dev/ic/bt8xx.h
  
 -check_header sys/soundcard.h
 +if check_struct sys/soundcard.h audio_buf_info bytes; then
 +    enable_safe sys/soundcard.h
 +else
 +    check_cc -D__BSD_VISIBLE -D__XSI_VISIBLE <<EOF && add_cppflags -D__BSD_VISIBLE -D__XSI_VISIBLE && enable_safe sys/soundcard.h
 +    #include <sys/soundcard.h>
 +    audio_buf_info abc;
 +EOF
 +fi
  check_header soundcard.h
  
  enabled_any alsa_indev alsa_outdev &&
@@@ -6050,49 -4769,29 +6051,49 @@@ if enabled libcdio; the
      die "ERROR: No usable libcdio/cdparanoia found"
  fi
  
 -if enabled libxcb; then
 -    check_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles || {
 -        enabled libxcb && die "ERROR: libxcb not found";
 +if ! disabled libxcb; then
 +    check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || {
 +        enabled libxcb && die "ERROR: libxcb >= 1.4 not found";
      } && enable libxcb
  
 -    disabled libxcb_shm ||
 +if enabled libxcb; then
 +    disabled libxcb_shm || {
          check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || {
              enabled libxcb_shm && die "ERROR: libxcb_shm not found";
 -        } && check_header sys/shm.h && enable libxcb_shm
 +        } && check_header sys/shm.h && enable libxcb_shm; }
  
 -    disabled libxcb_xfixes ||
 +    disabled libxcb_xfixes || {
          check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || {
              enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
 -        } && enable libxcb_xfixes
 +        } && enable libxcb_xfixes; }
 +
 +    disabled libxcb_shape || {
 +        check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || {
 +            enabled libxcb_shape && die "ERROR: libxcb_shape not found";
 +        } && enable libxcb_shape; }
  
 -    add_cflags "$xcb_shape_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
 -    add_extralibs "$xcb_shape_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs"
 +    add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags
 +    add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs
  fi
 +fi
 +
 +check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
 +
 +enabled dxva2api_h &&
 +    check_cc <<EOF && enable dxva2api_cobj
 +#define _WIN32_WINNT 0x0600
 +#define COBJMACROS
 +#include <windows.h>
 +#include <d3d9.h>
 +#include <dxva2api.h>
 +int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; }
 +EOF
  
  enabled dxva2 &&
      check_lib dxva2_lib windows.h CoTaskMemFree -lole32
  
 -enabled vaapi && require vaapi va/va.h vaInitialize -lva
 +enabled vaapi &&
 +    check_lib vaapi va/va.h vaInitialize -lva
  
  enabled vaapi &&
      check_code cc "va/va.h" "vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)" ||
@@@ -6111,29 -4810,6 +6112,29 @@@ enabled vdpau &
  enabled vdpau &&
      check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11
  
 +if enabled x86; then
 +    case $target_os in
 +        mingw32*|mingw64*|win32|win64|linux|cygwin*)
 +            ;;
 +        *)
 +            disable cuda cuvid nvenc
 +            ;;
 +    esac
 +else
 +    disable cuda cuvid nvenc
 +fi
 +
 +enabled nvenc &&
 +    check_cc -I$source_path <<EOF || disable nvenc
 +#include "compat/nvenc/nvEncodeAPI.h"
 +NV_ENCODE_API_FUNCTION_LIST flist;
 +void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; }
 +int main(void) { return 0; }
 +EOF
 +
 +# Funny iconv installations are not unusual, so check it after all flags have been set
 +disabled iconv || check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
 +
  enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
  
  # add some useful compiler flags if supported
@@@ -6146,9 -4822,7 +6147,9 @@@ check_cflags -Wwrite-string
  check_cflags -Wtype-limits
  check_cflags -Wundef
  check_cflags -Wmissing-prototypes
 +check_cflags -Wno-pointer-to-int-cast
  check_cflags -Wstrict-prototypes
 +check_cflags -Wempty-body
  
  if enabled extra_warnings; then
      check_cflags -Wcast-qual
@@@ -6165,7 -4839,6 +6166,7 @@@ check_disable_warning -Wno-parenthese
  check_disable_warning -Wno-switch
  check_disable_warning -Wno-format-zero-length
  check_disable_warning -Wno-pointer-sign
 +check_disable_warning -Wno-unused-const-variable
  
  check_disable_warning_headers(){
      warning_flag=-W${1#-Wno-}
  check_disable_warning_headers -Wno-deprecated-declarations
  check_disable_warning_headers -Wno-unused-variable
  
 -check_objcflags -fobjc-arc && enable objc_arc
 -
  # add some linker flags
  check_ldflags -Wl,--warn-common
 -check_ldflags -Wl,-rpath-link=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 +check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
  enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
 +enabled rpath && add_ldlibflags -Wl,-rpath,$libdir
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
  # add some strip flags
  # -wN '..@*' is more selective than -x, but not available everywhere.
 -check_stripflags -wN \'..@*\' || check_stripflags -x || strip='true'
 +check_stripflags -wN \'..@*\' || check_stripflags -x
  
  enabled neon_clobber_test &&
      check_ldflags -Wl,--wrap,avcodec_open2              \
                    -Wl,--wrap,avcodec_receive_packet     \
                    -Wl,--wrap,avcodec_send_frame         \
                    -Wl,--wrap,avcodec_receive_frame      \
 +                  -Wl,--wrap,swr_convert                \
                    -Wl,--wrap,avresample_convert ||
      disable neon_clobber_test
  
@@@ -6214,12 -4887,11 +6215,12 @@@ enabled xmm_clobber_test &
                    -Wl,--wrap,avcodec_receive_packet     \
                    -Wl,--wrap,avcodec_send_frame         \
                    -Wl,--wrap,avcodec_receive_frame      \
 +                  -Wl,--wrap,swr_convert                \
                    -Wl,--wrap,avresample_convert         \
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
 -check_ld <<EOF && enable proper_dce
 +check_ld "cc" <<EOF && enable proper_dce
  extern const int array[512];
  static inline int func(void) { return array[0]; }
  int main(void) { return 0; }
@@@ -6250,16 -4922,6 +6251,16 @@@ if [ -z "$optflags" ]; the
      fi
  fi
  
 +if [ -z "$nvccflags" ]; then
 +    nvccflags=$nvccflags_default
 +fi
 +
 +if enabled x86_64 || enabled ppc64 || enabled aarch64; then
 +    nvccflags="$nvccflags -m64"
 +else
 +    nvccflags="$nvccflags -m32"
 +fi
 +
  check_optflags(){
      check_cflags "$@"
      enabled lto && check_ldflags "$@"
@@@ -6273,37 -4935,24 +6274,37 @@@ if enabled lto; the
      test "$cc_type" != "$ld_type" && die "LTO requires same compiler and linker"
      check_cflags  -flto
      check_ldflags -flto $cpuflags
 +    disable inline_asm_direct_symbol_refs
  fi
  
 +enabled ftrapv && check_cflags -ftrapv
 +
 +check_cc -mno-red-zone <<EOF && noredzone_flags="-mno-red-zone"
 +int x;
 +EOF
 +
 +
  if enabled icc; then
      # Just warnings, no remarks
      check_cflags -w1
      # -wd: Disable following warnings
      # 144, 167, 556: -Wno-pointer-sign
 +    # 188: enumerated type mixed with another type
      # 1292: attribute "foo" ignored
      # 1419: external declaration in primary source file
      # 10006: ignoring unknown option -fno-signed-zeros
      # 10148: ignoring unknown option -Wno-parentheses
      # 10156: ignoring option '-W'; no argument required
 -    check_cflags -wd144,167,556,1292,1419,10006,10148,10156
 +    # 13200: No EMMS instruction before call to function
 +    # 13203: No EMMS instruction before return from function
 +    check_cflags -wd144,167,188,556,1292,1419,10006,10148,10156,13200,13203
      # 11030: Warning unknown option --as-needed
      # 10156: ignoring option '-export'; no argument required
      check_ldflags -wd10156,11030
      # icc 11.0 and 11.1 work with ebp_available, but don't pass the test
      enable ebp_available
 +    # The test above does not test linking
 +    enabled lto && disable symver_asm_label
      if enabled x86_32; then
          icc_version=$($cc -dumpversion)
          test ${icc_version%%.*} -ge 11 &&
@@@ -6318,19 -4967,18 +6319,19 @@@ elif enabled ccc; the
      add_cflags -msg_disable unsupieee
  elif enabled gcc; then
      check_optflags -fno-tree-vectorize
 +    check_cflags -Werror=format-security
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
      check_cflags -Werror=return-type
 -    check_cflags -Werror=declaration-after-statement
      check_cflags -Werror=vla
 -    check_cflags -Werror=format-security
 +    check_cflags -Wformat
      check_cflags -fdiagnostics-color=auto
      enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
  elif enabled llvm_gcc; then
      check_cflags -mllvm -stack-alignment=16
  elif enabled clang; then
      check_cflags -mllvm -stack-alignment=16
 +    check_cflags -mstack-alignment=16
      check_cflags -Qunused-arguments
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
@@@ -6363,11 -5011,9 +6364,11 @@@ elif enabled_any msvc icl; the
          # (correctly) on icl 13.x.
          check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" &&
              add_cflags -Qansi-alias
 -        # icl will pass the inline asm tests but inline asm is currently
 -        # not supported (build will fail)
 -        disable inline_asm
 +        # Some inline asm is not compilable in debug
 +        if enabled debug; then
 +            disable ebp_available
 +            disable ebx_available
 +        fi
      fi
      # msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2.
      check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
  __declspec($_restrict) void* foo(int);
  EOF
      fi
 +    # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
 +    # Issue has been fixed in MSVC v19.00.24218.
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||
 +        check_cflags -d2SSAOptimizer-
 +    # enable utf-8 source processing on VS2015 U2 and newer
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190023918" &&
 +        add_cflags -utf-8
  fi
  
  for pfx in "" host_; do
@@@ -6419,8 -5058,6 +6420,8 @@@ case $target_os i
      ;;
  esac
  
 +enable frame_thread_encoder
 +
  enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
  
  check_deps $CONFIG_LIST       \
             $HAVE_LIST         \
             $ALL_COMPONENTS    \
  
 +enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
 +
 +
 +if test $target_os = "haiku"; then
 +    disable memalign
 +    disable posix_memalign
 +fi
 +
 +# add_dep lib dep
 +# -> enable ${lib}_deps_${dep}
 +# -> add $dep to ${lib}_deps only once
 +add_dep() {
 +    lib=$1
 +    dep=$2
 +    enabled "${lib}_deps_${dep}" && return 0
 +    enable  "${lib}_deps_${dep}"
 +    prepend "${lib}_deps" $dep
 +}
 +
 +# merge deps lib components
 +# merge all ${component}_deps into ${lib}_deps and ${lib}_deps_*
 +merge_deps() {
 +    lib=$1
 +    shift
 +    for comp in $*; do
 +        enabled $comp || continue
 +        eval "dep=\"\$${comp}_deps\""
 +        for d in $dep; do
 +            add_dep $lib $d
 +        done
 +    done
 +}
 +
 +merge_deps libavfilter $FILTER_LIST
 +
  map 'enabled $v && intrinsics=${v#intrinsics_}' $INTRINSICS_LIST
  
  for thread in $THREADS_LIST; do
@@@ -6489,49 -5091,15 +6490,49 @@@ if disabled stdatomic_h; the
      fi
  fi
  
 +# Check if requested libraries were found.
 +for lib in $AUTODETECT_LIBS; do
 +    requested $lib && ! enabled $lib && die "ERROR: $lib requested but not found";
 +done
 +
  enabled zlib && add_cppflags -DZLIB_CONST
  
  # conditional library dependencies, in linking order
 +enabled afftfilt_filter     && prepend avfilter_deps "avcodec"
 +enabled afir_filter         && prepend avfilter_deps "avcodec"
 +enabled amovie_filter       && prepend avfilter_deps "avformat avcodec"
 +enabled aresample_filter    && prepend avfilter_deps "swresample"
 +enabled atempo_filter       && prepend avfilter_deps "avcodec"
 +enabled cover_rect_filter   && prepend avfilter_deps "avformat avcodec"
 +enabled ebur128_filter && enabled swresample && prepend avfilter_deps "swresample"
 +enabled elbg_filter         && prepend avfilter_deps "avcodec"
 +enabled fftfilt_filter      && prepend avfilter_deps "avcodec"
 +enabled find_rect_filter    && prepend avfilter_deps "avformat avcodec"
 +enabled firequalizer_filter && prepend avfilter_deps "avcodec"
 +enabled mcdeint_filter      && prepend avfilter_deps "avcodec"
  enabled movie_filter    && prepend avfilter_deps "avformat avcodec"
 -enabled_any asyncts_filter resample_filter &&
 -                           prepend avfilter_deps "avresample"
 +enabled pan_filter          && prepend avfilter_deps "swresample"
 +enabled pp_filter           && prepend avfilter_deps "postproc"
 +enabled removelogo_filter   && prepend avfilter_deps "avformat avcodec swscale"
 +enabled resample_filter && prepend avfilter_deps "avresample"
 +enabled sab_filter          && prepend avfilter_deps "swscale"
  enabled scale_filter    && prepend avfilter_deps "swscale"
 -
 -enabled opus_decoder    && prepend avcodec_deps "avresample"
 +enabled scale2ref_filter    && prepend avfilter_deps "swscale"
 +enabled sofalizer_filter    && prepend avfilter_deps "avcodec"
 +enabled showcqt_filter      && prepend avfilter_deps "avformat avcodec swscale"
 +enabled showfreqs_filter    && prepend avfilter_deps "avcodec"
 +enabled showspectrum_filter && prepend avfilter_deps "avcodec"
 +enabled signature_filter    && prepend avfilter_deps "avcodec avformat"
 +enabled smartblur_filter    && prepend avfilter_deps "swscale"
 +enabled spectrumsynth_filter && prepend avfilter_deps "avcodec"
 +enabled spp_filter          && prepend avfilter_deps "avcodec"
 +enabled subtitles_filter    && prepend avfilter_deps "avformat avcodec"
 +enabled uspp_filter         && prepend avfilter_deps "avcodec"
 +enabled zoompan_filter      && prepend avfilter_deps "swscale"
 +
 +enabled lavfi_indev         && prepend avdevice_deps "avfilter"
 +
 +enabled opus_decoder    && prepend avcodec_deps "swresample"
  
  expand_deps(){
      lib_deps=${1}_deps
      unique $lib_deps
  }
  
 +#we have to remove gpl from the deps here as some code assumes all lib deps are libs
 +postproc_deps="$(filter_out 'gpl' $postproc_deps)"
 +
  map 'expand_deps $v' $LIBRARY_LIST
  
 +license="LGPL version 2.1 or later"
 +if enabled nonfree; then
 +    license="nonfree and unredistributable"
 +elif enabled gplv3; then
 +    license="GPL version 3 or later"
 +elif enabled lgplv3; then
 +    license="LGPL version 3 or later"
 +elif enabled gpl; then
 +    license="GPL version 2 or later"
 +fi
 +
  if test "$quiet" != "yes"; then
  
  echo "install prefix            $prefix"
@@@ -6567,12 -5121,6 +6568,12 @@@ if test "$host_cc" != "$cc"; the
      echo "host C library            $host_libc_type"
  fi
  echo "ARCH                      $arch ($cpu)"
 +if test "$build_suffix" != ""; then
 +    echo "build suffix              $build_suffix"
 +fi
 +if test "$progs_suffix" != ""; then
 +    echo "progs suffix              $progs_suffix"
 +fi
  if test "$extra_version" != ""; then
      echo "version string suffix     $extra_version"
  fi
@@@ -6586,7 -5134,6 +6587,7 @@@ if enabled x86; the
      echo "3DNow! extended enabled   ${amd3dnowext-no}"
      echo "SSE enabled               ${sse-no}"
      echo "SSSE3 enabled             ${ssse3-no}"
 +    echo "AESNI enabled             ${aesni-no}"
      echo "AVX enabled               ${avx-no}"
      echo "XOP enabled               ${xop-no}"
      echo "FMA3 enabled              ${fma3-no}"
@@@ -6606,14 -5153,6 +6607,14 @@@ if enabled arm; the
      echo "ARMv6T2 enabled           ${armv6t2-no}"
      echo "VFP enabled               ${vfp-no}"
      echo "NEON enabled              ${neon-no}"
 +    echo "THUMB enabled             ${thumb-no}"
 +fi
 +if enabled mips; then
 +    echo "MIPS FPU enabled          ${mipsfpu-no}"
 +    echo "MIPS DSP R1 enabled       ${mipsdsp-no}"
 +    echo "MIPS DSP R2 enabled       ${mipsdspr2-no}"
 +    echo "MIPS MSA enabled          ${msa-no}"
 +    echo "LOONGSON MMI enabled      ${mmi-no}"
  fi
  if enabled ppc; then
      echo "AltiVec enabled           ${altivec-no}"
      echo "dcbzl available           ${dcbzl-no}"
  fi
  echo "debug symbols             ${debug-no}"
 +echo "strip symbols             ${stripping-no}"
  echo "optimize for size         ${small-no}"
  echo "optimizations             ${optimizations-no}"
  echo "static                    ${static-no}"
  echo "shared                    ${shared-no}"
 +echo "postprocessing support    ${postproc-no}"
  echo "network support           ${network-no}"
  echo "threading support         ${thread_type-no}"
  echo "safe bitstream reader     ${safe_bitstream_reader-no}"
 +echo "texi2html enabled         ${texi2html-no}"
 +echo "perl enabled              ${perl-no}"
 +echo "pod2man enabled           ${pod2man-no}"
 +echo "makeinfo enabled          ${makeinfo-no}"
 +echo "makeinfo supports HTML    ${makeinfo_html-no}"
  test -n "$random_seed" &&
      echo "random seed               ${random_seed}"
  echo
  
  echo "External libraries:"
 -print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
 +print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
  echo
 +
  echo "External libraries providing hardware acceleration:"
 -print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns
 +print_enabled '' $HWACCEL_LIBRARY_LIST | print_in_columns
  echo
  
  echo "Libraries:"
 -print_enabled '' $LIBRARY_LIST | print_3_columns
 +print_enabled '' $LIBRARY_LIST | print_in_columns
  echo
  
  echo "Programs:"
 -print_enabled '' $PROGRAM_LIST | print_3_columns
 +print_enabled '' $PROGRAM_LIST | print_in_columns
  echo
  
  for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
      echo "Enabled ${type}s:"
      eval list=\$$(toupper $type)_LIST
 -    print_enabled '_*' $list | print_3_columns
 +    print_enabled '_*' $list | print_in_columns
      echo
  done
  
  if test -n "$ignore_tests"; then
      ignore_tests=$(echo $ignore_tests | tr ',' ' ')
      echo "Ignored FATE tests:"
 -    echo $ignore_tests | print_3_columns
 +    echo $ignore_tests | print_in_columns
      echo
  fi
  
 -license="LGPL version 2.1 or later"
 -if enabled nonfree; then
 -    license="nonfree and unredistributable"
 -elif enabled gplv3; then
 -    license="GPL version 3 or later"
 -elif enabled lgplv3; then
 -    license="LGPL version 3 or later"
 -elif enabled gpl; then
 -    license="GPL version 2 or later"
 -fi
 -
  echo "License: $license"
  
  echo "Creating configuration files ..."
@@@ -6679,15 -5221,11 +6680,15 @@@ fi # test "$quiet" != "yes
  
  test -e Makefile || echo "include $source_path/Makefile" > Makefile
  
 -config_files="$TMPH avbuild/config.mak"
 +enabled stripping || strip="echo skipping strip"
 +
 +config_files="$TMPH ffbuild/config.mak doc/config.texi"
  
 -cat > avbuild/config.mak <<EOF
 +cat > ffbuild/config.mak <<EOF
  # Automatically generated by configure - do not modify!
 -LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION
 +ifndef FFMPEG_CONFIG_MAK
 +FFMPEG_CONFIG_MAK=1
 +FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
  prefix=$prefix
  LIBDIR=\$(DESTDIR)$libdir
  SHLIBDIR=\$(DESTDIR)$shlibdir
@@@ -6696,18 -5234,12 +6697,18 @@@ BINDIR=\$(DESTDIR)$bindi
  DATADIR=\$(DESTDIR)$datadir
  DOCDIR=\$(DESTDIR)$docdir
  MANDIR=\$(DESTDIR)$mandir
 +PKGCONFIGDIR=\$(DESTDIR)$pkgconfigdir
 +INSTALL_NAME_DIR=$install_name_dir
  SRC_PATH=$source_path
 +SRC_LINK=$source_link
 +ifndef MAIN_MAKEFILE
 +SRC_PATH:=\$(SRC_PATH:.%=..%)
 +endif
  CC_IDENT=$cc_ident
  ARCH=$arch
  INTRINSICS=$intrinsics
  CC=$cc
 -OBJCC=$cc
 +CXX=$cxx
  AS=$as
  OBJCC=$objcc
  LD=$ld
@@@ -6722,15 -5254,11 +6723,15 @@@ ARFLAGS=$arflag
  AR_O=$ar_o
  RANLIB=$ranlib
  STRIP=$strip
 +NVCC=$nvcc
 +CP=cp -p
  LN_S=$ln_s
  CPPFLAGS=$CPPFLAGS
  CFLAGS=$CFLAGS
 +CXXFLAGS=$CXXFLAGS
  OBJCFLAGS=$OBJCFLAGS
  ASFLAGS=$ASFLAGS
 +NVCCFLAGS=$nvccflags
  AS_C=$AS_C
  AS_O=$AS_O
  OBJCC_C=$OBJCC_C
@@@ -6739,26 -5267,15 +6740,26 @@@ OBJCC_O=$OBJCC_
  CC_C=$CC_C
  CC_E=$CC_E
  CC_O=$CC_O
 +CXX_C=$CXX_C
 +CXX_O=$CXX_O
 +NVCC_C=$NVCC_C
 +NVCC_O=$NVCC_O
  LD_O=$LD_O
  LD_LIB=$LD_LIB
  LD_PATH=$LD_PATH
  DLLTOOL=$dlltool
 +WINDRES=$windres
 +DEPWINDRES=$dep_cc
 +DOXYGEN=$doxygen
  LDFLAGS=$LDFLAGS
  LDEXEFLAGS=$LDEXEFLAGS
 +LDLIBFLAGS=$LDLIBFLAGS
  SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
 -STRIPFLAGS=$STRIPFLAGS
 +ASMSTRIPFLAGS=$ASMSTRIPFLAGS
  YASMFLAGS=$YASMFLAGS
 +BUILDSUF=$build_suffix
 +PROGSSUF=$progs_suffix
 +FULLNAME=$FULLNAME
  LIBPREF=$LIBPREF
  LIBSUF=$LIBSUF
  LIBNAME=$LIBNAME
@@@ -6767,7 -5284,6 +6768,7 @@@ SLIBSUF=$SLIBSU
  EXESUF=$EXESUF
  EXTRA_VERSION=$extra_version
  CCDEP=$CCDEP
 +CXXDEP=$CXXDEP
  CCDEP_FLAGS=$CCDEP_FLAGS
  ASDEP=$ASDEP
  ASDEP_FLAGS=$ASDEP_FLAGS
@@@ -6791,13 -5307,13 +6792,13 @@@ HOSTLD_O=$HOSTLD_
  TARGET_EXEC=$target_exec $target_exec_args
  TARGET_PATH=$target_path
  TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 -CFLAGS-avplay=$sdl_cflags
 +CFLAGS-ffplay=${sdl2_cflags}
  CFLAGS_HEADERS=$CFLAGS_HEADERS
  ZLIB=$($ldflags_filter -lz)
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs
  COMPAT_OBJS=$compat_objs
 -INSTALL=install
 +INSTALL=$install
  LIBTARGET=${LIBTARGET}
  SLIBNAME=${SLIBNAME}
  SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}
@@@ -6809,43 -5325,33 +6810,43 @@@ SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS
  SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
  SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
  VERSION_SCRIPT_POSTPROCESS_CMD=${VERSION_SCRIPT_POSTPROCESS_CMD}
 -SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
 +SAMPLES:=${samples:-\$(FATE_SAMPLES)}
 +NOREDZONE_FLAGS=$noredzone_flags
 +LIBFUZZER_PATH=$libfuzzer_path
  IGNORE_TESTS=$ignore_tests
  EOF
  
 -map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> avbuild/config.mak' $LIBRARY_LIST
 +map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST
  
  print_program_extralibs(){
      eval "program_extralibs=\$${1}_extralibs"
 -    eval echo "EXTRALIBS-${1}=${program_extralibs}" >> avbuild/config.mak
 +    eval echo "EXTRALIBS-${1}=${program_extralibs}" >> ffbuild/config.mak
  }
  
  map 'print_program_extralibs $v' $PROGRAM_LIST
  
  cat > $TMPH <<EOF
  /* Automatically generated by configure - do not modify! */
 -#ifndef LIBAV_CONFIG_H
 -#define LIBAV_CONFIG_H
 -#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
 -#define LIBAV_LICENSE "$(c_escape $license)"
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 +#define FFMPEG_LICENSE "$(c_escape $license)"
 +#define CONFIG_THIS_YEAR 2017
 +#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
  #define AVCONV_DATADIR "$(eval c_escape $datadir)"
  #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
 -#define restrict $_restrict
 +#define av_restrict $_restrict
  #define EXTERN_PREFIX "${extern_prefix}"
  #define EXTERN_ASM ${extern_prefix}
 +#define BUILDSUF "$build_suffix"
  #define SLIBSUF "$SLIBSUF"
 +#define HAVE_MMX2 HAVE_MMXEXT
 +#define SWS_MAX_FILTER_SIZE $sws_max_filter_size
  EOF
  
 +test -n "$assert_level" &&
 +    echo "#define ASSERT_LEVEL $assert_level" >>$TMPH
 +
  test -n "$malloc_prefix" &&
      echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH
  
  
  enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
  
 +
 +mkdir -p doc
 +mkdir -p tests
 +mkdir -p tests/api
 +echo "@c auto-generated by configure - do not modify! " > doc/config.texi
 +
  print_config ARCH_   "$config_files" $ARCH_LIST
  print_config HAVE_   "$config_files" $HAVE_LIST
  print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \
  
 -echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
 +echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 +echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
  
  # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
  cp_if_changed $TMPH config.h
 -touch avbuild/.config
 +touch ffbuild/.config
  
  enabled yasm && cp_if_changed $TMPASM config.asm
  
@@@ -6906,37 -5405,29 +6907,37 @@@ print_enabled_components()
  print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST
  print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST
  
 -test -n "$WARNINGS" && printf "\n$WARNINGS"
 +if test -n "$WARNINGS"; then
 +    printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color"
 +    enabled fatal_warnings && exit 1
 +fi
  
  # Settings for pkg-config files
  
 -cat > avbuild/config.sh <<EOF
 +cat > ffbuild/config.sh <<EOF
  # Automatically generated by configure - do not modify!
  shared=$shared
 +build_suffix=$build_suffix
  prefix=$prefix
  libdir=$libdir
  incdir=$incdir
 +rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}")
  source_path=${source_path}
  LIBPREF=${LIBPREF}
  LIBSUF=${LIBSUF}
 +
  extralibs_avutil="$LIBRT $LIBM"
  extralibs_avcodec="$extralibs"
  extralibs_avformat="$extralibs"
  extralibs_avdevice="$extralibs"
  extralibs_avfilter="$extralibs"
  extralibs_avresample="$LIBM"
 +extralibs_postproc=""
  extralibs_swscale="$LIBM"
 +extralibs_swresample="$LIBM $LIBSOXR"
  EOF
  
  for lib in $LIBRARY_LIST; do
      lib_deps="$(eval echo \$${lib}_deps)"
 -    echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
 +    echo ${lib}_deps=\"$lib_deps\" >> ffbuild/config.sh
  done