Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 19:37:34 +0000 (20:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 19:40:59 +0000 (20:40 +0100)
* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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."
@@@ -78,17 -78,14 +78,17 @@@ Help options
  Standard options:
    --logfile=FILE           log tests and output to FILE [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]
    --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]
    --incdir=DIR             install includes in DIR [PREFIX/include]
    --mandir=DIR             install man page in DIR [PREFIX/share/man]
 +  --enable-rpath           use rpath to allow installing libraries in paths
 +                           not part of the dynamic linker search path
  
  Licensing options:
    --enable-gpl             allow use of GPL code, the resulting libs
@@@ -101,43 -98,31 +101,43 @@@ 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
 +  --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no]
 +  --enable-incompatible-fork-abi  enable incompatible Libav fork ABI (deprecated) [no]
  
  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       disable avserver build
 +  --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-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-postproc       disable libpostproc build
 +  --disable-avfilter       disable libavfilter build
 +  --enable-avresample      enable libavresample build [no]
    --disable-pthreads       disable pthreads [auto]
    --disable-w32threads     disable Win32 threads [auto]
 +  --disable-os2threads     disable OS/2 threads [auto]
    --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-fft            disable FFT code
  
  Hardware accelerators:
 -  --enable-dxva2           enable DXVA2 code
 -  --enable-vaapi           enable VAAPI code
 +  --disable-dxva2          disable DXVA2 code [autodetect]
 +  --disable-vaapi          disable VAAPI code [autodetect]
    --enable-vda             enable VDA code
 -  --enable-vdpau           enable VDPAU code
 +  --disable-vdpau          disable VDPAU code [autodetect]
  
  Individual component options:
    --disable-everything     disable all components listed below
  
  External library support:
    --enable-avisynth        enable reading of AviSynth script files [no]
 -  --enable-bzlib           enable bzlib [autodetect]
 +  --disable-bzlib          disable bzlib [autodetect]
 +  --enable-fontconfig      enable fontconfig
    --enable-frei0r          enable frei0r video filtering
    --enable-gnutls          enable gnutls [no]
 +  --disable-iconv          disable iconv [autodetect]
 +  --enable-ladspa          enable LADSPA audio filtering
 +  --enable-libaacplus      enable AAC+ encoding via libaacplus [no]
 +  --enable-libass          enable libass subtitles rendering [no]
 +  --enable-libbluray       enable BluRay reading using libbluray [no]
 +  --enable-libcaca         enable textual display using libcaca
 +  --enable-libcelt         enable CELT decoding via libcelt [no]
    --enable-libcdio         enable audio CD grabbing with libcdio
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 [no]
    --enable-libfaac         enable AAC encoding via libfaac [no]
    --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
 +  --enable-libflite        enable flite (voice synthesis) support via libflite [no]
    --enable-libfreetype     enable libfreetype [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-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-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
    --enable-libopus         enable Opus decoding via libopus [no]
    --enable-libpulse        enable Pulseaudio input via libpulse [no]
 +  --enable-libquvi         enable quvi input via libquvi [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-libsoxr         enable Include libsoxr resampling [no]
    --enable-libspeex        enable Speex de/encoding via libspeex [no]
 +  --enable-libssh          enable SFTP protocol via libssh [no]
 +  --enable-libstagefright-h264  enable H.264 decoding via libstagefright [no]
    --enable-libtheora       enable Theora encoding via libtheora [no]
 +  --enable-libtwolame      enable MP2 encoding via libtwolame [no]
 +  --enable-libutvideo      enable Ut Video encoding and decoding via libutvideo [no]
 +  --enable-libv4l2         enable libv4l2/v4l-utils [no]
 +  --enable-libvidstab      enable video stabilization using vid.stab [no]
    --enable-libvo-aacenc    enable AAC encoding via libvo-aacenc [no]
    --enable-libvo-amrwbenc  enable AMR-WB encoding via libvo-amrwbenc [no]
 -  --enable-libvorbis       enable Vorbis encoding via libvorbis [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-libx264         enable H.264 encoding via x264 [no]
    --enable-libxavs         enable AVS encoding via xavs [no]
    --enable-libxvid         enable Xvid encoding via xvidcore,
                             native MPEG-4/Xvid encoder exists [no]
 +  --enable-libzmq          enable message passing via libzmq [no]
 +  --enable-libzvbi         enable teletext support via libzvbi [no]
 +  --enable-openal          enable OpenAL 1.1 capture support [no]
 +  --enable-opencl          enable OpenCL code
    --enable-openssl         enable openssl [no]
    --enable-x11grab         enable X11 grabbing [no]
 -  --enable-zlib            enable zlib [autodetect]
 +  --disable-zlib           disable zlib [autodetect]
  
  Advanced options (experts only):
    --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]
    --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]
 +  --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]
    --dep-cc=DEPCC           use dependency generator DEPCC [$cc_default]
 -  --ld=LD                  use linker LD
 +  --ld=LD                  use linker LD [$ld_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-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
    --extra-libs=ELIBS       add ELIBS [$ELIBS]
    --extra-version=STRING   version string suffix []
    --optflags=OPTFLAGS      override optimization-related compiler flags
    --build-suffix=SUFFIX    library name suffix []
    --malloc-prefix=PREFIX   prefix malloc and related names with PREFIX
 +  --progs-suffix=SUFFIX    program name suffix []
    --arch=ARCH              select architecture [$arch]
    --cpu=CPU                select the minimum required CPU (affects
                             instruction selection, may crash on older CPUs)
@@@ -326,27 -278,14 +326,27 @@@ Optimization options (experts only)
    --disable-vis            disable VIS optimizations
    --disable-inline-asm     disable use of inline assembler
    --disable-yasm           disable use of yasm assembler
 +  --disable-mips32r2       disable MIPS32R2 optimizations
 +  --disable-mipsdspr1      disable MIPS DSP ASE R1 optimizations
 +  --disable-mipsdspr2      disable MIPS DSP ASE R2 optimizations
 +  --disable-mipsfpu        disable floating point MIPS optimizations
 +  --disable-fast-unaligned consider unaligned accesses slow
  
 -Developer options (useful when working on Libav itself):
 +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-xmm-clobber-test check XMM registers for clobbering (Win64-only;
                             should be used only for debugging purposes)
    --enable-random          randomly enable/disable components
@@@ -391,7 -330,7 +391,7 @@@ die()
  
  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
@@@ -427,7 -366,7 +427,7 @@@ sh_quote()
  }
  
  cleanws(){
 -    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//'
 +    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//;s/\r//g'
  }
  
  filter(){
@@@ -679,12 -618,6 +679,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;
                  }
              }
          }"
@@@ -718,10 -651,6 +718,10 @@@ add_cflags()
      append CFLAGS $($cflags_filter "$@")
  }
  
 +add_cxxflags(){
 +    append CXXFLAGS $($cflags_filter "$@")
 +}
 +
  add_asflags(){
      append ASFLAGS $($asflags_filter "$@")
  }
@@@ -731,7 -660,7 +731,7 @@@ add_ldflags()
  }
  
  add_stripflags(){
 -    append STRIPFLAGS "$@"
 +    append ASMSTRIPFLAGS "$@"
  }
  
  add_extralibs(){
@@@ -776,13 -705,6 +776,13 @@@ 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_cpp(){
      log check_cpp "$@"
      cat > $TMPC
@@@ -823,7 -745,7 +823,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
@@@ -876,17 -796,9 +876,17 @@@ check_cflags()
      test_cflags "$@" && add_cflags "$@"
  }
  
 +check_cxxflags(){
 +    log check_cxxflags "$@"
 +    set -- $($cflags_filter "$@")
 +    check_cxx "$@" <<EOF && append CXXFLAGS "$@"
 +int x;
 +EOF
 +}
 +
  test_ldflags(){
      log test_ldflags "$@"
 -    check_ld "$@" <<EOF
 +    check_ld "cc" "$@" <<EOF
  int main(void){ return 0; }
  EOF
  }
@@@ -902,7 -814,7 +902,7 @@@ test_stripflags()
      check_cc <<EOF
  int main(void) { return 0; }
  EOF
 -    check_cmd $strip $STRIPFLAGS "$@" $TMPO
 +    check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
  }
  
  check_stripflags(){
@@@ -926,7 -838,7 +926,7 @@@ 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
@@@ -939,10 -851,10 +939,10 @@@ check_mathfunc()
      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
  }
  
@@@ -959,26 -871,7 +959,26 @@@ check_func_headers()
              echo "long check_$func(void) { return (long) $func; }"
          done
          echo "int main(void) { return 0; }"
 -    } | check_ld "$@" && enable $funcs && enable_safe $headers
 +    } | 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(){
@@@ -1010,14 -903,6 +1010,14 @@@ check_lib2()
      check_func_headers "$headers" "$funcs" "$@" && 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="$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(){
@@@ -1093,7 -978,7 +1093,7 @@@ check_builtin()
      builtin=$3
      shift 3
      disable "$name"
 -    check_code ld "$headers" "$builtin" "$@" && enable "$name"
 +    check_code ld "$headers" "$builtin" "cc" "$@" && enable "$name"
  }
  
  require(){
@@@ -1112,14 -997,6 +1112,14 @@@ require2()
      check_lib2 "$headers" $func "$@" || die "ERROR: $name not found"
  }
  
 +require_cpp(){
 +    name="$1"
 +    headers="$2"
 +    classes="$3"
 +    shift 3
 +    check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
 +}
 +
  require_pkg_config(){
      pkg="$1"
      check_pkg_config "$@" || die "ERROR: $pkg not found"
@@@ -1183,63 -1060,33 +1183,63 @@@ COMPONENT_LIST=
  "
  
  EXAMPLE_LIST="
 -    output_example
 +    decoding_encoding_example
 +    demuxing_decoding_example
 +    filtering_audio_example
 +    filtering_video_example
 +    metadata_example
 +    muxing_example
 +    resampling_audio_example
 +    scaling_video_example
      transcode_aac_example
  "
  
  EXTERNAL_LIBRARY_LIST="
      avisynth
      bzlib
 +    crystalhd
 +    fontconfig
      frei0r
      gnutls
 +    iconv
 +    ladspa
 +    libaacplus
 +    libass
 +    libbluray
 +    libcaca
      libcdio
 +    libcelt
      libdc1394
      libfaac
      libfdk_aac
 +    libflite
      libfreetype
 +    libgme
      libgsm
 +    libiec61883
      libilbc
 +    libmodplug
      libmp3lame
 +    libnut
      libopencore_amrnb
      libopencore_amrwb
      libopencv
      libopenjpeg
      libopus
      libpulse
 +    libquvi
      librtmp
      libschroedinger
 +    libshine
 +    libsoxr
      libspeex
 +    libssh
 +    libstagefright_h264
      libtheora
 +    libtwolame
 +    libutvideo
 +    libv4l2
 +    libvidstab
      libvo_aacenc
      libvo_amrwbenc
      libvorbis
      libx264
      libxavs
      libxvid
 +    libzmq
 +    libzvbi
 +    openal
 +    opencl
      openssl
      x11grab
      zlib
  "
  
 +DOCUMENT_LIST="
 +    doc
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
  HWACCEL_LIST="
      dxva2
      vaapi
      vda
      vdpau
  "
 +
  LIBRARY_LIST="
      avcodec
      avdevice
      avformat
      avresample
      avutil
 +    postproc
 +    swresample
      swscale
  "
  
  PROGRAM_LIST="
 -    avconv
 -    avplay
 -    avprobe
 -    avserver
 +    ffplay
 +    ffprobe
 +    ffserver
 +    ffmpeg
  "
  
  CONFIG_LIST="
      $COMPONENT_LIST
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
      $HWACCEL_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
      dct
 -    doc
 +    dwt
      error_resilience
 +    fast_unaligned
      fft
 +    ftrapv
      gpl
      gray
      hardcoded_tables
 +    incompatible_libav_abi
 +    incompatible_fork_abi
      lsp
      lzo
      mdct
      memalign_hack
 +    memory_poisoning
      network
      nonfree
 -    pod2man
      pic
      rdft
      runtime_cpudetect
      sram
      static
      swscale_alpha
 -    texi2html
      thumb
      version3
      xmm_clobber_test
  THREADS_LIST='
      pthreads
      w32threads
 +    os2threads
  '
  
  ATOMICS_LIST='
@@@ -1402,10 -1229,6 +1402,10 @@@ ARCH_EXT_LIST=
      altivec
      ppc4xx
      vis
 +    mipsfpu
 +    mips32r2
 +    mipsdspr1
 +    mipsdspr2
  "
  
  HAVE_LIST_CMDLINE='
  HAVE_LIST_PUB='
      bigendian
      fast_unaligned
 +    incompatible_libav_abi
 +    incompatible_fork_abi
  '
  
  MATH_FUNCS="
      atanf
      atan2f
 +    cbrt
      cbrtf
      cosf
      exp2
@@@ -1458,7 -1278,6 +1458,7 @@@ HAVE_LIST=
      $THREADS_LIST
      $ATOMICS_LIST
      $MATH_FUNCS
 +    access
      aligned_malloc
      aligned_stack
      alsa_asoundlib_h
      arpa_inet_h
      asm_mod_q
      asm_mod_y
 +    asm_types_h
      atomic_cas_ptr
      atomics_native
      attribute_may_alias
      attribute_packed
      cdio_paranoia_h
      cdio_paranoia_paranoia_h
 +    CL_cl_h
 +    clock_gettime
      closesocket
      CommandLineToArgvW
      cpunop
      getrusage
      getservbyport
      gettimeofday
 +    glob
      gnu_as
      gsm_h
      ibm_asm
      inline_asm_labels
      isatty
      jack_port_get_latency_range
 +    kbhit
      ldbrx
      libdc1394_1
      libdc1394_2
      local_aligned_8
      localtime_r
      loongson
 +    lzo1x_999_compress
      machine_ioctl_bt848_h
      machine_ioctl_meteor_h
      machine_rw_barrier
 +    makeinfo
      malloc_h
      MapViewOfFile
      memalign
      mprotect
      msvcrt
      nanosleep
 +    openjpeg_1_5_openjpeg_h
 +    PeekNamedPipe
 +    perl
 +    pod2man
      poll_h
      posix_memalign
      pragma_deprecated
 +    pthread_cancel
      rdtsc
 +    rsync_contimeout
 +    sarestart
      sched_getaffinity
      sdl
      SetConsoleTextAttribute
      socklen_t
      soundcard_h
      strerror_r
 -    strptime
 -    strtok_r
      struct_addrinfo
      struct_group_source_req
      struct_ip_mreq_source
      struct_ipv6_mreq
      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
      symver_asm_label
      symver_gnu_asm
      sys_time_h
      sys_un_h
      sys_videoio_h
 +    termios_h
 +    texi2html
      threads
      unistd_h
      usleep
@@@ -1606,8 -1409,6 +1606,8 @@@ CONFIG_EXTRA=
      ac3dsp
      audio_frame_queue
      dsputil
 +    exif
 +    frame_thread_encoder
      gcrypt
      golomb
      gplv3
@@@ -1647,8 -1448,6 +1647,8 @@@ CMDLINE_SELECT=
      logging
      lto
      optimizations
 +    rpath
 +    stripping
  "
  
  PATHS_LIST='
@@@ -1667,12 -1466,10 +1667,12 @@@ CMDLINE_SET=
      ar
      arch
      as
 +    assert_level
      build_suffix
      cc
      cpu
      cross_prefix
 +    cxx
      dep_cc
      extra_version
      host_cc
      host_ldflags
      host_libs
      host_os
 +    install
      ld
      logfile
      malloc_prefix
      nm
      optflags
      pkg_config
 +    progs_suffix
      random_seed
      samples
 +    strip
      sysinclude
      sysroot
      target_exec
      target_os
      target_path
      target_samples
 +    tempprefix
      toolchain
 +    valgrind
 +    yasmexe
  "
  
  CMDLINE_APPEND="
      extra_cflags
 +    extra_cxxflags
      host_cppflags
  "
  
@@@ -1723,11 -1513,6 +1723,11 @@@ vfpv3_deps="vfp
  
  map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
  
 +mipsfpu_deps="mips"
 +mips32r2_deps="mips"
 +mipsdspr1_deps="mips"
 +mipsdspr2_deps="mips"
 +
  altivec_deps="ppc"
  ppc4xx_deps="ppc"
  
@@@ -1777,13 -1562,12 +1777,13 @@@ log2_deps="!msvcrt
  # subsystems
  dct_select="rdft"
  error_resilience_select="dsputil"
 +frame_thread_encoder_deps="encoders threads"
  lpc_select="dsputil"
  mdct_select="fft"
  rdft_select="fft"
  mpegaudio_select="mpegaudiodsp"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="dsputil hpeldsp videodsp"
 +mpegvideo_select="dsputil h264chroma hpeldsp videodsp"
  mpegvideoenc_select="mpegvideo"
  
  # decoders / encoders
@@@ -1798,8 -1582,7 +1798,8 @@@ alac_encoder_select="lpc
  als_decoder_select="dsputil"
  amrnb_decoder_select="lsp"
  amrwb_decoder_select="lsp"
 -amv_decoder_select="dsputil hpeldsp"
 +amv_decoder_select="dsputil hpeldsp exif"
 +amv_encoder_select="aandcttables"
  ape_decoder_select="dsputil"
  asv1_decoder_select="dsputil"
  asv1_encoder_select="dsputil"
@@@ -1807,7 -1590,6 +1807,7 @@@ asv2_decoder_select="dsputil
  asv2_encoder_select="dsputil"
  atrac1_decoder_select="mdct sinewin"
  atrac3_decoder_select="mdct"
 +avrn_decoder_select="exif"
  bink_decoder_select="dsputil hpeldsp"
  binkaudio_dct_decoder_select="mdct rdft dct sinewin"
  binkaudio_rdft_decoder_select="mdct rdft sinewin"
@@@ -1818,34 -1600,31 +1818,34 @@@ cook_decoder_select="dsputil mdct sinew
  cscd_decoder_select="lzo"
  cscd_decoder_suggest="zlib"
  dca_decoder_select="mdct"
 +dirac_decoder_select="dsputil dwt golomb videodsp"
  dnxhd_decoder_select="dsputil"
  dnxhd_encoder_select="aandcttables dsputil mpegvideoenc"
  dvvideo_decoder_select="dsputil"
  dvvideo_encoder_select="dsputil"
 -dxa_decoder_deps="zlib"
 +dxa_decoder_select="zlib"
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables dsputil mpegvideo"
 -eatgq_decoder_select="aandcttables dsputil"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables error_resilience mpegvideo"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="dsputil golomb rangecoder"
  ffv1_encoder_select="dsputil rangecoder"
  ffvhuff_decoder_select="dsputil"
  ffvhuff_encoder_select="dsputil huffman"
  flac_decoder_select="golomb"
  flac_encoder_select="dsputil golomb lpc"
 -flashsv_decoder_deps="zlib"
 -flashsv_encoder_deps="zlib"
 -flashsv2_decoder_deps="zlib"
 +flashsv_decoder_select="zlib"
 +flashsv_encoder_select="zlib"
 +flashsv2_encoder_select="zlib"
 +flashsv2_decoder_select="zlib"
  flv_decoder_select="h263_decoder"
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="dsputil"
  fraps_decoder_select="dsputil huffman"
 -g2m_decoder_deps="zlib"
 -g2m_decoder_select="dsputil"
 +g2m_decoder_select="dsputil zlib"
 +g729_decoder_select="dsputil"
  h261_decoder_select="error_resilience mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
  h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo"
@@@ -1861,7 -1640,7 +1861,7 @@@ iac_decoder_select="dsputil fft mdct si
  imc_decoder_select="dsputil fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
  interplay_video_decoder_select="hpeldsp"
 -jpegls_decoder_select="dsputil golomb hpeldsp"
 +jpegls_decoder_select="dsputil golomb hpeldsp exif"
  jpegls_encoder_select="golomb"
  jv_decoder_select="dsputil"
  lagarith_decoder_select="dsputil"
@@@ -1870,8 -1649,8 +1870,8 @@@ loco_decoder_select="golomb
  mdec_decoder_select="dsputil error_resilience mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="dsputil hpeldsp"
 -mjpeg_decoder_select="dsputil hpeldsp"
 -mjpegb_decoder_select="dsputil hpeldsp"
 +mjpeg_decoder_select="dsputil hpeldsp exif"
 +mjpegb_decoder_select="dsputil hpeldsp exif"
  mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
  mlp_decoder_select="dsputil mlp_parser"
  motionpixels_decoder_select="dsputil"
@@@ -1901,19 -1680,20 +1901,19 @@@ msmpeg4v2_encoder_select="h263_encoder
  msmpeg4v3_decoder_select="h263_decoder"
  msmpeg4v3_encoder_select="h263_encoder"
  mss2_decoder_select="error_resilience vc1_decoder"
 -mxpeg_decoder_select="dsputil hpeldsp"
 +mxpeg_decoder_select="dsputil hpeldsp exif"
  nellymoser_decoder_select="mdct sinewin"
  nellymoser_encoder_select="audio_frame_queue mdct sinewin"
  nuv_decoder_select="dsputil lzo"
 -png_decoder_deps="zlib"
 -png_decoder_select="dsputil"
 -png_encoder_deps="zlib"
 -png_encoder_select="dsputil"
 +png_decoder_select="zlib"
 +png_encoder_select="dsputil zlib"
  prores_decoder_select="dsputil"
  prores_encoder_select="dsputil"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
  ra_144_encoder_select="audio_frame_queue lpc"
  ralf_decoder_select="golomb"
 +rtjpeg_decoder_select="dsputil"
  rv10_decoder_select="error_resilience h263_decoder h263dsp"
  rv10_encoder_select="h263_encoder"
  rv20_decoder_select="error_resilience h263_decoder h263dsp"
@@@ -1922,12 -1702,7 +1922,12 @@@ rv30_decoder_select="error_resilience g
  rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
  shorten_decoder_select="golomb"
  sipr_decoder_select="lsp"
 -sp5x_decoder_select="dsputil hpeldsp"
 +snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder"
 +snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb"
 +sonic_encoder_select="golomb"
 +sonic_ls_encoder_select="golomb"
 +sp5x_decoder_select="dsputil hpeldsp exif"
  svq1_decoder_select="hpeldsp"
  svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
  svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp"
@@@ -1936,11 -1711,11 +1936,11 @@@ tak_decoder_select="dsputil
  theora_decoder_select="vp3_decoder"
  tiff_decoder_suggest="zlib"
  tiff_encoder_suggest="zlib"
 -thp_decoder_select="dsputil hpeldsp"
 -truehd_decoder_select="mlp_decoder"
 +thp_decoder_select="dsputil hpeldsp exif"
 +truehd_decoder_select="mlp_parser"
  truemotion2_decoder_select="dsputil"
  truespeech_decoder_select="dsputil"
 -tscc_decoder_deps="zlib"
 +tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
  utvideo_decoder_select="dsputil"
  utvideo_encoder_select="dsputil huffman"
@@@ -1969,14 -1744,13 +1969,14 @@@ wmv2_decoder_select="h263_decoder video
  wmv2_encoder_select="h263_encoder"
  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"
 +zerocodec_decoder_select="zlib"
 +zlib_decoder_select="zlib"
 +zlib_encoder_select="zlib"
 +zmbv_decoder_select="zlib"
 +zmbv_encoder_select="zlib"
  
  # hardware accelerators
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
  dxva2_deps="dxva2api_h"
  vaapi_deps="va_va_h"
  vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
@@@ -1987,78 -1761,54 +1987,78 @@@ h263_vaapi_hwaccel_deps="vaapi
  h263_vaapi_hwaccel_select="h263_decoder"
  h263_vdpau_hwaccel_deps="vdpau"
  h263_vdpau_hwaccel_select="h263_decoder"
 +h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
  h264_dxva2_hwaccel_deps="dxva2"
  h264_dxva2_hwaccel_select="h264_decoder"
  h264_vaapi_hwaccel_deps="vaapi"
  h264_vaapi_hwaccel_select="h264_decoder"
 +h264_vda_decoder_deps="vda"
 +h264_vda_decoder_select="h264_decoder"
  h264_vda_hwaccel_deps="vda"
  h264_vda_hwaccel_select="h264_decoder"
 +h264_vdpau_decoder_deps="vdpau"
 +h264_vdpau_decoder_select="h264_decoder"
  h264_vdpau_hwaccel_deps="vdpau"
  h264_vdpau_hwaccel_select="h264_decoder"
 +mpeg_vdpau_decoder_deps="vdpau"
 +mpeg_vdpau_decoder_select="mpeg2video_decoder"
 +mpeg1_vdpau_decoder_deps="vdpau"
 +mpeg1_vdpau_decoder_select="mpeg1video_decoder"
  mpeg1_vdpau_hwaccel_deps="vdpau"
  mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
 +mpeg2_crystalhd_decoder_select="crystalhd"
  mpeg2_dxva2_hwaccel_deps="dxva2"
  mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
  mpeg2_vaapi_hwaccel_deps="vaapi"
  mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
  mpeg2_vdpau_hwaccel_deps="vdpau"
  mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
 +mpeg4_crystalhd_decoder_select="crystalhd"
  mpeg4_vaapi_hwaccel_deps="vaapi"
  mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
 +mpeg4_vdpau_decoder_deps="vdpau"
 +mpeg4_vdpau_decoder_select="mpeg4_decoder"
  mpeg4_vdpau_hwaccel_deps="vdpau"
  mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
 +msmpeg4_crystalhd_decoder_select="crystalhd"
 +vc1_crystalhd_decoder_select="crystalhd"
  vc1_dxva2_hwaccel_deps="dxva2"
  vc1_dxva2_hwaccel_select="vc1_decoder"
  vc1_vaapi_hwaccel_deps="vaapi"
  vc1_vaapi_hwaccel_select="vc1_decoder"
 +vc1_vdpau_decoder_deps="vdpau"
 +vc1_vdpau_decoder_select="vc1_decoder"
  vc1_vdpau_hwaccel_deps="vdpau"
  vc1_vdpau_hwaccel_select="vc1_decoder"
 +wmv3_crystalhd_decoder_select="crystalhd"
  wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
  wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
 +wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
  
  # parsers
  h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
 +hevc_parser_select="hevc_decoder"
  mpeg4video_parser_select="error_resilience mpegvideo"
  mpegvideo_parser_select="error_resilience mpegvideo"
  vc1_parser_select="mpegvideo"
  
  # external libraries
 +libaacplus_encoder_deps="libaacplus"
 +libcelt_decoder_deps="libcelt"
  libfaac_encoder_deps="libfaac"
  libfaac_encoder_select="audio_frame_queue"
  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"
  libgsm_ms_encoder_deps="libgsm"
  libilbc_decoder_deps="libilbc"
  libilbc_encoder_deps="libilbc"
 +libmodplug_demuxer_deps="libmodplug"
  libmp3lame_encoder_deps="libmp3lame"
  libmp3lame_encoder_select="audio_frame_queue"
  libopencore_amrnb_decoder_deps="libopencore_amrnb"
@@@ -2070,21 -1820,15 +2070,21 @@@ libopenjpeg_encoder_deps="libopenjpeg
  libopus_decoder_deps="libopus"
  libopus_encoder_deps="libopus"
  libopus_encoder_select="audio_frame_queue"
 +libquvi_demuxer_deps="libquvi"
  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"
 +libstagefright_h264_decoder_deps="libstagefright_h264"
  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"
@@@ -2093,12 -1837,8 +2093,12 @@@ libvpx_vp9_decoder_deps="libvpx
  libvpx_vp9_encoder_deps="libvpx"
  libwavpack_encoder_deps="libwavpack"
  libx264_encoder_deps="libx264"
 +libx264rgb_encoder_deps="libx264"
  libxavs_encoder_deps="libxavs"
  libxvid_encoder_deps="libxvid"
 +libutvideo_decoder_deps="libutvideo"
 +libutvideo_encoder_deps="libutvideo"
 +libzvbi_teletext_decoder_deps="libzvbi"
  
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"
@@@ -2111,8 -1851,6 +2111,8 @@@ avisynth_demuxer_deps="avisynth
  avisynth_demuxer_select="riffdec"
  caf_demuxer_select="riffdec"
  dirac_demuxer_select="dirac_parser"
 +dts_demuxer_select="dca_parser"
 +dtshd_demuxer_select="dca_parser"
  dxa_demuxer_select="riffdec"
  eac3_demuxer_select="ac3_parser"
  f4v_muxer_select="mov_muxer"
@@@ -2121,8 -1859,6 +2121,8 @@@ hds_muxer_select="flv_muxer
  hls_muxer_select="mpegts_muxer"
  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="riffdec"
  matroska_demuxer_suggest="bzlib lzo zlib"
@@@ -2152,9 -1888,7 +2152,9 @@@ spdif_muxer_select="aac_parser
  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="riffenc"
@@@ -2166,44 -1900,28 +2166,44 @@@ xwma_demuxer_select="riffdec
  alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
  alsa_outdev_deps="alsa_asoundlib_h"
  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"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
  dv1394_indev_deps="dv1394"
  dv1394_indev_select="dv_demuxer"
  fbdev_indev_deps="linux_fb_h"
 -jack_indev_deps="jack_jack_h pthreads"
 +fbdev_outdev_deps="linux_fb_h"
 +iec61883_indev_deps="libiec61883"
 +jack_indev_deps="jack_jack_h sem_timedwait"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +libv4l2_indev_deps="libv4l2"
 +openal_indev_deps="openal"
  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"
 +sdl_outdev_deps="sdl"
  sndio_indev_deps="sndio_h"
  sndio_outdev_deps="sndio_h"
 +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="capCreateCaptureWindow vfwcap_defines"
  vfwcap_indev_extralibs="-lavicap32"
 -x11grab_indev_deps="x11grab XShmCreateImage"
 +xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute"
 +xv_outdev_extralibs="-lXv -lX11 -lXext"
 +x11grab_indev_deps="x11grab"
  
  # protocols
 +bluray_protocol_deps="libbluray"
  ffrtmpcrypt_protocol_deps="!librtmp_protocol"
  ffrtmpcrypt_protocol_deps_any="gcrypt nettle 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"
  httpproxy_protocol_select="tcp_protocol"
  http_protocol_select="tcp_protocol"
@@@ -2213,7 -1931,6 +2213,7 @@@ librtmpe_protocol_deps="librtmp
  librtmps_protocol_deps="librtmp"
  librtmpt_protocol_deps="librtmp"
  librtmpte_protocol_deps="librtmp"
 +libssh_protocol_deps="libssh"
  mmsh_protocol_select="http_protocol"
  mmst_protocol_select="network"
  rtmp_protocol_deps="!librtmp_protocol"
@@@ -2236,80 -1953,25 +2236,80 @@@ unix_protocol_deps="sys_un_h
  unix_protocol_select="network"
  
  # filters
 +aconvert_filter_deps="swresample"
 +amovie_filter_deps="avcodec avformat"
 +aresample_filter_deps="swresample"
 +ass_filter_deps="libass"
 +asyncts_filter_deps="avresample"
 +atempo_filter_deps="avcodec"
 +atempo_filter_select="rdft"
 +azmq_filter_deps="libzmq"
  blackframe_filter_deps="gpl"
  boxblur_filter_deps="gpl"
 +colormatrix_filter_deps="gpl"
  cropdetect_filter_deps="gpl"
 +dctdnoiz_filter_deps="avcodec"
 +dctdnoiz_filter_select="fft"
  delogo_filter_deps="gpl"
 +deshake_filter_deps="avcodec"
 +deshake_filter_select="dsputil"
  drawtext_filter_deps="libfreetype"
 -frei0r_filter_deps="frei0r dlopen strtok_r"
 +ebur128_filter_deps="gpl"
 +flite_filter_deps="libflite"
 +frei0r_filter_deps="frei0r dlopen"
  frei0r_filter_extralibs='$ldl'
 -frei0r_src_filter_deps="frei0r dlopen strtok_r"
 +frei0r_src_filter_deps="frei0r dlopen"
  frei0r_src_filter_extralibs='$ldl'
 +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"
 +mp_filter_deps="gpl avcodec swscale inline_asm"
 +mpdecimate_filter_deps="gpl avcodec"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
 +perspective_filter_deps="gpl"
  resample_filter_deps="avresample"
  ocv_filter_deps="libopencv"
 +owdenoise_filter_deps="gpl"
 +pan_filter_deps="swresample"
 +phase_filter_deps="gpl"
 +pp_filter_deps="gpl postproc"
 +pullup_filter_deps="gpl"
 +removelogo_filter_deps="avcodec avformat swscale"
 +sab_filter_deps="gpl swscale"
  scale_filter_deps="swscale"
 +smartblur_filter_deps="gpl swscale"
 +showspectrum_filter_deps="avcodec"
 +showspectrum_filter_select="rdft"
 +spp_filter_deps="gpl avcodec"
 +spp_filter_select="fft"
 +stereo3d_filter_deps="gpl"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +tinterlace_filter_deps="gpl"
 +vidstabdetect_filter_deps="libvidstab"
 +vidstabtransform_filter_deps="libvidstab"
  yadif_filter_deps="gpl"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
 +zmq_filter_deps="libzmq"
  
  # examples
 -output_example_deps="avcodec avformat avutil swscale"
 -transcode_aac_example_deps="avcodec avformat avresample"
 +decoding_encoding_example_deps="avcodec avutil"
 +demuxing_decoding_example_deps="avcodec avformat avutil"
 +filtering_audio_example_deps="avfilter avcodec avformat avutil"
 +filtering_video_example_deps="avfilter avcodec avformat avutil"
 +metadata_example_deps="avformat avutil"
 +muxing_example_deps="avcodec avformat avutil swscale"
 +resampling_audio_example_deps="avutil swresample"
 +scaling_video_example_deps="avutil swscale"
 +transcode_aac_example_deps="avcodec avformat swresample"
  
  # libraries
  avcodec_deps="avutil"
@@@ -2317,27 -1979,23 +2317,27 @@@ avdevice_deps="avutil avcodec avformat
  avfilter_deps="avutil"
  avformat_deps="avutil avcodec"
  avresample_deps="avutil"
 +postproc_deps="avutil gpl"
  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
                 setpts_filter trim_filter"
 -avplay_deps="avcodec avformat avresample swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat fork !shared"
 -avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 -avserver_extralibs='$ldl'
 +ffplay_deps="avcodec avformat swscale swresample sdl"
 +ffplay_select="rdft crop_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat fork sarestart"
 +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 +ffserver_extralibs='$ldl'
  
  # documentation
 -pod2man_deps="doc"
 -texi2html_deps="doc"
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="texi2html"
 +txtpages_deps="makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters
  
@@@ -2346,8 -2004,8 +2346,8 @@@ logfile="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'
@@@ -2356,17 -2014,15 +2356,17 @@@ shlibdir_default="$libdir_default
  # toolchain
  ar_default="ar"
  cc_default="gcc"
 +cxx_default="g++"
  host_cc_default="gcc"
  cp_f="cp -f"
 +install="install"
  ln_s="ln -s -f"
  nm_default="nm -g"
  objformat="elf"
  pkg_config_default=pkg-config
  ranlib="ranlib"
 -strip="strip"
 -yasmexe="yasm"
 +strip_default="strip"
 +yasmexe_default="yasm"
  
  nogas=":"
  
@@@ -2379,23 -2035,18 +2379,23 @@@ target_os_default=$(tolower $(uname -s)
  host_os=$target_os_default
  
  # 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 optimizations
 +enable runtime_cpudetect
  enable safe_bitstream_reader
  enable static
  enable swscale_alpha
  
 -# By default, enable only those hwaccels that have no external dependencies.
 -enable dxva2 vdpau
 +# Enable hwaccels by default.
 +enable dxva2 vaapi vdpau
  
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
@@@ -2421,8 -2072,6 +2421,8 @@@ AS_O='-o $@
  CC_C='-c'
  CC_E='-E -o $@'
  CC_O='-o $@'
 +CXX_C='-c'
 +CXX_O='-o $@'
  LD_O='-o $@'
  LD_LIB='-l%'
  LD_PATH='-L'
@@@ -2458,7 -2107,7 +2458,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(){
@@@ -2578,9 -2227,7 +2578,9 @@@ for opt d
              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)
 +            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')
          ;;
          --help|-h) show_help
          ;;
 +        --fatal-warnings) enable fatal_warnings
 +        ;;
          *)
              optname="${opt%%=*}"
              optname="${optname#--}"
@@@ -2620,7 -2265,7 +2620,7 @@@ don
  
  disabled logging && logfile=/dev/null
  
 -echo "# $0 $LIBAV_CONFIGURATION" > $logfile
 +echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
  set >> $logfile
  
  test -n "$cross_prefix" && enable cross_compile
  
  ar_default="${cross_prefix}${ar_default}"
  cc_default="${cross_prefix}${cc_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}"
 +strip_default="${cross_prefix}${strip_default}"
  
  sysinclude_default="${sysroot}/usr/include"
  
 +test -n "$valgrind" && toolchain="valgrind-memcheck"
 +
  case "$toolchain" in
      clang-asan)
          cc_default="clang"
          add_ldflags -fsanitize=thread -pie -fPIC
      ;;
      valgrind-massif)
 -        target_exec_default="valgrind"
 -        target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
 +        target_exec_default=${valgrind:-"valgrind"}
 +        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_default="valgrind"
 -        target_exec_args="--track-origins=yes --leak-check=full"
 +        target_exec_default=${valgrind:-"valgrind"}
 +        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"
      ;;
      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).
      ;;
  esac
  
 -set_default arch cc pkg_config sysinclude target_exec target_os
 +set_default arch cc cxx pkg_config strip sysinclude target_exec target_os yasmexe
  enabled cross_compile || host_cc_default=$cc
  set_default host_cc
  
@@@ -2738,11 -2380,7 +2738,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(){
@@@ -2762,7 -2400,6 +2762,7 @@@ trap 'rm -f -- $TMPFILES' EXI
  
  tmpfile TMPASM .asm
  tmpfile TMPC   .c
 +tmpfile TMPCPP .cpp
  tmpfile TMPE   $EXESUF
  tmpfile TMPH   .h
  tmpfile TMPO   .o
@@@ -2850,7 -2487,6 +2850,7 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
 +                                       -wd4554 \
                                         -wd4273 ;;
          esac
      done
@@@ -2898,8 -2534,7 +2898,8 @@@ suncc_flags()
                      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        ;;
 +                    amdfam10|barcelona)        echo -xtarget=barcelona   ;;
 +                    bdver*)                    echo -xarch=avx           ;;
                      athlon-4|athlon-[mx]p)     echo -xarch=ssea          ;;
                      k8|opteron|athlon64|athlon-fx)
                                                 echo -xarch=sse2a         ;;
@@@ -2955,9 -2590,7 +2955,9 @@@ probe_cc()
      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 | head -n1)" : '.*\((.*)\)')
          _ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver"
          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; then
          _type=msvc
          if [ $pfx = hostcc ]; then
              append _cflags -Dsnprintf=_snprintf
          fi
 +        disable stripping
      elif $_cc 2>&1 | grep -q Intel; then
          _type=icl
          _ident=$($cc 2>&1 | head -n1)
@@@ -3197,7 -2829,6 +3197,7 @@@ els
  fi
  
  add_cflags $extra_cflags
 +add_cxxflags $extra_cxxflags
  add_asflags $extra_cflags
  
  if test -n "$sysroot"; then
@@@ -3240,7 -2871,7 +3240,7 @@@ case "$arch" i
      aarch64|arm64)
          arch="aarch64"
      ;;
 -    arm*)
 +    arm*|iPad*|iPhone*)
          arch="arm"
      ;;
      mips*|IP*)
      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
@@@ -3374,28 -3005,6 +3374,28 @@@ elif enabled mips; the
  
      cpuflags="-march=$cpu"
  
 +    case $cpu in
 +        24kc)
 +            disable mipsfpu
 +            disable mipsdspr1
 +            disable mipsdspr2
 +        ;;
 +        24kf*)
 +            disable mipsdspr1
 +            disable mipsdspr2
 +        ;;
 +        24kec|34kc|1004kc)
 +            disable mipsfpu
 +            disable mipsdspr2
 +        ;;
 +        24kef*|34kf*|1004kf*)
 +            disable mipsdspr2
 +        ;;
 +        74kc)
 +            disable mipsfpu
 +        ;;
 +    esac
 +
  elif enabled ppc; then
  
      case $(tolower $cpu) in
@@@ -3504,7 -3113,6 +3504,7 @@@ if test "$?" != 0; the
  fi
  
  add_cppflags -D_ISOC99_SOURCE
 +add_cxxflags -D__STDC_CONSTANT_MACROS
  check_cflags -std=c99
  check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
  #include <stdlib.h>
@@@ -3550,11 -3158,6 +3550,11 @@@ case "$arch" i
              spic=$shared
          fi
      ;;
 +    ppc)
 +        check_cc <<EOF && subarch="ppc64"
 +        int test[(int)sizeof(char*) - 7];
 +EOF
 +    ;;
  esac
  
  enable $subarch
@@@ -3591,7 -3194,6 +3591,7 @@@ case $target_os i
          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)
          gas="gas-preprocessor.pl $cc"
          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)'
          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)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
          SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(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)'
 +        dlltool="${cross_prefix}dlltool"
 +        if check_cmd lib.exe -list; then
 +            SLIB_EXTRA_CMD=-'sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def) > $$(@:$(SLIBSUF)=.def); lib.exe /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'
          objformat="win32"
 -        dlltool="${cross_prefix}dlltool"
          ranlib=:
          enable dos_paths
          ;;
          ranlib="echo ignoring ranlib"
          ;;
      os/2*)
 +        strip="lxlite -CS"
          ln_s="cp -f"
          objformat="aout"
          add_cppflags -D_GNU_SOURCE
              emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
          SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
          enable dos_paths
 +        enable_weak os2threads
          ;;
      gnu/kfreebsd)
          add_cppflags -D_BSD_SOURCE
          add_compat strtod.o strtod=avpriv_strtod
          network_extralibs='-lbsd'
          exeobjs=compat/plan9/main.o
 -        disable avserver
 +        disable ffserver
          cp_f='cp'
          ;;
      none)
@@@ -3802,13 -3393,6 +3802,13 @@@ elif check_header _mingw.h; the
              (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
          die "ERROR: MinGW runtime version must be >= 3.15."
      add_cppflags -U__STRICT_ANSI__
 +    if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \
 +            __MINGW64_VERSION_MAJOR < 3"; then
 +        add_compat msvcrt/snprintf.o
 +        add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +    else
 +        add_cppflags -D__USE_MINGW_ANSI_STDIO=1
 +    fi
  elif check_func_headers stdlib.h _get_doserrno; then
      libc_type=msvcrt
      add_compat strtod.o strtod=avpriv_strtod
@@@ -3849,7 -3433,7 +3849,7 @@@ esc()
      echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
  }
  
 -echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
 +echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" >config.fate
  
  check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
  
      exit 1;
  fi
  
 +# backward compatibility layer for incompatible_libav/fork_abi
 +enabled incompatible_fork_abi  && enable incompatible_libav_abi
 +enabled incompatible_libav_abi && enable incompatible_fork_abi
 +
  die_license_disabled() {
      enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
  }
  
 +die_license_disabled_gpl() {
 +    enabled $1 || { enabled $2 && die "$2 is incompatible with the gpl and --enable-$1 is not specified."; }
 +}
 +
 +die_license_disabled gpl frei0r
  die_license_disabled gpl libcdio
 +die_license_disabled gpl libutvideo
 +die_license_disabled gpl libvidstab
  die_license_disabled gpl libx264
  die_license_disabled gpl libxavs
  die_license_disabled gpl libxvid
 +die_license_disabled gpl libzvbi
  die_license_disabled gpl x11grab
  
 +die_license_disabled nonfree libaacplus
  die_license_disabled nonfree libfaac
 -die_license_disabled nonfree libfdk_aac
 -die_license_disabled nonfree openssl
 +enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
 +enabled gpl && die_license_disabled_gpl nonfree openssl
  
  die_license_disabled version3 libopencore_amrnb
  die_license_disabled version3 libopencore_amrwb
@@@ -3961,10 -3532,7 +3961,10 @@@ if enabled alpha; the
  
  elif enabled arm; then
  
 -    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
      nogas=die
  
      elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__"; 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
  elif enabled mips; then
  
      check_inline_asm loongson '"dmult.g $1, $2, $3"'
 +    enabled mips32r2  && add_cflags "-mips32r2" && add_asflags "-mips32r2" &&
 +     check_inline_asm mips32r2  '"rotr $t0, $t1, 1"'
 +    enabled mipsdspr1 && add_cflags "-mdsp" && add_asflags "-mdsp" &&
 +     check_inline_asm mipsdspr1 '"addu.qb $t0, $t1, $t2"'
 +    enabled mipsdspr2 && add_cflags "-mdspr2" && add_asflags "-mdspr2" &&
 +     check_inline_asm mipsdspr2 '"absq_s.qb $t0, $t1"'
 +    enabled mipsfpu   && add_cflags "-mhard-float" && add_asflags "-mhard-float" &&
 +     check_inline_asm mipsfpu   '"madd.d $f0, $f2, $f4, $f6"'
  
  elif enabled parisc; then
  
@@@ -4028,9 -3588,7 +4028,9 @@@ elif enabled ppc; the
  
      # AltiVec flags: The FSF version of GCC differs from the Apple version
      if enabled altivec; then
 -        nogas=warn
 +        if ! enabled_any pic ppc64; then
 +            nogas=warn
 +        fi
          check_cflags -maltivec -mabi=altivec &&
          { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } ||
          check_cflags -faltivec
@@@ -4100,7 -3658,6 +4100,7 @@@ EO
  
          check_yasm "movbe ecx, [5]" && enable yasm ||
              die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
 +        check_yasm "vextractf128 xmm0, ymm0, 0"      || disable avx_external avresample
          check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
          check_yasm "CPU amdnop" && enable cpunop
      fi
  # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
  check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
  
 +check_func  access
 +check_func  clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; }
  check_func  fcntl
  check_func  fork
  check_func_headers stdlib.h getenv
@@@ -4191,21 -3746,18 +4191,21 @@@ check_func  mprotec
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
  check_func_headers malloc.h _aligned_malloc     && enable aligned_malloc
  check_func  setrlimit
 +check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE
  check_func  strerror_r
 -check_func  strptime
 -check_func  strtok_r
  check_func  sched_getaffinity
  check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)"
  check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
  check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomic_cas_ptr(ptr, oldval, newval)"
  check_builtin MemoryBarrier windows.h "MemoryBarrier()"
 +check_builtin sarestart signal.h "SA_RESTART"
  check_func  sysconf
  check_func  sysctl
  check_func  usleep
 +check_func_headers conio.h kbhit
 +check_func_headers windows.h PeekNamedPipe
  check_func_headers io.h setmode
 +check_func_headers lzo/lzo1x.h lzo1x_999_compress
  check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32
  check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32
  check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
@@@ -4216,16 -3768,12 +4216,16 @@@ check_func_headers windows.h MapViewOfF
  check_func_headers windows.h SetConsoleTextAttribute
  check_func_headers windows.h Sleep
  check_func_headers windows.h VirtualAlloc
 +check_func_headers glob.h glob
 +check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
  
 +check_header cl/cl.h
  check_header direct.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 malloc.h
  check_header poll.h
  check_header sys/mman.h
@@@ -4234,14 -3782,12 +4234,14 @@@ 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 vdpau/vdpau.h
  check_header vdpau/vdpau_x11.h
  check_header VideoDecodeAcceleration/VDADecoder.h
  check_header windows.h
  check_header X11/extensions/XvMClib.h
 +check_header asm/types.h
  
  disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
  disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
  
  # 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 ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
      enable pthreads
-     if check_func pthread_create; then
+     if check_func pthread_join; then
          :
-     elif check_func pthread_create -pthread; then
+     elif check_func pthread_join -pthread; then
          add_cflags -pthread
          add_extralibs -pthread
-     elif check_func pthread_create -pthreads; then
+     elif check_func pthread_join -pthreads; then
          add_cflags -pthreads
          add_extralibs -pthreads
-     elif check_func pthread_create -lpthreadGC2; then
+     elif check_func pthread_join -lpthreadGC2; then
          add_extralibs -lpthreadGC2
-     elif ! check_lib pthread.h pthread_create -lpthread; then
+     elif ! check_lib pthread.h pthread_join -lpthread; then
          disable pthreads
      fi
  fi
@@@ -4277,16 -3823,12 +4277,16 @@@ for thread in $THREADS_LIST; d
      fi
  done
  
 +if enabled pthreads; then
 +  check_func pthread_cancel
 +fi
 +
  enabled sync_val_compare_and_swap && enable atomics_gcc
  enabled_all atomic_cas_ptr machine_rw_barrier && enable atomics_suncc
  enabled MemoryBarrier && enable atomics_win32
  
  check_lib math.h sin -lm && LIBM="-lm"
 -enabled vaapi && require vaapi va/va.h vaInitialize -lva
 +disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
  
  atan2f_args=2
  ldexpf_args=2
@@@ -4297,90 -3839,43 +4297,90 @@@ for func in $MATH_FUNCS; d
  done
  
  # these are off by default, so fail if requested and not available
 -enabled avisynth          && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
 +enabled avisynth          && { { check_lib2 "windows.h" LoadLibrary; } ||
 +                               { check_lib2 "dlfcn.h" dlopen -ldl; } ||
 +                               die "ERROR: LoadLibrary/dlopen not found for avisynth"; }
 +enabled fontconfig        && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
  enabled frei0r            && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
  enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
 +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 libaacplus        && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
 +enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
 +enabled libbluray         && require libbluray libbluray/bluray.h bd_open -lbluray
 +enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
 +                             { check_lib 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 libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
  enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
 +flite_libs="-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          && require2 libflite "flite/flite.h" flite_init $flite_libs
  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
 +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 "${gsm_hdr}" gsm_create -lgsm && break;
                                 done || die "ERROR: libgsm not found"; }
  enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
 +enabled libmodplug        && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
  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 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 libopenjpeg       && require libopenjpeg openjpeg.h opj_version -lopenjpeg
 +enabled libopencv         && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
 +enabled libopenjpeg       && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg ||
 +                               check_lib openjpeg.h opj_version -lopenjpeg ||
 +                               die "ERROR: libopenjpeg not found"; }
  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 libquvi           && require_pkg_config libquvi quvi/quvi.h quvi_init
  enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
  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 libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
 +enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
  enabled libspeex          && require libspeex speex/speex.h speex_decoder_init -lspeex
 +enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
 +    media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
 +    media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 +enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
 +                             { check_lib twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
 +                               die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
 +enabled libutvideo        && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++
 +enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
 +enabled libvidstab        && require_pkg_config vidstab vid.stab/libvidstab.h vsMotionDetectInit
  enabled libvo_aacenc      && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc
  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            && {
      enabled libvpx_vp8_decoder && { check_lib2 "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_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_CQ" -lvpx ||
 -                                    die "ERROR: libvpx encoder version must be >=0.9.6"; }
 +    enabled libvpx_vp8_encoder && { check_lib2 "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_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; }
      enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx" -lvpx || disable libvpx_vp9_encoder; } }
  enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
  enabled libx264           && require libx264 x264.h x264_encoder_encode -lx264 &&
                               { 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."; }
  enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
  enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 +enabled libzmq            && require_pkg_config libzmq zmq.h zmq_ctx_new
 +enabled libzvbi           && require libzvbi libzvbi.h vbi_decoder_new -lzvbi
 +enabled openal            && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do
 +                               check_lib 'AL/al.h' alGetError "${al_libs}" && 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_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
 +                               check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
 +                               die "ERROR: opencl not found"; } &&
 +                             { ! enabled_any w32threads os2threads ||
 +                               die "opencl currently needs --enable-pthreads or --disable-w32threads"; } &&
 +                             { 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 openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@@ -4400,33 -3895,18 +4400,33 @@@ if enabled libdc1394; the
      die "ERROR: No version of libdc1394 found "
  fi
  
 +SDL_CONFIG="${cross_prefix}sdl-config"
  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
 +else
 +  if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
 +    sdl_cflags=$("${SDL_CONFIG}" --cflags)
 +    sdl_libs=$("${SDL_CONFIG}" --libs)
 +    check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs &&
 +    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
 +  fi
  fi
 +enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
  
 +texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 +makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 +perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
 +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_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_header sys/videoio.h
  
@@@ -4435,8 -3915,6 +4435,8 @@@ check_func_headers "windows.h vfw.h" ca
  # 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/ic/bt8xx.h
  
  check_header sndio.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 &&
      check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
  
 -enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
 +enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack && check_func sem_timedwait &&
      check_func jack_port_get_latency_range -ljack
  
  enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
  
  if enabled libcdio; then
      check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
 -    check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
 +    check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
 +    die "ERROR: libcdio-paranoia not found"
  fi
  
  check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib
@@@ -4478,10 -3948,6 +4478,10 @@@ require Xext X11/extensions/XShm.h XShm
  require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
  { enabled xlib || die "ERROR: Xlib not found"; }
  
 +enabled vaapi &&
 +    check_lib va/va.h vaInitialize -lva ||
 +    disable vaapi
 +
  enabled vdpau &&
      check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
      disable vdpau
@@@ -4490,9 -3956,6 +4490,9 @@@ enabled vdpau && enabled xlib &
      check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
      enable vdpau_x11
  
 +# Funny iconv installations are not unusual, so check it after all flags have been set
 +disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 +
  enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
  
  # add some useful compiler flags if supported
@@@ -4501,11 -3964,11 +4501,11 @@@ check_cflags -Wal
  check_cflags -Wdisabled-optimization
  check_cflags -Wpointer-arith
  check_cflags -Wredundant-decls
 -check_cflags -Wcast-qual
  check_cflags -Wwrite-strings
  check_cflags -Wtype-limits
  check_cflags -Wundef
  check_cflags -Wmissing-prototypes
 +check_cflags -Wno-pointer-to-int-cast
  check_cflags -Wstrict-prototypes
  enabled extra_warnings && check_cflags -Winline
  
@@@ -4521,13 -3984,12 +4521,13 @@@ check_disable_warning -Wno-pointer-sig
  
  # 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_ldflags -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 xmm_clobber_test &&
      check_ldflags -Wl,--wrap,avcodec_open2              \
                    -Wl,--wrap,avcodec_decode_video2      \
                    -Wl,--wrap,avcodec_decode_subtitle2   \
                    -Wl,--wrap,avcodec_encode_audio2      \
 +                  -Wl,--wrap,avcodec_encode_video       \
                    -Wl,--wrap,avcodec_encode_video2      \
                    -Wl,--wrap,avcodec_encode_subtitle    \
                    -Wl,--wrap,sws_scale ||
@@@ -4580,25 -4041,17 +4580,25 @@@ check_optflags $optflag
  check_optflags -fno-math-errno
  check_optflags -fno-signed-zeros
  
 +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
 +    check_cflags -wd144,167,188,556,1292,1419,10006,10148,10156
      # 11030: Warning unknown option --as-needed
      # 10156: ignoring option '-export'; no argument required
      check_ldflags -wd10156,11030
@@@ -4621,6 -4074,7 +4621,6 @@@ elif enabled gcc; the
      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
      enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
  elif enabled llvm_gcc; then
@@@ -4658,7 -4112,6 +4658,7 @@@ elif enabled_any msvc icl; the
              add_cflags -Qansi-alias
          # icl will pass the inline asm tests but inline asm is currently
          # not supported (build will fail)
 +        disabled inline_asm || warn "inline asm disabled due to issues with it in ICL"
          disable inline_asm
      fi
  fi
@@@ -4672,12 -4125,9 +4672,12 @@@ case $target_os i
      ;;
  esac
  
 +enable frame_thread_encoder
  enabled_any $THREADS_LIST      && enable threads
  enabled_any $ATOMICS_LIST      && enable atomics_native
  
 +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"
 +
  enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
  
  check_deps $CONFIG_LIST       \
             $HAVE_LIST         \
             $ALL_COMPONENTS    \
  
 +
 +if test $target_os = "haiku"; then
 +    disable memalign
 +    disable posix_memalign
 +fi
 +
  ! enabled_any memalign posix_memalign aligned_malloc &&
      enabled_any $need_memalign && enable memalign_hack
  
 +# 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
 +
  echo "install prefix            $prefix"
  echo "source path               $source_path"
  echo "C compiler                $cc"
@@@ -4728,9 -4145,6 +4728,9 @@@ echo "ARCH                      $arch (
  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
@@@ -4757,13 -4171,6 +4757,13 @@@ 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 "MIPS32R2 enabled          ${mips32r2-no}"
 +    echo "MIPS DSP R1 enabled       ${mipsdspr1-no}"
 +    echo "MIPS DSP R2 enabled       ${mipsdspr2-no}"
  fi
  if enabled ppc; then
      echo "AltiVec enabled           ${altivec-no}"
@@@ -4774,23 -4181,15 +4774,23 @@@ if enabled sparc; the
      echo "VIS enabled               ${vis-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 "new filter support        ${avfilter-no}"
  echo "network support           ${network-no}"
  echo "threading support         ${thread_type-no}"
  echo "safe bitstream reader     ${safe_bitstream_reader-no}"
  echo "SDL support               ${sdl-no}"
 +echo "opencl enabled            ${opencl-no}"
 +echo "libzvbi enabled           ${libzvbi-no}"
 +echo "texi2html enabled         ${texi2html-no}"
 +echo "perl enabled              ${perl-no}"
 +echo "pod2man enabled           ${pod2man-no}"
 +echo "makeinfo enabled          ${makeinfo-no}"
  test -n "$random_seed" &&
      echo "random seed               ${random_seed}"
  echo
  
  echo "License: $license"
  
 -echo "Creating config.mak and config.h..."
 +echo "Creating config.mak, config.h, and doc/config.texi..."
  
  test -e Makefile || echo "include $source_path/Makefile" > Makefile
  
 -config_files="$TMPH config.mak"
 +enabled stripping || strip="echo skipping strip"
 +
 +config_files="$TMPH config.mak doc/config.texi"
  
  cat > 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
@@@ -4841,13 -4236,9 +4841,13 @@@ DATADIR=\$(DESTDIR)$datadi
  DOCDIR=\$(DESTDIR)$docdir
  MANDIR=\$(DESTDIR)$mandir
  SRC_PATH=$source_path
 +ifndef MAIN_MAKEFILE
 +SRC_PATH:=\$(SRC_PATH:.%=..%)
 +endif
  CC_IDENT=$cc_ident
  ARCH=$arch
  CC=$cc
 +CXX=$cxx
  AS=$as
  LD=$ld
  DEPCC=$dep_cc
@@@ -4861,29 -4252,24 +4861,29 @@@ ARFLAGS=$arflag
  AR_O=$ar_o
  RANLIB=$ranlib
  STRIP=$strip
 +CP=cp -p
  LN_S=$ln_s
  CPPFLAGS=$CPPFLAGS
  CFLAGS=$CFLAGS
 +CXXFLAGS=$CXXFLAGS
  ASFLAGS=$ASFLAGS
  AS_C=$AS_C
  AS_O=$AS_O
  CC_C=$CC_C
  CC_E=$CC_E
  CC_O=$CC_O
 +CXX_C=$CXX_C
 +CXX_O=$CXX_O
  LD_O=$LD_O
  LD_LIB=$LD_LIB
  LD_PATH=$LD_PATH
  DLLTOOL=$dlltool
  LDFLAGS=$LDFLAGS
  SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
 -STRIPFLAGS=$STRIPFLAGS
 +ASMSTRIPFLAGS=$ASMSTRIPFLAGS
  YASMFLAGS=$YASMFLAGS
  BUILDSUF=$build_suffix
 +PROGSSUF=$progs_suffix
  FULLNAME=$FULLNAME
  LIBPREF=$LIBPREF
  LIBSUF=$LIBSUF
@@@ -4893,7 -4279,6 +4893,7 @@@ SLIBSUF=$SLIBSU
  EXESUF=$EXESUF
  EXTRA_VERSION=$extra_version
  CCDEP=$CCDEP
 +CXXDEP=$CXXDEP
  CCDEP_FLAGS=$CCDEP_FLAGS
  ASDEP=$ASDEP
  ASDEP_FLAGS=$ASDEP_FLAGS
@@@ -4917,14 -4302,14 +4917,14 @@@ HOSTLD_O=$HOSTLD_
  TARGET_EXEC=$target_exec $target_exec_args
  TARGET_PATH=$target_path
  TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 -LIBS-avplay=$sdl_libs
 -CFLAGS-avplay=$sdl_cflags
 +LIBS-ffplay=$sdl_libs
 +CFLAGS-ffplay=$sdl_cflags
  ZLIB=$($ldflags_filter -lz)
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs
  COMPAT_OBJS=$compat_objs
  EXEOBJS=$exeobjs
 -INSTALL=install
 +INSTALL=$install
  LIBTARGET=${LIBTARGET}
  SLIBNAME=${SLIBNAME}
  SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}
@@@ -4935,8 -4320,7 +4935,8 @@@ SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME
  SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS}
  SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
  SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
 -SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
 +SAMPLES:=${samples:-\$(FATE_SAMPLES)}
 +NOREDZONE_FLAGS=$noredzone_flags
  EOF
  
  get_version(){
@@@ -4954,24 -4338,18 +4954,24 @@@ map 'get_version $v' $LIBRARY_LIS
  
  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 2013
 +#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 SLIBSUF "$SLIBSUF"
 +#define HAVE_MMX2 HAVE_MMXEXT
  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
 +echo "@c auto-generated by configure" > 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" >> config.mak
  
  # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
  cp_if_changed $TMPH config.h
@@@ -5013,10 -4386,7 +5013,10 @@@ echo "#endif /* AVUTIL_AVCONFIG_H */" >
  
  cp_if_changed $TMPH libavutil/avconfig.h
  
 -test -n "$WARNINGS" && printf "\n$WARNINGS"
 +if test -n "$WARNINGS"; then
 +    printf "\n$WARNINGS"
 +    enabled fatal_warnings && exit 1
 +fi
  
  # build pkg-config files
  
@@@ -5029,7 -4399,7 +5029,7 @@@ pkgconfig_generate()
      requires=$5
      enabled ${name#lib} || return 0
      mkdir -p $name
 -    cat <<EOF > $name/$name.pc
 +    cat <<EOF > $name/$name${build_suffix}.pc
  prefix=$prefix
  exec_prefix=\${prefix}
  libdir=$libdir
@@@ -5041,71 -4411,35 +5041,71 @@@ Version: $versio
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
 -Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
 +Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
 -    cat <<EOF > $name/$name-uninstalled.pc
 +
 +mkdir -p doc/examples/pc-uninstalled
 +includedir=${source_path}
 +[ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
 +    cat <<EOF > doc/examples/pc-uninstalled/$name.pc
  prefix=
  exec_prefix=
 -libdir=\${pcfiledir}
 -includedir=${source_path}
 +libdir=\${pcfiledir}/../../../$name
 +includedir=${includedir}
  
  Name: $name
  Description: $comment
  Version: $version
  Requires: $requires
  Conflicts:
 -Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
 +Libs: -L\${libdir} -Wl,-rpath,\${libdir} -l${shortname} $(enabled shared || echo $libs)
  Cflags: -I\${includedir}
  EOF
  }
  
 -lavfi_libs="libavutil = $LIBAVUTIL_VERSION"
 -enabled movie_filter    && prepend lavfi_libs "libavformat >= $LIBAVFORMAT_VERSION, libavcodec >= $LIBAVCODEC_VERSION,"
 -enabled resample_filter && prepend lavfi_libs "libavresample >= $LIBAVRESAMPLE_VERSION,"
 -enabled scale_filter    && prepend lavfi_libs "libswscale >= $LIBSWSCALE_VERSION,"
 +lavfi_libs="libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +enabled libavfilter_deps_avcodec    && prepend lavfi_libs "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
 +enabled libavfilter_deps_avformat   && prepend lavfi_libs "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
 +enabled libavfilter_deps_avresample && prepend lavfi_libs "libavresample${build_suffix} = $LIBAVRESAMPLE_VERSION,"
 +enabled libavfilter_deps_swscale    && prepend lavfi_libs "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
 +enabled libavfilter_deps_swresample && prepend lavfi_libs "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
 +enabled libavfilter_deps_postproc   && prepend lavfi_libs "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
 +lavfi_libs=${lavfi_libs%, }
 +
 +lavd_libs="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
 +enabled lavfi_indev && prepend lavd_libs "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
 +
 +pkgconfig_generate libavutil     "FFmpeg utility library"               "$LIBAVUTIL_VERSION"     "$LIBM"
 +pkgconfig_generate libavcodec    "FFmpeg codec library"                 "$LIBAVCODEC_VERSION"    "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libavformat   "FFmpeg container format library"      "$LIBAVFORMAT_VERSION"   "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
 +pkgconfig_generate libavdevice   "FFmpeg device handling library"       "$LIBAVDEVICE_VERSION"   "$extralibs" "$lavd_libs"
 +pkgconfig_generate libavfilter   "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION"   "$extralibs" "$lavfi_libs"
 +pkgconfig_generate libpostproc   "FFmpeg postprocessing library"        "$LIBPOSTPROC_VERSION"   ""           "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libavresample "Libav audio resampling library"       "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libswscale    "FFmpeg image rescaling library"       "$LIBSWSCALE_VERSION"    "$LIBM"      "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libswresample "FFmpeg audio resampling library"      "$LIBSWRESAMPLE_VERSION" "$LIBM"      "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +
 +fix_ffmpeg_remote(){
 +    git_remote_from=$1
 +    git_remote_to=$2
 +    fixme_remote=$(git --git-dir=$source_path/.git --work-tree=$source_path remote -v | grep $git_remote_from | cut -f 1 | sort | uniq)
 +    if [ "$fixme_remote" != "" ]; then
 +        echolog "
 +Outdated domain in git config, the official domain for ffmpeg git is since
 +November 2011, source.ffmpeg.org, both the old and the new point to the same
 +repository and server. To update it enter the following commands:
 +"
 +        for remote in $fixme_remote; do
 +            echolog "git remote set-url $remote $git_remote_to"
 +        done
 +    fi
 +}
  
 -pkgconfig_generate libavutil     "Libav utility library"          "$LIBAVUTIL_VERSION"     "$LIBM"
 -pkgconfig_generate libavcodec    "Libav codec library"            "$LIBAVCODEC_VERSION"    "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
 -pkgconfig_generate libavformat   "Libav container format library" "$LIBAVFORMAT_VERSION"   "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
 -pkgconfig_generate libavdevice   "Libav device handling library"  "$LIBAVDEVICE_VERSION"   "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
 -pkgconfig_generate libavfilter   "Libav video filtering library"  "$LIBAVFILTER_VERSION"   "$extralibs" "$lavfi_libs"
 -pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
 -pkgconfig_generate libswscale    "Libav image rescaling library"  "$LIBSWSCALE_VERSION"    "$LIBM"      "libavutil = $LIBAVUTIL_VERSION"
 +if test -f "$source_path/.git/config"; then
 +    remote_from=git.videolan.org
 +    remote_to=source.ffmpeg.org
 +    fix_ffmpeg_remote git@$remote_from:ffmpeg   git@$remote_to:ffmpeg
 +    fix_ffmpeg_remote git://$remote_from/ffmpeg git://$remote_to/ffmpeg
 +fi