Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:54:55 +0000 (00:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:54:55 +0000 (00:54 +0200)
* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
  Split off floating point AAN (I)DCT into separate components

Conflicts:
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/fdctdsp.c
libavcodec/idctdsp.c
libavcodec/mpegvideo_enc.c

diff --combined configure
index 7de07c302fbd49ef395bcb591d4fbab8229e8336,81e1d3fc7f595654836eb4c373f35eb6d13cd93c..e66519db35e3e6c5319eb7ba4fadca4a8add2a29
+++ 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,18 -78,15 +78,18 @@@ 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 when linking programs [USE WITH CARE]
 +  --enable-rpath           use rpath to allow installing libraries in paths
 +                           not part of the dynamic linker search path
 +                           use rpath when linking programs [USE WITH CARE]
  
  Licensing options:
    --enable-gpl             allow use of GPL code, the resulting libs
@@@ -102,56 -99,44 +102,57 @@@ 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-raise-major     increase major version numbers in sonames [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       deprecated, does nothing
 +  --disable-ffmpeg         disable ffmpeg build
 +  --disable-ffplay         disable ffplay build
 +  --disable-ffprobe        disable ffprobe build
 +  --disable-ffserver       disable ffserver build
  
 -Component options:
 +Documentation options:
    --disable-doc            do not build documentation
 +  --disable-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-mdct           disable MDCT code
    --disable-rdft           disable RDFT code
    --disable-fft            disable FFT code
+   --disable-faan           disable floating point AAN (I)DCT code
 +  --disable-pixelutils     disable pixel utils in libavutil
  
  Hardware accelerators:
 -  --enable-dxva2           enable DXVA2 code
 -  --enable-vaapi           enable VAAPI code
 -  --enable-vda             enable VDA code
 -  --enable-vdpau           enable VDPAU code
 +  --disable-dxva2          disable DXVA2 code [autodetect]
 +  --disable-vaapi          disable VAAPI code [autodetect]
 +  --disable-vda            disable VDA code [autodetect]
 +  --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-libbs2b         enable bs2b DSP library [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-libfribidi      enable libfribidi [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 de/encoding 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-libsmbclient    enable Samba protocol via libsmbclient [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-libwebp         enable WebP encoding via libwebp [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]
 +  --disable-lzma           disable lzma [autodetect]
 +  --enable-decklink        enable Blackmagick DeckLink output [no]
 +  --enable-openal          enable OpenAL 1.1 capture support [no]
 +  --enable-opencl          enable OpenCL code
 +  --enable-opengl          enable OpenGL rendering [no]
    --enable-openssl         enable openssl [no]
    --enable-x11grab         enable X11 grabbing [no]
 -  --enable-zlib            enable zlib [autodetect]
 +  --disable-xlib           disable xlib [autodetect]
 +  --disable-zlib           disable zlib [autodetect]
  
  Toolchain options:
    --arch=ARCH              select architecture [$arch]
    --cpu=CPU                select the minimum required CPU (affects
                             instruction selection, may crash on older CPUs)
    --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]
 +  --progs-suffix=SUFFIX    program name suffix []
    --enable-cross-compile   assume a cross-compiler is used
    --sysroot=PATH           root of cross-build tree
    --sysinclude=PATH        location of cross-build system headers
    --target-exec=CMD        command to run executables on target
    --target-path=DIR        path to view of build directory on target
    --target-samples=DIR     path to samples directory on target
 +  --tempprefix=PATH        force fixed dir/prefix instead of mktemp for checks
    --toolchain=NAME         set tool defaults according to NAME
 -  --nm=NM                  use nm tool
 +  --nm=NM                  use nm tool NM [$nm_default]
    --ar=AR                  use archive tool AR [$ar_default]
    --as=AS                  use assembler AS [$as_default]
 +  --windres=WINDRES        use windows resource compiler WINDRES [$windres_default]
 +  --yasmexe=EXE            use yasm-compatible assembler EXE [$yasmexe_default]
    --cc=CC                  use C compiler CC [$cc_default]
 +  --cxx=CXX                use C compiler CXX [$cxx_default]
    --dep-cc=DEPCC           use dependency generator DEPCC [$cc_default]
 -  --ld=LD                  use linker LD
 +  --ld=LD                  use linker LD [$ld_default]
    --pkg-config=PKGCONFIG   use pkg-config tool PKGCONFIG [$pkg_config_default]
    --pkg-config-flags=FLAGS pass additional flags to pkgconf []
 +  --ranlib=RANLIB          use ranlib RANLIB [$ranlib_default]
 +  --doxygen=DOXYGEN        use DOXYGEN to generate API doc [$doxygen_default]
    --host-cc=HOSTCC         use host C compiler HOSTCC
    --host-cflags=HCFLAGS    use HCFLAGS when compiling for host
    --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
    --host-libs=HLIBS        use libs HLIBS when linking for host
    --host-os=OS             compiler host OS [$target_os]
    --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]
 +  --extra-cxxflags=ECFLAGS add ECFLAGS to CXXFLAGS [$CXXFLAGS]
    --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
    --extra-ldexeflags=ELDFLAGS add ELDFLAGS to LDEXEFLAGS [$LDEXEFLAGS]
    --extra-libs=ELIBS       add ELIBS [$ELIBS]
@@@ -319,7 -263,7 +320,7 @@@ Advanced options (experts only)
                             disable buffer boundary checking in bitreaders
                             (faster, but may crash)
    --enable-memalign-hack   emulate memalign, interferes with memory debuggers
 -  --enable-sram            allow use of on-chip SRAM
 +  --sws-max-filter-size=N  the max filter size swscale uses [$sws_max_filter_size_default]
  
  Optimization options (experts only):
    --disable-asm            disable all assembly optimizations
    --disable-neon           disable NEON optimizations
    --disable-inline-asm     disable use of inline assembly
    --disable-yasm           disable use of nasm/yasm assembly
 +  --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-neon-clobber-test check NEON registers for clobbering (should be
                             used only for debugging purposes)
    --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only;
@@@ -413,7 -344,7 +414,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
@@@ -423,7 -354,7 +424,7 @@@ EO
      else
          cat <<EOF
  Include the log file "$logfile" produced by configure as this will help
 -solving the problem.
 +solve the problem.
  EOF
      fi
      exit 1
@@@ -449,7 -380,7 +450,7 @@@ sh_quote()
  }
  
  cleanws(){
 -    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//'
 +    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//;s/\\r//g'
  }
  
  filter(){
@@@ -701,12 -632,6 +702,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;
                  }
              }
          }"
@@@ -749,10 -674,6 +750,10 @@@ add_cflags()
      append CFLAGS $($cflags_filter "$@")
  }
  
 +add_cxxflags(){
 +    append CXXFLAGS $($cflags_filter "$@")
 +}
 +
  add_asflags(){
      append ASFLAGS $($asflags_filter "$@")
  }
@@@ -766,7 -687,7 +767,7 @@@ add_ldexeflags()
  }
  
  add_stripflags(){
 -    append STRIPFLAGS "$@"
 +    append ASMSTRIPFLAGS "$@"
  }
  
  add_extralibs(){
@@@ -796,11 -717,6 +797,11 @@@ check_cmd()
      "$@" >> $logfile 2>&1
  }
  
 +check_stat(){
 +    log check_stat "$@"
 +    stat "$1" >> $logfile 2>&1
 +}
 +
  cc_o(){
      eval printf '%s\\n' $CC_O
  }
@@@ -816,20 -732,6 +817,20 @@@ 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_oc(){
 +    log check_oc "$@"
 +    cat > $TMPM
 +    log_file $TMPM
 +    check_cmd $cc -Werror=missing-prototypes $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPM
 +}
 +
  check_cpp(){
      log check_cpp "$@"
      cat > $TMPC
@@@ -870,7 -772,7 +871,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
@@@ -930,17 -830,9 +931,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
  }
@@@ -956,7 -848,7 +957,7 @@@ test_stripflags()
      check_cc <<EOF
  int main(void) { return 0; }
  EOF
 -    check_cmd $strip $STRIPFLAGS "$@" $TMPO
 +    check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
  }
  
  check_stripflags(){
@@@ -975,24 -867,12 +976,24 @@@ int x
  EOF
  }
  
 +check_header_oc(){
 +    log check_header_oc "$@"
 +    rm -f -- "$TMPO"
 +    header=$1
 +    shift
 +    disable_safe $header
 +    {
 +       echo "#include <$header>"
 +       echo "int main(void) { return 0; }"
 +    } | check_oc && check_stat "$TMPO" && enable_safe $headers
 +}
 +
  check_func(){
      log check_func "$@"
      func=$1
      shift
      disable $func
 -    check_ld "$@" <<EOF && enable $func
 +    check_ld "cc" "$@" <<EOF && enable $func
  extern int $func();
  int main(void){ $func(); }
  EOF
@@@ -1005,10 -885,10 +1006,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
  }
  
@@@ -1025,26 -905,7 +1026,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(){
@@@ -1076,22 -937,13 +1077,22 @@@ 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"
 +    pkgandversion="$1"
 +    pkg="${1%% *}"
      headers="$2"
      funcs="$3"
      shift 3
 -    check_cmd $pkg_config --exists --print-errors $pkg || return
 +    check_cmd $pkg_config --exists --print-errors $pkgandversion || return
      pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
      pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
      check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
  }
  
  check_exec(){
 -    check_ld "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
 +    check_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
  }
  
  check_exec_crash(){
@@@ -1160,7 -1012,7 +1161,7 @@@ check_builtin()
      builtin=$3
      shift 3
      disable "$name"
 -    check_code ld "$headers" "$builtin" "$@" && enable "$name"
 +    check_code ld "$headers" "$builtin" "cc" "$@" && enable "$name"
  }
  
  check_compile_assert(){
@@@ -1189,14 -1041,6 +1190,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"
      add_extralibs $(get_safe ${pkg}_libs)
  }
  
 +require_libfreetype(){
 +    log require_libfreetype "$@"
 +    pkg="freetype2"
 +    check_cmd $pkg_config --exists --print-errors $pkg \
 +      || die "ERROR: $pkg not found"
 +    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
 +    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
 +    {
 +        echo "#include <ft2build.h>"
 +        echo "#include FT_FREETYPE_H"
 +        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
 +        echo "int main(void) { return 0; }"
 +    } | check_ld "cc" $pkg_cflags $pkg_libs \
 +      && set_safe ${pkg}_cflags $pkg_cflags \
 +      && set_safe ${pkg}_libs   $pkg_libs \
 +      || die "ERROR: $pkg not found"
 +    add_cflags    $(get_safe ${pkg}_cflags)
 +    add_extralibs $(get_safe ${pkg}_libs)
 +}
 +
  hostcc_e(){
      eval printf '%s\\n' $HOSTCC_E
  }
@@@ -1304,72 -1128,39 +1305,72 @@@ COMPONENT_LIST=
  "
  
  EXAMPLE_LIST="
 -    avcodec_example
 +    avio_reading_example
 +    decoding_encoding_example
 +    demuxing_decoding_example
 +    extract_mvs_example
      filter_audio_example
 +    filtering_audio_example
 +    filtering_video_example
      metadata_example
 -    output_example
 +    muxing_example
 +    remuxing_example
 +    resampling_audio_example
 +    scaling_video_example
      transcode_aac_example
 +    transcoding_example
  "
  
  EXTERNAL_LIBRARY_LIST="
      avisynth
      bzlib
 +    crystalhd
 +    decklink
      frei0r
      gnutls
 +    iconv
 +    ladspa
 +    libaacplus
 +    libass
 +    libbluray
      libbs2b
 +    libcaca
      libcdio
 +    libcelt
      libdc1394
      libfaac
      libfdk_aac
 +    libflite
      libfontconfig
      libfreetype
 +    libfribidi
 +    libgme
      libgsm
 +    libiec61883
      libilbc
 +    libmodplug
      libmp3lame
 +    libnut
      libopencore_amrnb
      libopencore_amrwb
      libopencv
      libopenjpeg
      libopus
      libpulse
 +    libquvi
      librtmp
      libschroedinger
 +    libshine
 +    libsmbclient
 +    libsoxr
      libspeex
 +    libssh
 +    libstagefright_h264
      libtheora
      libtwolame
 +    libutvideo
 +    libv4l2
 +    libvidstab
      libvo_aacenc
      libvo_amrwbenc
      libvorbis
      libx265
      libxavs
      libxvid
 +    libzmq
 +    libzvbi
 +    lzma
 +    openal
 +    opencl
 +    opengl
      openssl
      x11grab
 +    xlib
      zlib
  "
  
 +DOCUMENT_LIST="
 +    doc
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
  FEATURE_LIST="
 +    ftrapv
      gray
      hardcoded_tables
      runtime_cpudetect
      safe_bitstream_reader
      shared
      small
 -    sram
      static
      swscale_alpha
  "
@@@ -1417,7 -1193,6 +1418,7 @@@ HWACCEL_LIST=
      vaapi
      vda
      vdpau
 +    xvmc
  "
  
  LIBRARY_LIST="
      avformat
      avresample
      avutil
 +    postproc
 +    swresample
      swscale
  "
  
@@@ -1439,29 -1212,26 +1440,30 @@@ LICENSE_LIST=
  "
  
  PROGRAM_LIST="
 -    avconv
 -    avplay
 -    avprobe
 +    ffplay
 +    ffprobe
 +    ffserver
 +    ffmpeg
  "
  
  SUBSYSTEM_LIST="
      dct
 -    doc
 +    dwt
      error_resilience
+     faan
 +    fast_unaligned
      fft
      lsp
      lzo
      mdct
 +    pixelutils
      network
      rdft
  "
  
  CONFIG_LIST="
      $COMPONENT_LIST
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
      $FEATURE_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
      $SUBSYSTEM_LIST
 +    fontconfig
 +    incompatible_libav_abi
      memalign_hack
 +    memory_poisoning
      neon_clobber_test
      pic
      pod2man
 -    texi2html
 +    raise_major
      thumb
      xmm_clobber_test
  "
  
  THREADS_LIST="
      pthreads
 +    os2threads
      w32threads
  "
  
@@@ -1529,14 -1295,6 +1531,14 @@@ ARCH_EXT_LIST_ARM=
      neon
      vfp
      vfpv3
 +    setend
 +"
 +
 +ARCH_EXT_LIST_MIPS="
 +    mipsfpu
 +    mips32r2
 +    mipsdspr1
 +    mipsdspr2
  "
  
  ARCH_EXT_LIST_X86_SIMD="
@@@ -1562,7 -1320,6 +1564,7 @@@ ARCH_EXT_LIST_PPC=
      dcbzl
      ldbrx
      ppc4xx
 +    vsx
  "
  
  ARCH_EXT_LIST_X86="
@@@ -1575,8 -1332,8 +1577,8 @@@ ARCH_EXT_LIST=
      $ARCH_EXT_LIST_ARM
      $ARCH_EXT_LIST_PPC
      $ARCH_EXT_LIST_X86
 +    $ARCH_EXT_LIST_MIPS
      loongson
 -    vis
  "
  
  ARCH_FEATURES="
      fast_cmov
      local_aligned_8
      local_aligned_16
 +    local_aligned_32
      simd_align_16
  "
  
@@@ -1596,7 -1352,6 +1598,7 @@@ BUILTIN_LIST=
      MemoryBarrier
      mm_empty
      rdtsc
 +    sarestart
      sync_val_compare_and_swap
  "
  HAVE_LIST_CMDLINE="
  HAVE_LIST_PUB="
      bigendian
      fast_unaligned
 +    incompatible_libav_abi
  "
  
  HEADERS_LIST="
      alsa_asoundlib_h
      altivec_h
      arpa_inet_h
 +    asm_types_h
      cdio_paranoia_h
      cdio_paranoia_paranoia_h
 +    CL_cl_h
      dev_bktr_ioctl_bt848_h
      dev_bktr_ioctl_meteor_h
      dev_ic_bt8xx_h
      direct_h
      dlfcn_h
      dxva_h
 +    ES2_gl_h
      gsm_h
      io_h
      mach_mach_time_h
      machine_ioctl_bt848_h
      machine_ioctl_meteor_h
      malloc_h
 +    openjpeg_1_5_openjpeg_h
 +    OpenGL_gl3_h
      poll_h
      sndio_h
      soundcard_h
      sys_time_h
      sys_un_h
      sys_videoio_h
 +    termios_h
      unistd_h
      windows_h
      winsock2_h
@@@ -1660,13 -1408,11 +1662,13 @@@ INTRINSICS_LIST=
  MATH_FUNCS="
      atanf
      atan2f
 +    cbrt
      cbrtf
      cosf
      exp2
      exp2f
      expf
 +    fminf
      isinf
      isnan
      ldexpf
  "
  
  SYSTEM_FUNCS="
 +    access
      aligned_malloc
      clock_gettime
      closesocket
      getservbyport
      GetSystemTimeAsFileTime
      gettimeofday
 +    glob
 +    glXGetProcAddress
      inet_aton
      isatty
      jack_port_get_latency_range
 +    kbhit
      localtime_r
 +    lzo1x_999_compress
      mach_absolute_time
      MapViewOfFile
      memalign
      mmap
      mprotect
      nanosleep
 +    PeekNamedPipe
      posix_memalign
 +    pthread_cancel
      sched_getaffinity
      SetConsoleTextAttribute
      setmode
      setrlimit
      Sleep
      strerror_r
 -    strptime
      sysconf
      sysctl
      usleep
      VirtualAlloc
 +    wglGetProcAddress
  "
  
  TOOLCHAIN_FEATURES="
      ebp_available
      ebx_available
      gnu_as
 +    gnu_windres
      ibm_asm
      inline_asm_labels
 +    inline_asm_nonlocal_labels
 +    inline_asm_direct_symbol_refs
      pragma_deprecated
 +    rsync_contimeout
      symver_asm_label
      symver_gnu_asm
      vfp_args
@@@ -1770,11 -1505,9 +1772,11 @@@ TYPES_LIST=
      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
  "
  
@@@ -1796,17 -1529,11 +1798,17 @@@ HAVE_LIST=
      $TYPES_LIST
      atomics_native
      dos_paths
 +    dxva2api_cobj
      dxva2_lib
      libc_msvcrt
      libdc1394_1
      libdc1394_2
 +    makeinfo
 +    makeinfo_html
 +    perl
 +    pod2man
      sdl
 +    texi2html
      threads
      vdpau_x11
      xlib
@@@ -1822,9 -1549,9 +1824,11 @@@ CONFIG_EXTRA=
      bswapdsp
      cabac
      dvprofile
 +    exif
+     faandct
+     faanidct
      fdctdsp
 +    frame_thread_encoder
      gcrypt
      golomb
      gplv3
      iirfilter
      intrax8
      lgplv3
 +    llauddsp
 +    llviddsp
      lpc
      me_cmp
      mpeg_er
@@@ -1879,7 -1604,6 +1883,7 @@@ CMDLINE_SELECT=
      lto
      optimizations
      rpath
 +    stripping
  "
  
  PATHS_LIST="
@@@ -1898,23 -1622,18 +1902,23 @@@ CMDLINE_SET=
      ar
      arch
      as
 +    assert_level
      build_suffix
      cc
      cpu
      cross_prefix
 +    cxx
      dep_cc
 +    doxygen
      extra_version
 +    gas
      host_cc
      host_cflags
      host_ld
      host_ldflags
      host_libs
      host_os
 +    install
      ld
      logfile
      malloc_prefix
      optflags
      pkg_config
      pkg_config_flags
 +    progs_suffix
      random_seed
 +    ranlib
      samples
 +    strip
 +    sws_max_filter_size
      sysinclude
      sysroot
      target_exec
      target_os
      target_path
      target_samples
 +    tempprefix
      toolchain
 +    valgrind
 +    yasmexe
  "
  
  CMDLINE_APPEND="
      extra_cflags
 +    extra_cxxflags
      host_cppflags
  "
  
@@@ -1958,18 -1669,11 +1962,18 @@@ neon_deps_any="aarch64 arm
  intrinsics_neon_deps="neon"
  vfp_deps_any="aarch64 arm"
  vfpv3_deps="vfp"
 +setend_deps="arm"
  
  map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
  
 +mipsfpu_deps="mips"
 +mips32r2_deps="mips"
 +mipsdspr1_deps="mips"
 +mipsdspr2_deps="mips"
 +
  altivec_deps="ppc"
  ppc4xx_deps="ppc"
 +vsx_deps="ppc"
  
  cpunop_deps="i686"
  x86_64_select="i686"
@@@ -2010,6 -1714,7 +2014,6 @@@ fast_unaligned_if_any="aarch64 ppc x86
  simd_align_16_if_any="altivec neon sse"
  
  # system capabilities
 -log2_deps="!libc_msvcrt"
  
  symver_if_any="symver_asm_label symver_gnu_asm"
  
@@@ -2024,7 -1729,8 +2028,9 @@@ threads_if_any="$THREADS_LIST
  # subsystems
  dct_select="rdft"
  error_resilience_select="me_cmp"
+ faandct_deps="faan fdctdsp"
+ faanidct_deps="faan idctdsp"
 +frame_thread_encoder_deps="encoders threads"
  intrax8_select="error_resilience"
  mdct_select="fft"
  rdft_select="fft"
@@@ -2032,7 -1738,7 +2038,7 @@@ me_cmp_select="fdctdsp idctdsp pixblock
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp videodsp"
 +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp videodsp"
  mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
  
  # decoders / encoders
@@@ -2040,7 -1746,6 +2046,7 @@@ aac_decoder_select="mdct sinewin
  aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
  aac_latm_decoder_select="aac_decoder aac_latm_parser"
  ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
 +ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
  ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
  ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
  aic_decoder_select="golomb idctdsp"
@@@ -2048,9 -1753,8 +2054,9 @@@ alac_encoder_select="lpc
  als_decoder_select="bswapdsp"
  amrnb_decoder_select="lsp"
  amrwb_decoder_select="lsp"
 -amv_decoder_select="sp5x_decoder"
 -ape_decoder_select="bswapdsp"
 +amv_decoder_select="sp5x_decoder exif"
 +amv_encoder_select="aandcttables mpegvideoenc"
 +ape_decoder_select="bswapdsp llauddsp"
  asv1_decoder_select="blockdsp bswapdsp idctdsp"
  asv1_encoder_select="bswapdsp fdctdsp pixblockdsp"
  asv2_decoder_select="blockdsp bswapdsp idctdsp"
@@@ -2058,7 -1762,6 +2064,7 @@@ asv2_encoder_select="bswapdsp fdctdsp p
  atrac1_decoder_select="mdct sinewin"
  atrac3_decoder_select="mdct"
  atrac3p_decoder_select="mdct sinewin"
 +avrn_decoder_select="exif"
  bink_decoder_select="blockdsp hpeldsp"
  binkaudio_dct_decoder_select="mdct rdft dct sinewin wma_freqs"
  binkaudio_rdft_decoder_select="mdct rdft sinewin wma_freqs"
@@@ -2069,18 -1772,17 +2075,18 @@@ cook_decoder_select="audiodsp mdct sine
  cscd_decoder_select="lzo"
  cscd_decoder_suggest="zlib"
  dca_decoder_select="mdct"
 +dirac_decoder_select="dwt golomb videodsp mpegvideoenc"
  dnxhd_decoder_select="blockdsp idctdsp"
  dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"
  dvvideo_decoder_select="dvprofile idctdsp"
  dvvideo_encoder_select="dvprofile fdctdsp me_cmp pixblockdsp"
 -dxa_decoder_deps="zlib"
 +dxa_decoder_select="zlib"
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
 -eatgq_decoder_select="aandcttables idctdsp"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpeg1video_decoder"
 -exr_decoder_deps="zlib"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="golomb rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
@@@ -2088,16 -1790,15 +2094,16 @@@ ffvhuff_encoder_select="huffyuv_encoder
  fic_decoder_select="golomb"
  flac_decoder_select="golomb"
  flac_encoder_select="bswapdsp 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="blockdsp bswapdsp"
  fraps_decoder_select="bswapdsp huffman"
 -g2m_decoder_deps="zlib"
 -g2m_decoder_select="blockdsp idctdsp"
 +g2m_decoder_select="blockdsp idctdsp zlib"
 +g729_decoder_select="audiodsp"
  h261_decoder_select="mpeg_er mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
  h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
@@@ -2107,8 -1808,8 +2113,8 @@@ h263p_encoder_select="h263_encoder
  h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp"
  h264_decoder_suggest="error_resilience"
  hevc_decoder_select="bswapdsp cabac golomb videodsp"
 -huffyuv_decoder_select="bswapdsp huffyuvdsp"
 -huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"
 +huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 +huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
  iac_decoder_select="imc_decoder"
  imc_decoder_select="bswapdsp fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
@@@ -2122,7 -1823,7 +2128,7 @@@ loco_decoder_select="golomb
  mdec_decoder_select="blockdsp idctdsp mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
 -mjpeg_decoder_select="blockdsp hpeldsp idctdsp"
 +mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp"
  mjpeg_encoder_select="aandcttables mpegvideoenc"
  mjpegb_decoder_select="mjpeg_decoder"
  mlp_decoder_select="mlp_parser"
@@@ -2141,11 -1842,10 +2147,11 @@@ mpc7_decoder_select="bswapdsp mpegaudio
  mpc8_decoder_select="mpegaudiodsp"
  mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
  mpeg_xvmc_decoder_select="mpeg2video_decoder"
 +mpegvideo_decoder_select="error_resilience mpeg_er mpegvideo"
  mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg1video_encoder_select="aandcttables mpegvideoenc"
 +mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp"
  mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg2video_encoder_select="aandcttables mpegvideoenc"
 +mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp"
  mpeg4_decoder_select="h263_decoder mpeg4video_parser"
  mpeg4_encoder_select="h263_encoder"
  msmpeg4v1_decoder_select="h263_decoder"
@@@ -2159,18 -1859,16 +2165,18 @@@ nellymoser_decoder_select="mdct sinewin
  nellymoser_encoder_select="audio_frame_queue mdct sinewin"
  nuv_decoder_select="idctdsp lzo"
  on2avc_decoder_select="mdct"
 -opus_decoder_deps="avresample"
 -png_decoder_deps="zlib"
 -png_encoder_deps="zlib"
 -png_encoder_select="huffyuvencdsp"
 -prores_decoder_select="idctdsp"
 +opus_decoder_deps="swresample"
 +png_decoder_select="zlib"
 +png_encoder_select="huffyuvencdsp zlib"
 +prores_decoder_select="blockdsp idctdsp"
  prores_encoder_select="fdctdsp"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
 -ra_144_encoder_select="audio_frame_queue lpc"
 +ra_144_encoder_select="audio_frame_queue lpc audiodsp"
 +ra_144_decoder_select="audiodsp"
  ralf_decoder_select="golomb"
 +rawvideo_decoder_select="bswapdsp"
 +rtjpeg_decoder_select="me_cmp"
  rv10_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
  rv10_encoder_select="h263_encoder"
  rv20_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
@@@ -2179,11 -1877,6 +2185,11 @@@ rv30_decoder_select="error_resilience g
  rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp"
  shorten_decoder_select="golomb"
  sipr_decoder_select="lsp"
 +snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp"
 +snow_encoder_select="aandcttables dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb rangecoder"
 +sonic_encoder_select="golomb rangecoder"
 +sonic_ls_encoder_select="golomb rangecoder"
  sp5x_decoder_select="mjpeg_decoder"
  svq1_decoder_select="hpeldsp"
  svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
@@@ -2192,12 -1885,12 +2198,12 @@@ svq3_decoder_suggest="zlib
  tak_decoder_select="audiodsp"
  theora_decoder_select="vp3_decoder"
  thp_decoder_select="mjpeg_decoder"
 -tiff_decoder_suggest="zlib"
 +tiff_decoder_suggest="zlib lzma"
  tiff_encoder_suggest="zlib"
 -truehd_decoder_select="mlp_decoder"
 +truehd_decoder_select="mlp_parser"
  truemotion2_decoder_select="bswapdsp"
  truespeech_decoder_select="bswapdsp"
 -tscc_decoder_deps="zlib"
 +tscc_decoder_select="zlib"
  twinvq_decoder_select="mdct lsp sinewin"
  utvideo_decoder_select="bswapdsp"
  utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
@@@ -2213,9 -1906,8 +2219,9 @@@ vp6a_decoder_select="vp6_decoder
  vp6f_decoder_select="vp6_decoder"
  vp7_decoder_select="h264pred videodsp"
  vp8_decoder_select="h264pred videodsp"
 -vp9_decoder_select="videodsp"
 +vp9_decoder_select="videodsp vp9_parser"
  webp_decoder_select="vp8_decoder"
 +wmalossless_decoder_select="llauddsp"
  wmapro_decoder_select="mdct sinewin wma_freqs"
  wmav1_decoder_select="mdct sinewin wma_freqs"
  wmav1_encoder_select="mdct sinewin wma_freqs"
@@@ -2228,105 -1920,73 +2234,105 @@@ wmv2_decoder_select="blockdsp h263_deco
  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"
  vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
  vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
 +xvmc_deps="X11_extensions_XvMClib_h"
  
  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_vda_old_hwaccel_deps="vda"
  h264_vda_old_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"
 +mpeg_xvmc_hwaccel_deps="xvmc"
 +mpeg_xvmc_hwaccel_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"
 +mpeg1_xvmc_hwaccel_deps="xvmc"
 +mpeg1_xvmc_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"
 +mpeg2_xvmc_hwaccel_deps="xvmc"
 +mpeg2_xvmc_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="h264_decoder"
 +hevc_parser_select="hevc_decoder"
  mpegvideo_parser_select="mpegvideo"
  mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp"
 -vc1_parser_select="mpegvideo startcode"
 +vc1_parser_select="mpegvideo startcode vc1_decoder"
  
  # 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"
@@@ -2338,21 -1998,16 +2344,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"
@@@ -2362,27 -2017,21 +2368,27 @@@ libvpx_vp9_encoder_deps="libvpx
  libwavpack_encoder_deps="libwavpack"
  libwebp_encoder_deps="libwebp"
  libx264_encoder_deps="libx264"
 +libx264rgb_encoder_deps="libx264"
  libx265_encoder_deps="libx265"
  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"
  asf_demuxer_select="riffdec"
  asf_muxer_select="riffenc"
  asf_stream_muxer_select="asf_muxer"
 -avi_demuxer_select="riffdec"
 +avi_demuxer_select="riffdec exif"
  avi_muxer_select="riffenc"
  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"
  dv_demuxer_select="dvprofile"
  dv_muxer_select="dvprofile"
  dxa_demuxer_select="riffdec"
@@@ -2391,12 -2040,8 +2397,12 @@@ f4v_muxer_select="mov_muxer
  flac_demuxer_select="flac_parser"
  hds_muxer_select="flv_muxer"
  hls_muxer_select="mpegts_muxer"
 +image2_alias_pix_demuxer_select="image2_demuxer"
 +image2_brender_pix_demuxer_select="image2_demuxer"
  ipod_muxer_select="mov_muxer"
  ismv_muxer_select="mov_muxer"
 +libnut_demuxer_deps="libnut"
 +libnut_muxer_deps="libnut"
  matroska_audio_muxer_select="matroska_muxer"
  matroska_demuxer_select="riffdec"
  matroska_demuxer_suggest="bzlib lzo zlib"
@@@ -2429,69 -2074,40 +2435,69 @@@ spx_muxer_select="ogg_muxer
  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"
  wtv_demuxer_select="riffdec"
 +wtv_muxer_select="riffenc"
  xmv_demuxer_select="riffdec"
  xwma_demuxer_select="riffdec"
  
  # indevs / outdevs
  alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
  alsa_outdev_deps="alsa_asoundlib_h"
 +avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia"
 +avfoundation_indev_select="avfoundation"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 +caca_outdev_deps="libcaca"
 +decklink_outdev_deps="decklink pthreads"
 +decklink_outdev_extralibs="-lstdc++"
 +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"
 +gdigrab_indev_deps="CreateDIBSection"
 +gdigrab_indev_extralibs="-lgdi32"
 +gdigrab_indev_select="bmp_decoder"
 +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"
 +opengl_outdev_deps="opengl"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
  pulse_indev_deps="libpulse"
 +pulse_outdev_deps="libpulse"
 +qtkit_indev_extralibs="-framework QTKit -framework Foundation -framework QuartzCore"
 +qtkit_indev_select="qtkit"
 +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"
  http_protocol_select="tcp_protocol"
  httpproxy_protocol_select="tcp_protocol"
@@@ -2502,8 -2118,6 +2508,8 @@@ librtmpe_protocol_deps="librtmp
  librtmps_protocol_deps="librtmp"
  librtmpt_protocol_deps="librtmp"
  librtmpte_protocol_deps="librtmp"
 +libsmbclient_protocol_deps="libsmbclient gplv3"
 +libssh_protocol_deps="libssh"
  mmsh_protocol_select="http_protocol"
  mmst_protocol_select="network"
  rtmp_protocol_deps="!librtmp_protocol"
@@@ -2526,87 -2140,28 +2532,87 @@@ 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"
  bs2b_filter_deps="libbs2b"
 +colormatrix_filter_deps="gpl"
  cropdetect_filter_deps="gpl"
  delogo_filter_deps="gpl"
 +deshake_filter_select="pixelutils"
  drawtext_filter_deps="libfreetype"
 +ebur128_filter_deps="gpl"
 +flite_filter_deps="libflite"
  frei0r_filter_deps="frei0r dlopen"
  frei0r_filter_extralibs='$ldl'
  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"
 +ladspa_filter_extralibs='$ldl'
 +mcdeint_filter_deps="avcodec gpl"
 +movie_filter_deps="avcodec avformat"
 +mp_filter_deps="gpl avcodec swscale inline_asm"
 +mpdecimate_filter_deps="gpl"
 +mpdecimate_filter_select="pixelutils"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
 +perspective_filter_deps="gpl"
  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"
  resample_filter_deps="avresample"
 +sab_filter_deps="gpl swscale"
  scale_filter_deps="swscale"
 +select_filter_select="pixelutils"
 +smartblur_filter_deps="gpl swscale"
 +showspectrum_filter_deps="avcodec"
 +showspectrum_filter_select="rdft"
 +spp_filter_deps="gpl avcodec"
 +spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
 +stereo3d_filter_deps="gpl"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +tinterlace_filter_deps="gpl"
 +vidstabdetect_filter_deps="libvidstab"
 +vidstabtransform_filter_deps="libvidstab"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
 +zmq_filter_deps="libzmq"
 +zoompan_filter_deps="swscale"
  
  # examples
 +avio_reading="avformat avcodec avutil"
  avcodec_example_deps="avcodec avutil"
 +decoding_encoding_example_deps="avcodec avformat avutil"
 +demuxing_decoding_example_deps="avcodec avformat avutil"
 +extract_mvs_example_deps="avcodec avformat avutil"
  filter_audio_example_deps="avfilter avutil"
 +filtering_audio_example_deps="avfilter avcodec avformat avutil"
 +filtering_video_example_deps="avfilter avcodec avformat avutil"
  metadata_example_deps="avformat avutil"
 -output_example_deps="avcodec avformat avutil swscale"
 -transcode_aac_example_deps="avcodec avformat avresample"
 +muxing_example_deps="avcodec avformat avutil swscale"
 +remuxing_example_deps="avcodec avformat avutil"
 +resampling_audio_example_deps="avutil swresample"
 +scaling_video_example_deps="avutil swscale"
 +transcode_aac_example_deps="avcodec avformat swresample"
 +transcoding_example_deps="avfilter avcodec avformat avutil"
  
  # libraries, in linking order
  avcodec_deps="avutil"
@@@ -2614,29 -2169,21 +2620,29 @@@ avdevice_deps="avformat avcodec avutil
  avfilter_deps="avutil"
  avformat_deps="avcodec avutil"
  avresample_deps="avutil"
 +postproc_deps="avutil gpl"
 +swresample_deps="avutil"
  swscale_deps="avutil"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale"
 -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 -               fps_filter null_filter resample_filter scale_filter
 +ffmpeg_deps="avcodec avfilter avformat swresample"
 +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
 +               null_filter
                 setpts_filter trim_filter"
 -avplay_deps="avcodec avformat avresample swscale sdl"
 -avplay_libs='$sdl_libs'
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 +ffplay_deps="avcodec avformat swscale swresample sdl"
 +ffplay_libs='$sdl_libs'
 +ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat fork sarestart"
 +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
  
  # documentation
 -pod2man_deps="doc"
 -texi2html_deps="doc"
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="perl"
 +htmlpages_deps_any="makeinfo_html texi2html"
 +txtpages_deps="perl makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters
  
@@@ -2645,8 -2192,8 +2651,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'
@@@ -2655,56 -2202,39 +2661,57 @@@ shlibdir_default="$libdir_default
  # toolchain
  ar_default="ar"
  cc_default="gcc"
 +cxx_default="g++"
  host_cc_default="gcc"
  cp_f="cp -f"
 +doxygen_default="doxygen"
 +install="install"
  ln_s="ln -s -f"
  nm_default="nm -g"
  objformat="elf"
  pkg_config_default=pkg-config
 -ranlib="ranlib"
 -strip="strip"
 -yasmexe="yasm"
 -
 -# machine
 -arch_default=$(uname -m)
 -cpu="generic"
 -intrinsics="none"
 +ranlib_default="ranlib"
 +strip_default="strip"
 +yasmexe_default="yasm"
 +windres_default="windres"
  
  # OS
  target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
 +# machine
 +if test "$target_os_default" = aix; then
 +    arch_default=$(uname -p)
 +    strip_default="strip -X32_64"
 +else
 +    arch_default=$(uname -m)
 +fi
 +cpu="generic"
 +intrinsics="none"
 +
  # configurable options
 -enable $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
 +enable $PROGRAM_LIST
 +enable $DOCUMENT_LIST
 +enable $EXAMPLE_LIST
 +enable $(filter_out avresample $LIBRARY_LIST)
 +enable stripping
  
  enable asm
  enable debug
  enable doc
+ enable faan faandct faanidct
  enable optimizations
 +enable runtime_cpudetect
  enable safe_bitstream_reader
  enable static
  enable swscale_alpha
  
 -# By default, enable only those hwaccels that have no external dependencies.
 -enable dxva2 vdpau
 +sws_max_filter_size_default=256
 +set_default sws_max_filter_size
 +
 +# Enable hwaccels by default.
 +enable dxva2 vaapi vda vdpau xvmc
 +enable xlib
  
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
@@@ -2730,8 -2260,6 +2737,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'
@@@ -2766,7 -2294,7 +2773,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(){
@@@ -2889,9 -2417,11 +2896,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)
 -        ;;
 -        --enable-avserver|--disable-avserver*)
 -            warn "avserver has been removed, the ${opt} option is only"\
 -                 "provided for compatibility and will be removed in the future"
 +            list=$(filter "$name" $list)
 +            [ "$list" = "" ] && warn "Option $opt did not match anything"
 +            $action $list
          ;;
          --enable-?*|--disable-?*)
              eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
          ;;
          --help|-h) show_help
          ;;
 +        --fatal-warnings) enable fatal_warnings
 +        ;;
          *)
              optname="${opt%%=*}"
              optname="${optname#--}"
@@@ -2931,7 -2459,7 +2938,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}"
 +ranlib_default="${cross_prefix}${ranlib_default}"
 +strip_default="${cross_prefix}${strip_default}"
 +windres_default="${cross_prefix}${windres_default}"
  
  sysinclude_default="${sysroot}/usr/include"
  
 +test -n "$valgrind" && toolchain="valgrind-memcheck"
 +
  case "$toolchain" in
      clang-asan)
          cc_default="clang"
      ;;
      clang-usan)
          cc_default="clang"
 -        add_cflags  -fsanitize=undefined -O1
 +        add_cflags  -fsanitize=undefined
          add_ldflags -fsanitize=undefined
      ;;
      gcc-asan)
          add_ldflags -fsanitize=undefined
      ;;
      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 doxygen pkg_config ranlib strip sysinclude \
 +    target_exec target_os yasmexe
  enabled cross_compile || host_cc_default=$cc
  set_default host_cc
  
@@@ -3047,11 -2570,6 +3054,11 @@@ if ! $pkg_config --version >/dev/null 2
      pkg_config=false
  fi
  
 +if test $doxygen != $doxygen_default && \
 +  ! $doxygen --version >/dev/null 2>&1; then
 +    warn "Specified doxygen \"$doxygen\" not found, API documentation will fail to build."
 +fi
 +
  exesuf() {
      case $1 in
          mingw32*|win32|win64|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;;
@@@ -3066,11 -2584,7 +3073,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(){
@@@ -3090,10 -2604,8 +3097,10 @@@ trap 'rm -f -- $TMPFILES' EXI
  
  tmpfile TMPASM .asm
  tmpfile TMPC   .c
 +tmpfile TMPCPP .cpp
  tmpfile TMPE   $EXESUF
  tmpfile TMPH   .h
 +tmpfile TMPM   .m
  tmpfile TMPO   .o
  tmpfile TMPS   .S
  tmpfile TMPSH  .sh
@@@ -3190,7 -2702,6 +3197,7 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
 +                                       -wd4554 \
                                         -wd4273 -wd4701 ;;
          esac
      done
@@@ -3204,16 -2715,6 +3211,16 @@@ icl_flags()
              # on Windows, does enable remarks so disable them here.
              -Wall)                echo $flag -Qdiag-disable:remark ;;
              -std=c99)             echo -Qstd=c99 ;;
 +            -flto)                echo -ipo ;;
 +        esac
 +    done
 +}
 +
 +icc_flags(){
 +    for flag; do
 +        case $flag in
 +            -flto)                echo -ipo ;;
 +            *)                    echo $flag ;;
          esac
      done
  }
@@@ -3246,16 -2747,9 +3253,16 @@@ suncc_flags()
                      prescott|nocona)    echo -xarch=sse3 -xchip=pentium4 ;;
                      *-sse3)             echo -xarch=sse3                 ;;
                      core2)              echo -xarch=ssse3 -xchip=core2   ;;
 -                    corei7)           echo -xarch=sse4_2 -xchip=nehalem  ;;
 -                    corei7-avx)       echo -xarch=avx -xchip=sandybridge ;;
 -                    amdfam10|barcelona|bdver*) echo -xarch=sse4_1        ;;
 +                    bonnell)                   echo -xarch=ssse3         ;;
 +                    corei7|nehalem)            echo -xtarget=nehalem     ;;
 +                    westmere)                  echo -xtarget=westmere    ;;
 +                    silvermont)                echo -xarch=sse4_2        ;;
 +                    corei7-avx|sandybridge)    echo -xtarget=sandybridge ;;
 +                    core-avx*|ivybridge|haswell|broadwell)
 +                                               echo -xarch=avx           ;;
 +                    amdfam10|barcelona)        echo -xtarget=barcelona   ;;
 +                    btver1)                    echo -xarch=amdsse4a      ;;
 +                    btver2|bdver*)             echo -xarch=avx           ;;
                      athlon-4|athlon-[mx]p)     echo -xarch=ssea          ;;
                      k8|opteron|athlon64|athlon-fx)
                                                 echo -xarch=sse2a         ;;
@@@ -3311,9 -2805,7 +3318,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"
          _cflags_speed='-O3'
          _cflags_size='-Os'
          _cflags_noopt='-O1'
 +        _flags_filter=icc_flags
      elif $_cc -v 2>&1 | grep -q xlc; then
          _type=xlc
          _ident=$($_cc -qversion 2>/dev/null | head -n1)
          opt_common='-alias=ansi -Mdse -Mlre -Mpre'
          _cflags_speed="-O3 -Mautoinline -Munroll=c:4 $opt_common"
          _cflags_size="-O2 -Munroll=c:1 $opt_common"
 -        _cflags_noopt="-O1"
 +        _cflags_noopt="-O"
          _flags_filter=pgi_flags
      elif $_cc 2>&1 | grep -q 'Microsoft.*ARM.*Assembler'; then
          _type=armasm
          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)
          _ld_path='-libpath:'
          # -Qdiag-error to make icl error when seeing certain unknown arguments
          _flags='-nologo -Qdiag-error:4044,10157'
 -        # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
 +        # -Qvec- -Qsimd- to prevent miscompilation, -GS, fp:precise for consistency
          # with MSVC which enables it by default.
 -        _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS'
 +        _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS -fp:precise'
          if [ $pfx = hostcc ]; then
              append _cflags -Dsnprintf=_snprintf
          fi
@@@ -3518,7 -3008,7 +3525,7 @@@ test -n "$cc_type" && enable $cc_type |
  : ${dep_cc_default:=$cc}
  : ${ld_default:=$cc}
  : ${host_ld_default:=$host_cc}
 -set_default ar as dep_cc ld host_ld
 +set_default ar as dep_cc ld host_ld windres
  
  probe_cc as "$as"
  asflags_filter=$_flags_filter
@@@ -3560,7 -3050,6 +3567,7 @@@ els
  fi
  
  add_cflags $extra_cflags
 +add_cxxflags $extra_cxxflags
  add_asflags $extra_cflags
  
  if test -n "$sysroot"; then
          gcc|llvm_gcc|clang)
              add_cppflags --sysroot="$sysroot"
              add_ldflags --sysroot="$sysroot"
 +# On Darwin --sysroot may be ignored, -isysroot always affects headers and linking
 +            add_cppflags -isysroot "$sysroot"
 +            add_ldflags -isysroot "$sysroot"
          ;;
          tms470)
              add_cppflags -I"$sysinclude"
@@@ -3606,7 -3092,7 +3613,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
@@@ -3708,10 -3194,7 +3715,10 @@@ elif enabled arm; the
  
      case "$subarch" in
          armv5t*)    enable fast_clz                ;;
 -        armv[6-8]*) enable fast_clz fast_unaligned ;;
 +        armv[6-8]*)
 +            enable fast_clz
 +            disabled fast_unaligned || enable fast_unaligned
 +            ;;
      esac
  
  elif enabled avr32; then
@@@ -3743,32 -3226,9 +3750,32 @@@ 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
  
      disable ldbrx
 +    disable vsx
  
      case $(tolower $cpu) in
          601|ppc601|powerpc601)
          g5|970|ppc970|powerpc970)
              cpuflags="-mcpu=970"
          ;;
 -        power[3-7]*)
 +        power[3-8]*)
              cpuflags="-mcpu=$cpu"
          ;;
          cell)
@@@ -3843,8 -3303,7 +3850,8 @@@ elif enabled x86; the
              disable i686
          ;;
          # targets that do support nopl and conditional mov (cmov)
 -        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
 +        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx\
 +        |core*|atom|bonnell|nehalem|westmere|silvermont|sandybridge|ivybridge|haswell|broadwell|amdfam10|barcelona|b[dt]ver*)
              cpuflags="-march=$cpu"
              enable i686
              enable fast_cmov
@@@ -3878,7 -3337,6 +3885,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>
@@@ -3930,11 -3388,6 +3937,11 @@@ case "$arch" i
              spic=$shared
          fi
      ;;
 +    ppc)
 +        check_cc <<EOF && subarch="ppc64"
 +        int test[(int)sizeof(char*) - 7];
 +EOF
 +    ;;
  esac
  
  enable $subarch
@@@ -3977,7 -3430,6 +3984,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)
          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)'
          elif enabled arm; then
              LIBTARGET=arm-wince
          fi
 +        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
          check_ldflags -Wl,--nxcompat
          check_ldflags -Wl,--dynamicbase
          shlibdir_default="$bindir_default"
          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
          ;;
          SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
          objformat="win32"
          enable dos_paths
 +        enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres
          ;;
      *-dos|freedos|opendos)
          network_extralibs="-lsocket"
          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 ffserver
          cp_f='cp'
          ;;
      none)
@@@ -4188,10 -3626,6 +4195,10 @@@ probe_libc()
      # MinGW64 is backwards compatible with MinGW32, so check for it first.
      elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
          eval ${pfx}libc_type=mingw64
 +        if check_${pfx}cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
 +            add_compat msvcrt/snprintf.o
 +            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +        fi
          add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
          eval test \$${pfx_no_}cc_type = "gcc" &&
              add_${pfx}cppflags -D__printf__=__gnu_printf__
@@@ -4262,7 -3696,7 +4269,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
  
@@@ -4284,30 -3718,19 +4291,30 @@@ 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 libsmbclient
 +die_license_disabled gpl libutvideo
 +die_license_disabled gpl libvidstab
  die_license_disabled gpl libx264
  die_license_disabled gpl libx265
  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
 +die_license_disabled version3 libsmbclient
  die_license_disabled version3 libvo_aacenc
  die_license_disabled version3 libvo_amrwbenc
  
@@@ -4365,12 -3788,6 +4372,12 @@@ unsigned int endian = 'B' << 24 | 'I' <
  EOF
  od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
 +if  [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then
 +    if ! enabled bigendian ;then
 +        enable vsx
 +    fi
 +fi
 +
  check_gas() {
      log "check_gas using '$as' as AS"
      # :vararg is used on aarch64, arm and ppc altivec
@@@ -4391,7 -3808,7 +4398,7 @@@ EO
  if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
      nogas=:
      enabled_any arm aarch64 && nogas=die
 -    enabled_all ppc altivec && nogas=warn
 +    enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
      as_noop=-v
  
      case $as_type in
  
      [ $target_os = "darwin" ] && gaspp_as_type="apple-$gaspp_as_type"
  
 -    check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as $as_noop &&
 -        gas="gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as"
 +    test "${as#*gas-preprocessor.pl}" != "$as" ||
 +    check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- ${as:=$cc} $as_noop &&
 +        gas="${gas:=gas-preprocessor.pl} -arch $arch -as-type $gaspp_as_type -- ${as:=$cc}"
  
      if ! check_gas ; then
          as=${gas:=$as}
  
  check_inline_asm inline_asm_labels '"1:\n"'
  
 +check_inline_asm inline_asm_nonlocal_labels '"Label:\n"'
 +
  if enabled aarch64; then
      enabled armv8 && check_insn armv8 'prfm   pldl1strm, [x0]'
      # internal assembler in clang 3.3 does not support this instruction
@@@ -4436,10 -3850,7 +4443,10 @@@ elif 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
  
      if     check_cpp_condition stddef.h "defined __ARM_PCS_VFP"; then
      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
      enabled neon    && check_insn neon    'vadd.i16 q0, q0, q0'
      enabled vfp     && check_insn vfp     'fadds s0, s0, s0'
      enabled vfpv3   && check_insn vfpv3   'vmov.f32 s0, #1.0'
 +    enabled setend  && check_insn setend  'setend be'
  
      [ $target_os = linux ] || [ $target_os = android ] ||
          map 'enabled_any ${v}_external ${v}_inline || disable $v' \
  elif enabled mips; then
  
      check_inline_asm loongson '"dmult.g $1, $2, $3"'
 +    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
  
  
  elif enabled ppc; then
  
 -    enable local_aligned_8 local_aligned_16
 +    enable local_aligned_8 local_aligned_16 local_aligned_32
  
      check_inline_asm dcbzl     '"dcbzl 0, %0" :: "r"(0)'
      check_inline_asm ibm_asm   '"add 0, 0, 0"'
          enabled altivec || warn "Altivec disabled, possibly missing --cpu flag"
      fi
  
 +    if enabled vsx; then
 +        check_cflags -mvsx
 +    fi
  elif enabled x86; then
  
      check_builtin rdtsc    intrin.h   "__rdtsc()"
      check_builtin mm_empty mmintrin.h "_mm_empty()"
  
 -    enable local_aligned_8 local_aligned_16
 +    enable local_aligned_8 local_aligned_16 local_aligned_32
  
      # check whether EBP is available on x86
      # As 'i' is stored on the stack, this program will crash
@@@ -4552,9 -3951,6 +4559,9 @@@ EO
      # check whether xmm clobbers are supported
      check_inline_asm xmm_clobbers '"":::"%xmm0"'
  
 +    check_inline_asm inline_asm_direct_symbol_refs '"movl '$extern_prefix'test, %eax"' ||
 +        check_inline_asm inline_asm_direct_symbol_refs '"movl '$extern_prefix'test(%rip), %eax"'
 +
      # check whether binutils is new enough to compile SSSE3/MMXEXT
      enabled ssse3  && check_inline_asm ssse3_inline  '"pabsw %xmm0, %xmm0"'
      enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
          elif check_cmd nasm -v; then
              yasmexe=nasm
              yasm_debug="-g -F dwarf"
 -            enabled x86_64 && test "$objformat" = elf && objformat=elf64
 +            if enabled x86_64; then
 +                case "$objformat" in
 +                    elf)   objformat=elf64 ;;
 +                    win32) objformat=win64 ;;
 +                esac
 +            fi
          fi
  
          YASMFLAGS="-f $objformat $yasm_extra"
  
          check_yasm "movbe ecx, [5]" && enable yasm ||
              die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
 +        check_yasm "vextracti128 xmm0, ymm0, 0"      || disable avx2_external
          check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
 -        check_yasm "vfmadd132ps ymm0, ymm1, ymm2"    || disable fma3_external
          check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
          check_yasm "CPU amdnop" || disable cpunop
      fi
  check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomic_cas_ptr(ptr, oldval, newval)"
  check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
  check_builtin MemoryBarrier windows.h "MemoryBarrier()"
 +check_builtin sarestart signal.h "SA_RESTART"
  check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)"
  
  check_func_headers malloc.h _aligned_malloc     && enable aligned_malloc
  check_func  ${malloc_prefix}memalign            && enable memalign
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
  
 -check_cpp_condition unistd.h "defined(_POSIX_MONOTONIC_CLOCK)" &&
 -    check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt; }
 -
 +check_func  access
 +check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt; }
  check_func  fcntl
  check_func  fork
  check_func  gethrtime
@@@ -4675,15 -4066,13 +4682,15 @@@ check_func  mprotec
  check_func_headers time.h nanosleep || { check_func_headers time.h nanosleep -lrt && add_extralibs -lrt; }
  check_func  sched_getaffinity
  check_func  setrlimit
 +check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE
  check_func  strerror_r
 -check_func  strptime
  check_func  sysconf
  check_func  sysctl
  check_func  usleep
  
 +check_func_headers conio.h kbhit
  check_func_headers io.h setmode
 +check_func_headers lzo/lzo1x.h lzo1x_999_compress
  check_func_headers stdlib.h getenv
  
  check_func_headers windows.h CoTaskMemFree -lole32
@@@ -4691,21 -4080,15 +4698,21 @@@ check_func_headers windows.h GetProcess
  check_func_headers windows.h GetProcessTimes
  check_func_headers windows.h GetSystemTimeAsFileTime
  check_func_headers windows.h MapViewOfFile
 +check_func_headers windows.h PeekNamedPipe
  check_func_headers windows.h SetConsoleTextAttribute
  check_func_headers windows.h Sleep
  check_func_headers windows.h VirtualAlloc
 +check_func_headers glob.h glob
 +enabled xlib &&
 +    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 mach/mach_time.h
  check_header malloc.h
  check_header poll.h
@@@ -4715,14 -4098,12 +4722,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
  
  check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32
  check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32
  
  # 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_join -pthread; then
 +    if check_func pthread_join -pthread && check_func pthread_create -pthread; then
          add_cflags -pthread
          add_extralibs -pthread
 -    elif check_func pthread_join -pthreads; then
 +    elif check_func pthread_join -pthreads && check_func pthread_create -pthreads; then
          add_cflags -pthreads
          add_extralibs -pthreads
 -    elif check_func pthread_join -lpthreadGC2; then
 +    elif check_func pthread_join -ldl -pthread && check_func pthread_create -ldl -pthread; then
 +        add_cflags -ldl -pthread
 +        add_extralibs -ldl -pthread
 +    elif check_func pthread_join -lpthreadGC2 && check_func pthread_create -lpthreadGC2; then
          add_extralibs -lpthreadGC2
 -    elif check_lib pthread.h pthread_join -lpthread; then
 +    elif check_lib pthread.h pthread_join -lpthread && check_lib pthread.h pthread_create -lpthread; then
          :
 -    elif ! check_func pthread_join; then
 +    elif ! check_func pthread_join && ! check_func pthread_create; then
          disable pthreads
      fi
 +    check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads
 +fi
 +
 +
 +if enabled pthreads; then
 +  check_func pthread_cancel
  fi
  
  disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
  disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
 +disabled  lzma || check_lib2  lzma.h lzma_version_number -llzma || disable lzma
  
  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
  powf_args=2
 +fminf_args=2
  
  for func in $MATH_FUNCS; do
      eval check_mathfunc $func \${${func}_args:-1}
  done
  
  # these are off by default, so fail if requested and not available
 -enabled avisynth          && { { check_header "avisynth/avisynth_c.h" && check_lib2 "windows.h" LoadLibrary; } ||
 -                               { check_header "avxsynth/avxsynth_c.h" && check_lib2 "dlfcn.h" dlopen -ldl; } ||
 -                               die "ERROR: LoadLibrary/dlopen not found, or avisynth header not found"; }
 +enabled avfoundation_indev && { check_header_oc AVFoundation/AVFoundation.h || disable avfoundation_indev; }
 +enabled avisynth          && { { check_lib2 "windows.h" LoadLibrary; } ||
 +                               { check_lib2 "dlfcn.h" dlopen -ldl; } ||
 +                               die "ERROR: LoadLibrary/dlopen not found for avisynth"; }
 +enabled decklink          && { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; }
  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_pkg_config libbluray libbluray/bluray.h bd_open
  enabled libbs2b           && require_pkg_config libbs2b bs2b.h bs2b_open
 +enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
 +                             { check_lib 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 fontconfig        && enable libfontconfig
  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
 -enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 +enabled libfreetype       && require_libfreetype
 +enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
 +enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                     check_lib "${gsm_hdr}" gsm_create -lgsm && break;
                                 done || die "ERROR: libgsm not found"; }
  enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
 +enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
  enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
 +enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
  enabled 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       && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC; } ||
 -                               { require_pkg_config libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; } }
 +enabled libopencv         && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
 +enabled libopenjpeg       && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
 +                               check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
 +                               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 libpulse          && require_pkg_config libpulse pulse/pulseaudio.h pa_context_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 libsmbclient      && { { check_pkg_config smbclient libsmbclient.h smbc_init &&
 +                                 require_pkg_config smbclient libsmbclient.h smbc_init; } ||
 +                                 require smbclient libsmbclient.h smbc_init -lsmbclient; }
 +enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
 +enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
  enabled libspeex          && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
 +enabled 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
 +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 >= 0.98" 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 libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || disable libvpx_vp9_encoder; } }
  enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
 -enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
 -enabled libx264           && require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode &&
 +enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion &&
 +                             { check_code cc webp/encode.h "WebPPicture wp; wp.use_argb++" ||
 +                               die "ERROR: libwebp too old."; }
 +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 libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&
                               { check_cpp_condition x265.h "X265_BUILD >= 17" ||
                                 die "ERROR: libx265 version must be >= 17."; }
  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"; } &&
 +                             { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               die "ERROR: opencl must be installed and version must be 1.2 or compatible"; }
 +enabled opengl            && { check_lib GL/glx.h glXGetProcAddress "-lGL" ||
 +                               check_lib2 windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
 +                               check_lib2 OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
 +                               check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
 +                               die "ERROR: opengl not found."
 +                             }
  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 ||
                                 die "ERROR: openssl not found"; }
 +enabled qtkit_indev      && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; }
  
  if enabled gnutls; then
      { check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } ||
@@@ -4902,36 -4216,18 +4909,36 @@@ 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
 +
 +makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 +enabled makeinfo && (makeinfo --version | \
 +                     grep -q 'makeinfo (GNU texinfo) 5' > /dev/null 2>&1) \
 +    && enable makeinfo_html || disable makeinfo_html
 +disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 +perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 -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
  
@@@ -4940,8 -4236,6 +4947,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
 +enabled xlib &&
 +    check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib
  
  enabled x11grab                                           &&
  require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
  require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
  { enabled xlib || die "ERROR: Xlib not found"; }
  
 +check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
 +
 +enabled dxva2api_h &&
 +    check_cc <<EOF && enable dxva2api_cobj
 +#define _WIN32_WINNT 0x0600
 +#define COBJMACROS
 +#include <windows.h>
 +#include <d3d9.h>
 +#include <dxva2api.h>
 +int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; }
 +EOF
 +
 +enabled 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
  
  enabled vdpau && enabled xlib &&
      check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
 -    prepend avconv_libs $($ldflags_filter "-lvdpau") &&
 +    prepend ffmpeg_libs $($ldflags_filter "-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
@@@ -5020,13 -4286,12 +5027,13 @@@ 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
 +check_cflags -Wempty-body
  enabled extra_warnings && check_cflags -Winline
  
  check_disable_warning(){
@@@ -5041,13 -4306,13 +5048,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_ldexeflags -Wl,-rpath,$libdir
  test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
  # add some strip flags
  # -wN '..@*' is more selective than -x, but not available everywhere.
 -check_stripflags -wN \'..@*\' || check_stripflags -x || strip='true'
 +check_stripflags -wN \'..@*\' || check_stripflags -x
  
  enabled neon_clobber_test &&
      check_ldflags -Wl,--wrap,avcodec_open2              \
                    -Wl,--wrap,avcodec_encode_audio2      \
                    -Wl,--wrap,avcodec_encode_video2      \
                    -Wl,--wrap,avcodec_encode_subtitle    \
 +                  -Wl,--wrap,swr_convert                \
                    -Wl,--wrap,avresample_convert ||
      disable neon_clobber_test
  
@@@ -5067,10 -4331,8 +5074,10 @@@ enabled xmm_clobber_test &
                    -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,swr_convert                \
                    -Wl,--wrap,avresample_convert         \
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
@@@ -5108,39 -4370,28 +5115,39 @@@ if enabled lto; the
      test "$cc_type" != "$ld_type" && die "LTO requires same compiler and linker"
      check_cflags  -flto
      check_ldflags -flto $cpuflags
 +    disable inline_asm_direct_symbol_refs
  fi
  
  check_optflags $optflags
  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
      # icc 11.0 and 11.1 work with ebp_available, but don't pass the test
      enable ebp_available
 +    # The test above does not test linking
 +    enabled lto && disable symver_asm_label
      if enabled x86_32; then
          icc_version=$($cc -dumpversion)
          test ${icc_version%%.*} -ge 11 &&
@@@ -5155,12 -4406,11 +5162,12 @@@ elif enabled ccc; the
      add_cflags -msg_disable unsupieee
  elif enabled gcc; then
      check_optflags -fno-tree-vectorize
 +    check_cflags -Werror=format-security
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
      check_cflags -Werror=return-type
 -    check_cflags -Werror=declaration-after-statement
      check_cflags -Werror=vla
 +    check_cflags -Wformat
      enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
  elif enabled llvm_gcc; then
      check_cflags -mllvm -stack-alignment=16
@@@ -5198,14 -4448,10 +5205,14 @@@ elif enabled_any msvc icl; the
          # (correctly) on icl 13.x.
          check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" &&
              add_cflags -Qansi-alias
 -        # icl will pass the inline asm tests but inline asm is currently
 -        # not supported (build will fail)
 -        disable inline_asm
 +        # Some inline asm is not compilable in debug
 +        if enabled debug; then
 +            disable ebp_available
 +            disable ebx_available
 +        fi
      fi
 +    # msvcrt10 x64 incorrectly enables log2, only msvcrt12 onwards actually has log2.
 +    check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
  fi
  
  case $as_type in
@@@ -5229,8 -4475,6 +5236,8 @@@ case $target_os i
      ;;
  esac
  
 +enable frame_thread_encoder
 +
  enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
  
  check_deps $CONFIG_LIST       \
             $HAVE_LIST         \
             $ALL_COMPONENTS    \
  
 -enabled_all dxva2 CoTaskMemFree &&
 -    prepend avconv_libs $($ldflags_filter "-lole32") &&
 +enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
 +
 +
 +if test $target_os = "haiku"; then
 +    disable memalign
 +    disable posix_memalign
 +fi
 +
 +enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
 +    prepend ffmpeg_libs $($ldflags_filter "-lole32") &&
      enable dxva2_lib
  
  ! enabled_any memalign posix_memalign aligned_malloc &&
 -    enabled $simd_align_16 && enable memalign_hack
 +    enabled simd_align_16 && 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
  
  map 'enabled $v && intrinsics=${v#intrinsics_}' $INTRINSICS_LIST
  
  enabled zlib && add_cppflags -DZLIB_CONST
  
  # conditional library dependencies, in linking order
 +enabled aconvert_filter     && prepend avfilter_deps "swresample"
 +enabled amovie_filter       && prepend avfilter_deps "avformat avcodec"
 +enabled aresample_filter    && prepend avfilter_deps "swresample"
 +enabled asyncts_filter      && prepend avfilter_deps "avresample"
 +enabled atempo_filter       && prepend avfilter_deps "avcodec"
 +enabled ebur128_filter && enabled swresample && prepend avfilter_deps "swresample"
 +enabled elbg_filter         && prepend avfilter_deps "avcodec"
 +enabled mcdeint_filter      && prepend avfilter_deps "avcodec"
  enabled movie_filter    && prepend avfilter_deps "avformat avcodec"
 +enabled mp_filter           && prepend avfilter_deps "avcodec"
 +enabled pan_filter          && prepend avfilter_deps "swresample"
 +enabled pp_filter           && prepend avfilter_deps "postproc"
 +enabled removelogo_filter   && prepend avfilter_deps "avformat avcodec swscale"
  enabled resample_filter && prepend avfilter_deps "avresample"
 +enabled sab_filter          && prepend avfilter_deps "swscale"
  enabled scale_filter    && prepend avfilter_deps "swscale"
 +enabled showspectrum_filter && prepend avfilter_deps "avcodec"
 +enabled smartblur_filter    && prepend avfilter_deps "swscale"
 +enabled subtitles_filter    && prepend avfilter_deps "avformat avcodec"
  
 -enabled opus_decoder    && prepend avcodec_deps "avresample"
 +enabled lavfi_indev         && prepend avdevice_deps "avfilter"
 +
 +enabled opus_decoder    && prepend avcodec_deps "swresample"
  
  expand_deps(){
      lib_deps=${1}_deps
      unique $lib_deps
  }
  
 +#we have to remove gpl from the deps here as some code assumes all lib deps are libs
 +postproc_deps="$(filter_out 'gpl' $postproc_deps)"
 +
  map 'expand_deps $v' $LIBRARY_LIST
  
  echo "install prefix            $prefix"
@@@ -5341,9 -4529,6 +5348,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
@@@ -5376,38 -4561,22 +5383,38 @@@ 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}"
      echo "PPC 4xx optimizations     ${ppc4xx-no}"
 +    echo "PPC VSX optimizations     ${vsx-no}"
      echo "dcbzl available           ${dcbzl-no}"
  fi
  echo "debug symbols             ${debug-no}"
 +echo "strip symbols             ${stripping-no}"
  echo "optimize for size         ${small-no}"
  echo "optimizations             ${optimizations-no}"
  echo "static                    ${static-no}"
  echo "shared                    ${shared-no}"
 +echo "postprocessing support    ${postproc-no}"
  echo "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 "texi2html enabled         ${texi2html-no}"
 +echo "perl enabled              ${perl-no}"
 +echo "pod2man enabled           ${pod2man-no}"
 +echo "makeinfo enabled          ${makeinfo-no}"
 +echo "makeinfo supports HTML    ${makeinfo_html-no}"
  test -n "$random_seed" &&
      echo "random seed               ${random_seed}"
  echo
  
  echo "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
@@@ -5458,14 -4623,10 +5465,14 @@@ 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
  INTRINSICS=$intrinsics
  CC=$cc
 +CXX=$cxx
  AS=$as
  LD=$ld
  DEPCC=$dep_cc
@@@ -5479,33 -4640,25 +5486,33 @@@ 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
 +WINDRES=$windres
 +DEPWINDRES=$dep_cc
 +DOXYGEN=$doxygen
  LDFLAGS=$LDFLAGS
  LDEXEFLAGS=$LDEXEFLAGS
  SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
 -STRIPFLAGS=$STRIPFLAGS
 +ASMSTRIPFLAGS=$ASMSTRIPFLAGS
  YASMFLAGS=$YASMFLAGS
  BUILDSUF=$build_suffix
 +PROGSSUF=$progs_suffix
  FULLNAME=$FULLNAME
  LIBPREF=$LIBPREF
  LIBSUF=$LIBSUF
@@@ -5515,7 -4668,6 +5522,7 @@@ SLIBSUF=$SLIBSU
  EXESUF=$EXESUF
  EXTRA_VERSION=$extra_version
  CCDEP=$CCDEP
 +CXXDEP=$CXXDEP
  CCDEP_FLAGS=$CCDEP_FLAGS
  ASDEP=$ASDEP
  ASDEP_FLAGS=$ASDEP_FLAGS
@@@ -5539,13 -4691,13 +5546,13 @@@ HOSTLD_O=$HOSTLD_
  TARGET_EXEC=$target_exec $target_exec_args
  TARGET_PATH=$target_path
  TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 -CFLAGS-avplay=$sdl_cflags
 +CFLAGS-ffplay=$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}
@@@ -5556,8 -4708,7 +5563,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(){
      name=$(toupper $lcname)
      file=$source_path/$lcname/version.h
      eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
 +    enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
      eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
      eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
      eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
@@@ -5585,26 -4735,18 +5592,26 @@@ map 'print_program_libs $v' $PROGRAM_LI
  
  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 2014
 +#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
  #define AVCONV_DATADIR "$(eval c_escape $datadir)"
  #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
 -#define restrict $_restrict
 +#define av_restrict $_restrict
  #define EXTERN_PREFIX "${extern_prefix}"
  #define EXTERN_ASM ${extern_prefix}
 +#define BUILDSUF "$build_suffix"
  #define SLIBSUF "$SLIBSUF"
 +#define HAVE_MMX2 HAVE_MMXEXT
 +#define SWS_MAX_FILTER_SIZE $sws_max_filter_size
  EOF
  
 +test -n "$assert_level" &&
 +    echo "#define ASSERT_LEVEL $assert_level" >>$TMPH
 +
  test -n "$malloc_prefix" &&
      echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH
  
  
  enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
  
 +
 +mkdir -p doc
 +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
@@@ -5646,15 -4783,12 +5653,15 @@@ 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
  
  lib_version(){
 -    eval printf "\"lib${1} >= \$LIB$(toupper ${1})_VERSION, \""
 +    eval printf "\"lib${1}${build_suffix} >= \$LIB$(toupper ${1})_VERSION, \""
  }
  
  pkgconfig_generate(){
      requires=${requires%, }
      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
@@@ -5679,36 -4813,30 +5686,36 @@@ 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
  }
  
 -pkgconfig_generate libavutil     "Libav utility library"          "$LIBAVUTIL_VERSION"     "$LIBM"
 -pkgconfig_generate libavcodec    "Libav codec library"            "$LIBAVCODEC_VERSION"    "$extralibs"
 -pkgconfig_generate libavformat   "Libav container format library" "$LIBAVFORMAT_VERSION"   "$extralibs"
 -pkgconfig_generate libavdevice   "Libav device handling library"  "$LIBAVDEVICE_VERSION"   "$extralibs"
 -pkgconfig_generate libavfilter   "Libav video filtering library"  "$LIBAVFILTER_VERSION"   "$extralibs"
 -pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$LIBM"
 -pkgconfig_generate libswscale    "Libav image rescaling library"  "$LIBSWSCALE_VERSION"    "$LIBM"
 +pkgconfig_generate libavutil     "FFmpeg utility library"               "$LIBAVUTIL_VERSION"     "$LIBM"
 +pkgconfig_generate libavcodec    "FFmpeg codec library"                 "$LIBAVCODEC_VERSION"    "$extralibs"
 +pkgconfig_generate libavformat   "FFmpeg container format library"      "$LIBAVFORMAT_VERSION"   "$extralibs"
 +pkgconfig_generate libavdevice   "FFmpeg device handling library"       "$LIBAVDEVICE_VERSION"   "$extralibs"
 +pkgconfig_generate libavfilter   "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION"   "$extralibs"
 +pkgconfig_generate libpostproc   "FFmpeg postprocessing library"        "$LIBPOSTPROC_VERSION"   ""
 +pkgconfig_generate libavresample "Libav audio resampling library"       "$LIBAVRESAMPLE_VERSION" "$LIBM"
 +pkgconfig_generate libswscale    "FFmpeg image rescaling library"       "$LIBSWSCALE_VERSION"    "$LIBM"
 +pkgconfig_generate libswresample "FFmpeg audio resampling library"      "$LIBSWRESAMPLE_VERSION" "$LIBM"
diff --combined libavcodec/Makefile
index b74d8b5085b0c2f9f6cd5f3c3bf2f8d809309eb6,178b61e53039837ca7f64d6d26a5c7e86b7c4b20..43d73a742ec42262dea26ff1d4cb284bbfdda844
@@@ -1,12 -1,9 +1,12 @@@
 +include $(SUBDIR)../config.mak
 +
  NAME = avcodec
  
  HEADERS = avcodec.h                                                     \
            avfft.h                                                       \
            dv_profile.h                                                  \
            dxva2.h                                                       \
 +          old_codec_ids.h                                               \
            vaapi.h                                                       \
            vda.h                                                         \
            vdpau.h                                                       \
@@@ -14,8 -11,6 +14,8 @@@
            xvmc.h                                                        \
  
  OBJS = allcodecs.o                                                      \
 +       audioconvert.o                                                   \
 +       avdct.o                                                          \
         avpacket.o                                                       \
         avpicture.o                                                      \
         bitstream.o                                                      \
         dv_profile.o                                                     \
         fmtconvert.o                                                     \
         imgconvert.o                                                     \
 -       log2_tab.o                                                       \
         mathtables.o                                                     \
         options.o                                                        \
         parser.o                                                         \
         raw.o                                                            \
 +       resample.o                                                       \
 +       resample2.o                                                      \
         utils.o                                                          \
  
  # subsystems
@@@ -40,15 -34,13 +40,16 @@@ OBJS-$(CONFIG_AUDIODSP)                
  OBJS-$(CONFIG_BLOCKDSP)                += blockdsp.o
  OBJS-$(CONFIG_BSWAPDSP)                += bswapdsp.o
  OBJS-$(CONFIG_CABAC)                   += cabac.o
 +OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
  OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
  OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
- OBJS-$(CONFIG_FDCTDSP)                 += fdctdsp.o faandct.o           \
-                                           jfdctfst.o jfdctint.o
 +OBJS-$(CONFIG_EXIF)                    += exif.o tiff_common.o
+ OBJS-$(CONFIG_FAANDCT)                 += faandct.o
+ OBJS-$(CONFIG_FAANIDCT)                += faanidct.o
+ OBJS-$(CONFIG_FDCTDSP)                 += fdctdsp.o jfdctfst.o jfdctint.o
  FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o cos_fixed_tables.o
  OBJS-$(CONFIG_FFT)                     += avfft.o fft_fixed.o fft_float.o \
 +                                          fft_fixed_32.o fft_init_table.o \
                                            $(FFT-OBJS-yes)
  OBJS-$(CONFIG_GOLOMB)                  += golomb.o
  OBJS-$(CONFIG_H263DSP)                 += h263dsp.o
@@@ -60,17 -52,14 +61,16 @@@ OBJS-$(CONFIG_HPELDSP)                 
  OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
  OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
  OBJS-$(CONFIG_HUFFYUVENCDSP)           += huffyuvencdsp.o
- OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o faanidct.o          \
-                                           simple_idct.o jrevdct.o
+ OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o simple_idct.o jrevdct.o
  OBJS-$(CONFIG_IIRFILTER)               += iirfilter.o
  OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o
  OBJS-$(CONFIG_LIBXVID)                 += libxvid_rc.o
 +OBJS-$(CONFIG_LLAUDDSP)                += lossless_audiodsp.o
 +OBJS-$(CONFIG_LLVIDDSP)                += lossless_videodsp.o
  OBJS-$(CONFIG_LPC)                     += lpc.o
  OBJS-$(CONFIG_LSP)                     += lsp.o
 -OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o
 -OBJS-$(CONFIG_ME_CMP)                  += me_cmp.o
 +OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o mdct_fixed_32.o
 +OBJS-$(CONFIG_ME_CMP)                  += me_cmp.o dsputil_compat.o
  OBJS-$(CONFIG_MPEG_ER)                 += mpeg_er.o
  OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodata.o   \
                                            mpegaudiodecheader.o
@@@ -88,7 -77,6 +88,7 @@@ OBJS-$(CONFIG_QPELDSP)                 
  OBJS-$(CONFIG_RANGECODER)              += rangecoder.o
  RDFT-OBJS-$(CONFIG_HARDCODED_TABLES)   += sin_tables.o
  OBJS-$(CONFIG_RDFT)                    += rdft.o $(RDFT-OBJS-yes)
 +OBJS-$(CONFIG_SHARED)                  += log2_tab.o
  OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
  OBJS-$(CONFIG_STARTCODE)               += startcode.o
  OBJS-$(CONFIG_TPELDSP)                 += tpeldsp.o
@@@ -97,7 -85,6 +97,7 @@@ OBJS-$(CONFIG_VP3DSP)                  
  OBJS-$(CONFIG_WMA_FREQS)               += wma_freqs.o
  
  # decoders/encoders
 +OBJS-$(CONFIG_ZERO12V_DECODER)         += 012v.o
  OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
  OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
  OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o aacsbr.o aacps.o \
@@@ -107,8 -94,7 +107,8 @@@ OBJS-$(CONFIG_AAC_ENCODER)             
                                            aacpsy.o aactab.o      \
                                            psymodel.o mpeg4audio.o kbdwin.o
  OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o
 -OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3dec_data.o ac3.o kbdwin.o
 +OBJS-$(CONFIG_AC3_DECODER)             += ac3dec_float.o ac3dec_data.o ac3.o kbdwin.o
 +OBJS-$(CONFIG_AC3_FIXED_DECODER)       += ac3dec_fixed.o ac3dec_data.o ac3.o kbdwin.o
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc_float.o ac3enc.o ac3tab.o \
                                            ac3.o kbdwin.o
  OBJS-$(CONFIG_AC3_FIXED_ENCODER)       += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o
@@@ -126,16 -112,10 +126,16 @@@ OBJS-$(CONFIG_AMRWB_DECODER)           
                                            celp_math.o acelp_filters.o \
                                            acelp_vectors.o             \
                                            acelp_pitch_delay.o
 +OBJS-$(CONFIG_AMV_ENCODER)             += mjpegenc.o mjpeg.o mjpegenc_common.o \
 +                                          mpegvideo_enc.o motion_est.o \
 +                                          ratecontrol.o mpeg12data.o   \
 +                                          mpegvideo.o
  OBJS-$(CONFIG_ANM_DECODER)             += anm.o
  OBJS-$(CONFIG_ANSI_DECODER)            += ansi.o cga_data.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o
 -OBJS-$(CONFIG_ASS_DECODER)             += assdec.o ass.o
 +OBJS-$(CONFIG_SSA_DECODER)             += assdec.o ass.o ass_split.o
 +OBJS-$(CONFIG_SSA_ENCODER)             += assenc.o ass.o
 +OBJS-$(CONFIG_ASS_DECODER)             += assdec.o ass.o ass_split.o
  OBJS-$(CONFIG_ASS_ENCODER)             += assenc.o ass.o
  OBJS-$(CONFIG_ASV1_DECODER)            += asvdec.o asv.o mpeg12data.o
  OBJS-$(CONFIG_ASV1_ENCODER)            += asvenc.o asv.o mpeg12data.o
@@@ -147,20 -127,12 +147,20 @@@ OBJS-$(CONFIG_ATRAC3P_DECODER)         
                                            atrac3plusdsp.o atrac.o
  OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
  OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
 +OBJS-$(CONFIG_AVRN_DECODER)            += avrndec.o mjpegdec.o mjpeg.o
 +OBJS-$(CONFIG_AVRP_DECODER)            += r210dec.o
 +OBJS-$(CONFIG_AVRP_ENCODER)            += r210enc.o
  OBJS-$(CONFIG_AVS_DECODER)             += avs.o
 +OBJS-$(CONFIG_AVUI_DECODER)            += avuidec.o
 +OBJS-$(CONFIG_AVUI_ENCODER)            += avuienc.o
 +OBJS-$(CONFIG_AYUV_DECODER)            += v408dec.o
 +OBJS-$(CONFIG_AYUV_ENCODER)            += v408enc.o
  OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.o
  OBJS-$(CONFIG_BFI_DECODER)             += bfi.o
  OBJS-$(CONFIG_BINK_DECODER)            += bink.o binkdsp.o
  OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER)   += binkaudio.o
  OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER)  += binkaudio.o
 +OBJS-$(CONFIG_BINTEXT_DECODER)         += bintext.o cga_data.o
  OBJS-$(CONFIG_BMP_DECODER)             += bmp.o msrledec.o
  OBJS-$(CONFIG_BMP_ENCODER)             += bmpenc.o
  OBJS-$(CONFIG_BMV_AUDIO_DECODER)       += bmvaudio.o
@@@ -172,30 -144,21 +172,30 @@@ OBJS-$(CONFIG_CAVS_DECODER)            
  OBJS-$(CONFIG_CDGRAPHICS_DECODER)      += cdgraphics.o
  OBJS-$(CONFIG_CDXL_DECODER)            += cdxl.o
  OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
 +OBJS-$(CONFIG_CINEPAK_ENCODER)         += cinepakenc.o elbg.o
  OBJS-$(CONFIG_CLJR_DECODER)            += cljrdec.o
  OBJS-$(CONFIG_CLJR_ENCODER)            += cljrenc.o
  OBJS-$(CONFIG_CLLC_DECODER)            += cllc.o
  OBJS-$(CONFIG_COOK_DECODER)            += cook.o
  OBJS-$(CONFIG_COMFORTNOISE_DECODER)    += cngdec.o celp_filters.o
  OBJS-$(CONFIG_COMFORTNOISE_ENCODER)    += cngenc.o
 +OBJS-$(CONFIG_CPIA_DECODER)            += cpia.o
  OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
  OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
  OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
                                            synth_filter.o
 +OBJS-$(CONFIG_DCA_ENCODER)             += dcaenc.o dca.o
 +OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o \
 +                                          dirac_arith.o mpeg12data.o dirac_dwt.o
  OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
  OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o
  OBJS-$(CONFIG_DPX_DECODER)             += dpx.o
  OBJS-$(CONFIG_DPX_ENCODER)             += dpxenc.o
 +OBJS-$(CONFIG_DSD_LSBF_DECODER)        += dsddec.o
 +OBJS-$(CONFIG_DSD_MSBF_DECODER)        += dsddec.o
 +OBJS-$(CONFIG_DSD_LSBF_PLANAR_DECODER) += dsddec.o
 +OBJS-$(CONFIG_DSD_MSBF_PLANAR_DECODER) += dsddec.o
  OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinaudio.o
  OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinvideo.o
  OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o
@@@ -219,17 -182,14 +219,17 @@@ OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER)    
  OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER)    += 8svx.o
  OBJS-$(CONFIG_ESCAPE124_DECODER)       += escape124.o
  OBJS-$(CONFIG_ESCAPE130_DECODER)       += escape130.o
 +OBJS-$(CONFIG_EVRC_DECODER)            += evrcdec.o acelp_vectors.o lsp.o
  OBJS-$(CONFIG_EXR_DECODER)             += exr.o
  OBJS-$(CONFIG_FFV1_DECODER)            += ffv1dec.o ffv1.o
  OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1enc.o ffv1.o
 +OBJS-$(CONFIG_FFWAVESYNTH_DECODER)     += ffwavesynth.o
  OBJS-$(CONFIG_FIC_DECODER)             += fic.o
  OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o flacdsp.o
 -OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o flacdsp.o
 +OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o flacdsp.o vorbis_data.o
  OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
  OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
 +OBJS-$(CONFIG_FLASHSV2_ENCODER)        += flashsv2enc.o
  OBJS-$(CONFIG_FLASHSV2_DECODER)        += flashsv.o
  OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
  OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
@@@ -237,9 -197,7 +237,9 @@@ OBJS-$(CONFIG_FRAPS_DECODER)           
  OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o
  OBJS-$(CONFIG_G2M_DECODER)             += g2meet.o mjpeg.o
  OBJS-$(CONFIG_G723_1_DECODER)          += g723_1.o acelp_vectors.o \
 -                                          celp_filters.o
 +                                          celp_filters.o celp_math.o
 +OBJS-$(CONFIG_G723_1_ENCODER)          += g723_1.o acelp_vectors.o celp_math.o
 +OBJS-$(CONFIG_G729_DECODER)            += g729dec.o lsp.o celp_math.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o
  OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
  OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
  OBJS-$(CONFIG_GSM_DECODER)             += gsmdec.o gsmdec_data.o msgsmdec.o
@@@ -255,7 -213,6 +255,7 @@@ OBJS-$(CONFIG_H264_DECODER)            
                                            h264_direct.o h264_loopfilter.o  \
                                            h264_mb.o h264_picture.o h264_ps.o \
                                            h264_refs.o h264_sei.o h264_slice.o
 +OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
  OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                            hevc_cabac.o hevc_refs.o hevcpred.o    \
                                            hevcdsp.o hevc_filter.o
@@@ -263,7 -220,6 +263,7 @@@ OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      
  OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
  OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
  OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
 +OBJS-$(CONFIG_IDF_DECODER)             += bintext.o cga_data.o
  OBJS-$(CONFIG_IFF_BYTERUN1_DECODER)    += iff.o
  OBJS-$(CONFIG_IFF_ILBM_DECODER)        += iff.o
  OBJS-$(CONFIG_IMC_DECODER)             += imc.o
@@@ -273,9 -229,6 +273,9 @@@ OBJS-$(CONFIG_INDEO4_DECODER)          
  OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi_common.o ivi_dsp.o
  OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
  OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
 +OBJS-$(CONFIG_JACOSUB_DECODER)         += jacosubdec.o ass.o
 +OBJS-$(CONFIG_JPEG2000_ENCODER)        += j2kenc.o mqcenc.o mqc.o jpeg2000.o \
 +                                          jpeg2000dwt.o
  OBJS-$(CONFIG_JPEG2000_DECODER)        += jpeg2000dec.o jpeg2000.o      \
                                            jpeg2000dwt.o mqcdec.o mqc.o
  OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.o jpegls.o
@@@ -291,7 -244,6 +291,7 @@@ OBJS-$(CONFIG_MACE6_DECODER)           
  OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_METASOUND_DECODER)       += metasound.o metasound_data.o \
                                            twinvq.o
 +OBJS-$(CONFIG_MICRODVD_DECODER)        += microdvddec.o ass.o
  OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
  OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
  OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mjpegenc_common.o
@@@ -299,14 -251,10 +299,14 @@@ OBJS-$(CONFIG_MJPEGB_DECODER)          
  OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlpdsp.o
  OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
  OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.o
 +OBJS-$(CONFIG_MOVTEXT_DECODER)         += movtextdec.o ass.o
 +OBJS-$(CONFIG_MOVTEXT_ENCODER)         += movtextenc.o ass_split.o
  OBJS-$(CONFIG_MP1_DECODER)             += mpegaudiodec_fixed.o
  OBJS-$(CONFIG_MP1FLOAT_DECODER)        += mpegaudiodec_float.o
  OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec_fixed.o
 -OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.o mpegaudio.o \
 +OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc_float.o mpegaudio.o \
 +                                          mpegaudiodata.o mpegaudiodsp_data.o
 +OBJS-$(CONFIG_MP2FIXED_ENCODER)        += mpegaudioenc_fixed.o mpegaudio.o \
                                            mpegaudiodata.o mpegaudiodsp_data.o
  OBJS-$(CONFIG_MP2FLOAT_DECODER)        += mpegaudiodec_float.o
  OBJS-$(CONFIG_MP3_DECODER)             += mpegaudiodec_fixed.o
@@@ -317,13 -265,12 +317,13 @@@ OBJS-$(CONFIG_MP3ON4_DECODER)          
  OBJS-$(CONFIG_MP3ON4FLOAT_DECODER)     += mpegaudiodec_float.o mpeg4audio.o
  OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o
  OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o
 -OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o
 +OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
  OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
  OBJS-$(CONFIG_MPEG4_DECODER)           += xvididct.o
 +OBJS-$(CONFIG_MPL2_DECODER)            += mpl2dec.o ass.o
  OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
  OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
  OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4enc.o msmpeg4.o msmpeg4data.o
@@@ -334,7 -281,6 +334,7 @@@ OBJS-$(CONFIG_MSA1_DECODER)            
  OBJS-$(CONFIG_MSS1_DECODER)            += mss1.o mss12.o
  OBJS-$(CONFIG_MSS2_DECODER)            += mss2.o mss12.o mss2dsp.o
  OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o
 +OBJS-$(CONFIG_MSVIDEO1_ENCODER)        += msvideo1enc.o elbg.o
  OBJS-$(CONFIG_MSZH_DECODER)            += lcldec.o
  OBJS-$(CONFIG_MTS2_DECODER)            += mss4.o mss34dsp.o
  OBJS-$(CONFIG_MVC1_DECODER)            += mvcdec.o
@@@ -361,16 -307,12 +361,16 @@@ OBJS-$(CONFIG_PGMYUV_DECODER)          
  OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.o
  OBJS-$(CONFIG_PGSSUB_DECODER)          += pgssubdec.o
  OBJS-$(CONFIG_PICTOR_DECODER)          += pictordec.o cga_data.o
 +OBJS-$(CONFIG_PJS_DECODER)             += textdec.o ass.o
  OBJS-$(CONFIG_PNG_DECODER)             += png.o pngdec.o pngdsp.o
  OBJS-$(CONFIG_PNG_ENCODER)             += png.o pngenc.o
  OBJS-$(CONFIG_PPM_DECODER)             += pnmdec.o pnm.o
  OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o
 -OBJS-$(CONFIG_PRORES_DECODER)          += proresdec.o proresdata.o proresdsp.o
 -OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc.o proresdata.o
 +OBJS-$(CONFIG_PRORES_DECODER)          += proresdec2.o proresdsp.o proresdata.o
 +OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += proresdec_lgpl.o proresdsp.o proresdata.o
 +OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc_anatoliy.o
 +OBJS-$(CONFIG_PRORES_AW_ENCODER)       += proresenc_anatoliy.o
 +OBJS-$(CONFIG_PRORES_KS_ENCODER)       += proresenc_kostya.o proresdata.o
  OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
  OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o                     \
                                            celp_filters.o acelp_vectors.o \
@@@ -381,16 -323,13 +381,16 @@@ OBJS-$(CONFIG_QPEG_DECODER)            
  OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
  OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.o
  OBJS-$(CONFIG_R10K_DECODER)            += r210dec.o
 +OBJS-$(CONFIG_R10K_ENCODER)            += r210enc.o
  OBJS-$(CONFIG_R210_DECODER)            += r210dec.o
 +OBJS-$(CONFIG_R210_ENCODER)            += r210enc.o
  OBJS-$(CONFIG_RA_144_DECODER)          += ra144dec.o ra144.o celp_filters.o
  OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp_filters.o
  OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o celp_filters.o
  OBJS-$(CONFIG_RALF_DECODER)            += ralf.o
  OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
  OBJS-$(CONFIG_RAWVIDEO_ENCODER)        += rawenc.o
 +OBJS-$(CONFIG_REALTEXT_DECODER)        += realtextdec.o ass.o
  OBJS-$(CONFIG_RL2_DECODER)             += rl2.o
  OBJS-$(CONFIG_ROQ_DECODER)             += roqvideodec.o roqvideo.o
  OBJS-$(CONFIG_ROQ_ENCODER)             += roqvideoenc.o roqvideo.o elbg.o
@@@ -403,9 -342,7 +403,9 @@@ OBJS-$(CONFIG_RV20_DECODER)            
  OBJS-$(CONFIG_RV20_ENCODER)            += rv20enc.o
  OBJS-$(CONFIG_RV30_DECODER)            += rv30.o rv34.o rv30dsp.o rv34dsp.o
  OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o rv34dsp.o rv40dsp.o
 +OBJS-$(CONFIG_SAMI_DECODER)            += samidec.o ass.o
  OBJS-$(CONFIG_S302M_DECODER)           += s302m.o
 +OBJS-$(CONFIG_S302M_ENCODER)           += s302menc.o
  OBJS-$(CONFIG_SANM_DECODER)            += sanm.o
  OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
  OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o
@@@ -418,45 -355,29 +418,45 @@@ OBJS-$(CONFIG_SIPR_DECODER)            
  OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.o
  OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.o
  OBJS-$(CONFIG_SMC_DECODER)             += smc.o
 +OBJS-$(CONFIG_SMVJPEG_DECODER)         += smvjpegdec.o
 +OBJS-$(CONFIG_SNOW_DECODER)            += snowdec.o snow.o snow_dwt.o
 +OBJS-$(CONFIG_SNOW_ENCODER)            += snowenc.o snow.o snow_dwt.o             \
 +                                          h263.o ituh263enc.o
  OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.o
 +OBJS-$(CONFIG_SONIC_DECODER)           += sonic.o
 +OBJS-$(CONFIG_SONIC_ENCODER)           += sonic.o
 +OBJS-$(CONFIG_SONIC_LS_ENCODER)        += sonic.o
  OBJS-$(CONFIG_SP5X_DECODER)            += sp5xdec.o
  OBJS-$(CONFIG_SRT_DECODER)             += srtdec.o ass.o
 +OBJS-$(CONFIG_SRT_ENCODER)             += srtenc.o ass_split.o
 +OBJS-$(CONFIG_SUBRIP_DECODER)          += srtdec.o ass.o
 +OBJS-$(CONFIG_SUBRIP_ENCODER)          += srtenc.o ass_split.o
 +OBJS-$(CONFIG_SUBVIEWER1_DECODER)      += textdec.o ass.o
 +OBJS-$(CONFIG_SUBVIEWER_DECODER)       += subviewerdec.o ass.o
  OBJS-$(CONFIG_SUNRAST_DECODER)         += sunrast.o
  OBJS-$(CONFIG_SUNRAST_ENCODER)         += sunrastenc.o
  OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o svq13.o h263.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o    \
                                            h263.o ituh263enc.o
  OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o
 +OBJS-$(CONFIG_TEXT_DECODER)            += textdec.o ass.o
  OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o
  OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
  OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
 +OBJS-$(CONFIG_TARGA_Y216_DECODER)      += targa_y216dec.o
  OBJS-$(CONFIG_THEORA_DECODER)          += xiph.o
  OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 -OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
 -OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o
 +OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o tiff_data.o tiff_common.o
 +OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o tiff_data.o
  OBJS-$(CONFIG_TMV_DECODER)             += tmv.o cga_data.o
 +OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.o mlpdsp.o
  OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
  OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
  OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
  OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o msrledec.o
  OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o
 -OBJS-$(CONFIG_TTA_DECODER)             += tta.o
 +OBJS-$(CONFIG_TTA_DECODER)             += tta.o ttadata.o ttadsp.o
 +OBJS-$(CONFIG_TTA_ENCODER)             += ttaenc.o ttadata.o
  OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvqdec.o twinvq.o
  OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o
  OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
@@@ -464,18 -385,13 +464,18 @@@ OBJS-$(CONFIG_UTVIDEO_DECODER)         
  OBJS-$(CONFIG_UTVIDEO_ENCODER)         += utvideoenc.o utvideo.o
  OBJS-$(CONFIG_V210_DECODER)            += v210dec.o
  OBJS-$(CONFIG_V210_ENCODER)            += v210enc.o
 +OBJS-$(CONFIG_V308_DECODER)            += v308dec.o
 +OBJS-$(CONFIG_V308_ENCODER)            += v308enc.o
 +OBJS-$(CONFIG_V408_DECODER)            += v408dec.o
 +OBJS-$(CONFIG_V408_ENCODER)            += v408enc.o
  OBJS-$(CONFIG_V410_DECODER)            += v410dec.o
  OBJS-$(CONFIG_V410_ENCODER)            += v410enc.o
  OBJS-$(CONFIG_V210X_DECODER)           += v210x.o
  OBJS-$(CONFIG_VB_DECODER)              += vb.o
  OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
  OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
 -                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o
 +                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o \
 +                                          wmv2dsp.o
  OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
  OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdaudio.o
  OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdvideo.o
@@@ -491,15 -407,11 +491,15 @@@ OBJS-$(CONFIG_VP6_DECODER)             
                                            vp6dsp.o vp56rac.o
  OBJS-$(CONFIG_VP7_DECODER)             += vp8.o vp8dsp.o vp56rac.o
  OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o vp56rac.o
 -OBJS-$(CONFIG_VP9_DECODER)             += vp9.o vp9data.o vp9dsp.o \
 -                                          vp9block.o vp9prob.o vp9mvs.o vp56rac.o
 +OBJS-$(CONFIG_VP9_DECODER)             += vp9.o vp9dsp.o vp56rac.o
 +OBJS-$(CONFIG_VPLAYER_DECODER)         += textdec.o ass.o
  OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
  OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 -OBJS-$(CONFIG_WEBP_DECODER)            += webp.o
 +OBJS-$(CONFIG_WAVPACK_ENCODER)         += wavpackenc.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += vp8.o vp8dsp.o vp56rac.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += webp.o exif.o tiff_common.o
 +OBJS-$(CONFIG_WEBVTT_DECODER)          += webvttdec.o ass.o
 +OBJS-$(CONFIG_WEBVTT_ENCODER)          += webvttenc.o ass_split.o
  OBJS-$(CONFIG_WMALOSSLESS_DECODER)     += wmalosslessdec.o wma_common.o
  OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o wma_common.o
  OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o wma_common.o aactab.o
@@@ -510,7 -422,6 +510,7 @@@ OBJS-$(CONFIG_WMAVOICE_DECODER)        
                                            celp_filters.o \
                                            acelp_vectors.o acelp_filters.o
  OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4dec.o msmpeg4.o msmpeg4data.o
 +OBJS-$(CONFIG_WMV1_ENCODER)            += msmpeg4enc.o
  OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \
                                            msmpeg4dec.o msmpeg4.o msmpeg4data.o
  OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
@@@ -520,21 -431,14 +520,21 @@@ OBJS-$(CONFIG_WS_SND1_DECODER)         
  OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o
  OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.o
  OBJS-$(CONFIG_XAN_WC4_DECODER)         += xxan.o
 +OBJS-$(CONFIG_XBIN_DECODER)            += bintext.o cga_data.o
  OBJS-$(CONFIG_XBM_DECODER)             += xbmdec.o
  OBJS-$(CONFIG_XBM_ENCODER)             += xbmenc.o
 +OBJS-$(CONFIG_XFACE_DECODER)           += xfacedec.o xface.o
 +OBJS-$(CONFIG_XFACE_ENCODER)           += xfaceenc.o xface.o
  OBJS-$(CONFIG_XL_DECODER)              += xl.o
  OBJS-$(CONFIG_XSUB_DECODER)            += xsubdec.o
  OBJS-$(CONFIG_XSUB_ENCODER)            += xsubenc.o
  OBJS-$(CONFIG_XWD_DECODER)             += xwddec.o
  OBJS-$(CONFIG_XWD_ENCODER)             += xwdenc.o
 +OBJS-$(CONFIG_Y41P_DECODER)            += y41pdec.o
 +OBJS-$(CONFIG_Y41P_ENCODER)            += y41penc.o
  OBJS-$(CONFIG_YOP_DECODER)             += yop.o
 +OBJS-$(CONFIG_YUV4_DECODER)            += yuv4dec.o
 +OBJS-$(CONFIG_YUV4_ENCODER)            += yuv4enc.o
  OBJS-$(CONFIG_ZEROCODEC_DECODER)       += zerocodec.o
  OBJS-$(CONFIG_ZLIB_DECODER)            += lcldec.o
  OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.o
@@@ -559,16 -463,12 +559,16 @@@ OBJS-$(CONFIG_PCM_MULAW_DECODER
  OBJS-$(CONFIG_PCM_MULAW_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S8_DECODER)             += pcm.o
  OBJS-$(CONFIG_PCM_S8_ENCODER)             += pcm.o
 -OBJS-$(CONFIG_PCM_S8_PLANAR_DECODER)      += 8svx.o
 +OBJS-$(CONFIG_PCM_S8_PLANAR_DECODER)      += pcm.o
 +OBJS-$(CONFIG_PCM_S8_PLANAR_ENCODER)      += pcm.o
  OBJS-$(CONFIG_PCM_S16BE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S16BE_ENCODER)          += pcm.o
 +OBJS-$(CONFIG_PCM_S16BE_PLANAR_DECODER)   += pcm.o
 +OBJS-$(CONFIG_PCM_S16BE_PLANAR_ENCODER)   += pcm.o
  OBJS-$(CONFIG_PCM_S16LE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S16LE_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)   += pcm.o
 +OBJS-$(CONFIG_PCM_S16LE_PLANAR_ENCODER)   += pcm.o
  OBJS-$(CONFIG_PCM_S24BE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S24BE_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S24DAUD_DECODER)        += pcm.o
@@@ -576,13 -476,11 +576,13 @@@ OBJS-$(CONFIG_PCM_S24DAUD_ENCODER
  OBJS-$(CONFIG_PCM_S24LE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S24LE_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S24LE_PLANAR_DECODER)   += pcm.o
 +OBJS-$(CONFIG_PCM_S24LE_PLANAR_ENCODER)   += pcm.o
  OBJS-$(CONFIG_PCM_S32BE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S32BE_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S32LE_DECODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S32LE_ENCODER)          += pcm.o
  OBJS-$(CONFIG_PCM_S32LE_PLANAR_DECODER)   += pcm.o
 +OBJS-$(CONFIG_PCM_S32LE_PLANAR_ENCODER)   += pcm.o
  OBJS-$(CONFIG_PCM_U8_DECODER)             += pcm.o
  OBJS-$(CONFIG_PCM_U8_ENCODER)             += pcm.o
  OBJS-$(CONFIG_PCM_U16BE_DECODER)          += pcm.o
@@@ -602,9 -500,7 +602,9 @@@ OBJS-$(CONFIG_PCM_ZORK_DECODER
  OBJS-$(CONFIG_ADPCM_4XM_DECODER)          += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_ADX_DECODER)          += adxdec.o adx.o
  OBJS-$(CONFIG_ADPCM_ADX_ENCODER)          += adxenc.o adx.o
 +OBJS-$(CONFIG_ADPCM_AFC_DECODER)          += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_CT_DECODER)           += adpcm.o adpcm_data.o
 +OBJS-$(CONFIG_ADPCM_DTK_DECODER)          += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_EA_DECODER)           += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_EA_MAXIS_XA_DECODER)  += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_EA_R1_DECODER)        += adpcm.o adpcm_data.o
@@@ -615,7 -511,6 +615,7 @@@ OBJS-$(CONFIG_ADPCM_G722_DECODER
  OBJS-$(CONFIG_ADPCM_G722_ENCODER)         += g722.o g722enc.o
  OBJS-$(CONFIG_ADPCM_G726_DECODER)         += g726.o
  OBJS-$(CONFIG_ADPCM_G726_ENCODER)         += g726.o
 +OBJS-$(CONFIG_ADPCM_G726LE_DECODER)       += g726.o
  OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER)      += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER)      += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER)      += adpcm.o adpcm_data.o
@@@ -623,10 -518,8 +623,10 @@@ OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER
  OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER)  += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER)  += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER)      += adpcm.o adpcm_data.o
 +OBJS-$(CONFIG_ADPCM_IMA_OKI_DECODER)      += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER)       += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER)       += adpcmenc.o adpcm_data.o
 +OBJS-$(CONFIG_ADPCM_IMA_RAD_DECODER)      += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER)   += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER)      += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER)      += adpcmenc.o adpcm_data.o
@@@ -643,7 -536,6 +643,7 @@@ OBJS-$(CONFIG_ADPCM_VIMA_DECODER
  OBJS-$(CONFIG_ADPCM_XA_DECODER)           += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)       += adpcm.o adpcm_data.o
  OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcmenc.o adpcm_data.o
 +OBJS-$(CONFIG_VIMA_DECODER)               += vima.o adpcm_data.o
  
  # hardware accelerators
  OBJS-$(CONFIG_DXVA2)                      += dxva2.o
@@@ -651,73 -543,61 +651,73 @@@ OBJS-$(CONFIG_VAAPI
  OBJS-$(CONFIG_VDA)                        += vda.o
  OBJS-$(CONFIG_VDPAU)                      += vdpau.o
  
 -OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
 +OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o vaapi_mpeg.o
  OBJS-$(CONFIG_H263_VDPAU_HWACCEL)         += vdpau_mpeg4.o
  OBJS-$(CONFIG_H264_DXVA2_HWACCEL)         += dxva2_h264.o
  OBJS-$(CONFIG_H264_VAAPI_HWACCEL)         += vaapi_h264.o
  OBJS-$(CONFIG_H264_VDA_HWACCEL)           += vda_h264.o
  OBJS-$(CONFIG_H264_VDPAU_HWACCEL)         += vdpau_h264.o
  OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL)        += vdpau_mpeg12.o
 +OBJS-$(CONFIG_MPEG1_XVMC_HWACCEL)         += mpegvideo_xvmc.o
  OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)        += dxva2_mpeg2.o
 -OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)        += vaapi_mpeg2.o
 +OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)        += vaapi_mpeg2.o vaapi_mpeg.o
  OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)        += vdpau_mpeg12.o
 -OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)        += vaapi_mpeg4.o
 +OBJS-$(CONFIG_MPEG2_XVMC_HWACCEL)         += mpegvideo_xvmc.o
 +OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)        += vaapi_mpeg4.o vaapi_mpeg.o
  OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL)        += vdpau_mpeg4.o
  OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
 -OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o
 +OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o vaapi_mpeg.o
  OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)          += vdpau_vc1.o
  
  # libavformat dependencies
  OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
  OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o  \
                                            ac3tab.o
 -OBJS-$(CONFIG_FLAC_DEMUXER)            += flac.o flacdata.o             \
 +OBJS-$(CONFIG_FLAC_DEMUXER)            += flac.o flacdata.o vorbis_data.o \
                                            vorbis_parser.o xiph.o
 -OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.o
 +OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.o vorbis_data.o
  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
  OBJS-$(CONFIG_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o           \
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o vorbis_data.o \
                                            flac.o flacdata.o
  OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o  \
                                            vorbis_parser.o xiph.o
  OBJS-$(CONFIG_MATROSKA_MUXER)          += mpeg4audio.o mpegaudiodata.o  \
 -                                          flac.o flacdata.o xiph.o
 +                                          flac.o flacdata.o vorbis_data.o xiph.o
  OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o ac3tab.o
  OBJS-$(CONFIG_MOV_MUXER)               += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
  OBJS-$(CONFIG_MPEGTS_DEMUXER)          += mpeg4audio.o mpegaudiodata.o
 +OBJS-$(CONFIG_MXF_MUXER)               += dnxhddata.o
  OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 +OBJS-$(CONFIG_OGA_MUXER)               += xiph.o flac.o flacdata.o
  OBJS-$(CONFIG_OGG_DEMUXER)             += xiph.o flac.o flacdata.o     \
                                            mpeg12data.o vorbis_parser.o \
 -                                          dirac.o
 -OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flac.o flacdata.o
 +                                          dirac.o vorbis_data.o
 +OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flac.o flacdata.o \
 +                                          vorbis_data.o
  OBJS-$(CONFIG_RTP_MUXER)               += mpeg4audio.o xiph.o
  OBJS-$(CONFIG_RTPDEC)                  += mjpeg.o
  OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o
  OBJS-$(CONFIG_SPDIF_MUXER)             += dca.o
  OBJS-$(CONFIG_TAK_DEMUXER)             += tak.o
  OBJS-$(CONFIG_WEBM_MUXER)              += mpeg4audio.o mpegaudiodata.o  \
 -                                          xiph.o flac.o flacdata.o
 +                                          xiph.o flac.o flacdata.o \
 +                                          vorbis_data.o
 +OBJS-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += vorbis_parser.o xiph.o
  OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
  
 +# libavfilter dependencies
 +OBJS-$(CONFIG_ELBG_FILTER)             += elbg.o
 +
  # external codec libraries
 +OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
 +OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
  OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
  OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
  OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
@@@ -741,19 -621,14 +741,19 @@@ OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER
                                               libschroedinger.o
  OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER)    += libschroedingerenc.o \
                                               libschroedinger.o
 +OBJS-$(CONFIG_LIBSHINE_ENCODER)           += libshine.o
  OBJS-$(CONFIG_LIBSPEEX_DECODER)           += libspeexdec.o
  OBJS-$(CONFIG_LIBSPEEX_ENCODER)           += libspeexenc.o
 +OBJS-$(CONFIG_LIBSTAGEFRIGHT_H264_DECODER)+= libstagefright.o
  OBJS-$(CONFIG_LIBTHEORA_ENCODER)          += libtheoraenc.o
  OBJS-$(CONFIG_LIBTWOLAME_ENCODER)         += libtwolame.o
 +OBJS-$(CONFIG_LIBUTVIDEO_DECODER)         += libutvideodec.o
 +OBJS-$(CONFIG_LIBUTVIDEO_ENCODER)         += libutvideoenc.o
  OBJS-$(CONFIG_LIBVO_AACENC_ENCODER)       += libvo-aacenc.o mpeg4audio.o
  OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)     += libvo-amrwbenc.o
 -OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o \
 -                                             vorbis_data.o vorbis_parser.o
 +OBJS-$(CONFIG_LIBVORBIS_DECODER)          += libvorbisdec.o
 +OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbisenc.o \
 +                                             vorbis_data.o vorbis_parser.o xiph.o
  OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
  OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)         += libvpxenc.o
  OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o libvpx.o
@@@ -764,7 -639,6 +764,7 @@@ OBJS-$(CONFIG_LIBX264_ENCODER
  OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
  OBJS-$(CONFIG_LIBXAVS_ENCODER)            += libxavs.o
  OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
 +OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER)   += libzvbi-teletextdec.o
  
  # parsers
  OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o \
@@@ -779,12 -653,9 +779,12 @@@ OBJS-$(CONFIG_COOK_PARSER)             
  OBJS-$(CONFIG_DCA_PARSER)              += dca_parser.o dca.o
  OBJS-$(CONFIG_DIRAC_PARSER)            += dirac_parser.o
  OBJS-$(CONFIG_DNXHD_PARSER)            += dnxhd_parser.o
 +OBJS-$(CONFIG_DPX_PARSER)              += dpx_parser.o
  OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsub_parser.o
 +OBJS-$(CONFIG_DVD_NAV_PARSER)          += dvd_nav_parser.o
  OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_parser.o
 -OBJS-$(CONFIG_FLAC_PARSER)             += flac_parser.o flacdata.o flac.o
 +OBJS-$(CONFIG_FLAC_PARSER)             += flac_parser.o flacdata.o flac.o \
 +                                          vorbis_data.o
  OBJS-$(CONFIG_GSM_PARSER)              += gsm_parser.o
  OBJS-$(CONFIG_H261_PARSER)             += h261_parser.o
  OBJS-$(CONFIG_H263_PARSER)             += h263_parser.o
@@@ -795,7 -666,6 +795,7 @@@ OBJS-$(CONFIG_MLP_PARSER)              
  OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \
                                            mpeg4videodec.o mpeg4video.o \
                                            ituh263dec.o h263dec.o
 +OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o
  OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o \
                                            mpegaudiodecheader.o mpegaudiodata.o
  OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o    \
@@@ -812,7 -682,6 +812,7 @@@ OBJS-$(CONFIG_VC1_PARSER)              
  OBJS-$(CONFIG_VORBIS_PARSER)           += vorbis_parser.o xiph.o
  OBJS-$(CONFIG_VP3_PARSER)              += vp3_parser.o
  OBJS-$(CONFIG_VP8_PARSER)              += vp8_parser.o
 +OBJS-$(CONFIG_VP9_PARSER)              += vp9_parser.o
  
  # bitstream filters
  OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o aacadtsdec.o \
@@@ -824,8 -693,6 +824,8 @@@ OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF
  OBJS-$(CONFIG_MJPEG2JPEG_BSF)             += mjpeg2jpeg_bsf.o mjpeg.o
  OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.o
  OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.o
 +OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.o \
 +                                             mpegaudiodata.o
  OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
  OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o
  OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
  OBJS-$(HAVE_LIBC_MSVCRT)               += file_open.o
  OBJS-$(HAVE_THREADS)                   += pthread.o pthread_slice.o pthread_frame.o
  
 +OBJS-$(CONFIG_FRAME_THREAD_ENCODER)    += frame_thread_encoder.o
 +
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)           += avcodecres.o
 +
  SKIPHEADERS                            += %_tablegen.h                  \
                                            %_tables.h                    \
                                            aac_tablegen_decl.h           \
                                            fft-internal.h                \
 +                                          libutvideo.h                  \
 +                                          old_codec_ids.h               \
                                            tableprint.h                  \
                                            $(ARCH)/vp56_arith.h          \
  
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 -SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 +SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
 +SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
  SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
  
 -TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed
 +TESTPROGS = imgconvert                                                  \
 +
 +TESTPROGS-$(CONFIG_CABAC)                 += cabac
 +TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed fft-fixed32
  TESTPROGS-$(CONFIG_IDCTDSP)               += dct
  TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
 +TESTPROGS-$(HAVE_MMX)                     += motion
  TESTPROGS-$(CONFIG_GOLOMB)                += golomb
  TESTPROGS-$(CONFIG_RANGECODER)            += rangecoder
 +TESTPROGS-$(CONFIG_SNOW_ENCODER)          += snowenc
  
  TESTOBJS = dctref.o
  
 +TOOLS = fourcc2pixfmt
 +
  HOSTPROGS = aac_tablegen                                                \
              aacps_tablegen                                              \
 +            aacsbr_tablegen                                             \
 +            cabac_tablegen                                              \
              cbrt_tablegen                                               \
              cos_tablegen                                                \
 +            dsd_tablegen                                                \
              dv_tablegen                                                 \
              motionpixels_tablegen                                       \
              mpegaudio_tablegen                                          \
@@@ -902,7 -751,7 +902,7 @@@ els
  $(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0
  endif
  
 -GEN_HEADERS = cbrt_tables.h aacps_tables.h aac_tables.h dv_tables.h     \
 +GEN_HEADERS = cabac_tables.h cbrt_tables.h aacps_tables.h aacsbr_tables.h aac_tables.h dsd_tables.h dv_tables.h     \
                sinewin_tables.h mpegaudio_tables.h motionpixels_tables.h \
                pcm_tables.h qdm2_tables.h
  GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS))
@@@ -913,10 -762,7 +913,10 @@@ $(GEN_HEADERS): $(SUBDIR)%_tables.h: $(
  ifdef CONFIG_HARDCODED_TABLES
  $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
  $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
 +$(SUBDIR)aacsbr.o: $(SUBDIR)aacsbr_tables.h
  $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
 +$(SUBDIR)cabac.o: $(SUBDIR)cabac_tables.h
 +$(SUBDIR)dsddec.o: $(SUBDIR)dsd_tables.h
  $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h
  $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
  $(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h
diff --combined libavcodec/dct-test.c
index f4f8abd309e69db93302fbb707a4d343d3b8eafc,32cbe8c52c5db13fd7172d1e40c514de92c3dd51..1739c37bee6e3524ccff66324b53ee4f231e9e01
@@@ -2,20 -2,20 +2,20 @@@
   * (c) 2001 Fabrice Bellard
   *     2007 Marc Hoffman <marc.hoffman@analog.com>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -58,30 -58,20 +58,34 @@@ struct algo 
  
  static const struct algo fdct_tab[] = {
      { "REF-DBL",     ff_ref_fdct,          FF_IDCT_PERM_NONE },
-     { "FAAN",        ff_faandct,           FF_IDCT_PERM_NONE },
      { "IJG-AAN-INT", ff_fdct_ifast,        FF_IDCT_PERM_NONE },
      { "IJG-LLM-INT", ff_jpeg_fdct_islow_8, FF_IDCT_PERM_NONE },
+ #if CONFIG_FAANDCT
+     { "FAAN",        ff_faandct,           FF_IDCT_PERM_NONE },
+ #endif /* CONFIG_FAANDCT */
  };
  
 +static void ff_prores_idct_wrap(int16_t *dst){
 +    DECLARE_ALIGNED(16, static int16_t, qmat)[64];
 +    int i;
 +
 +    for(i=0; i<64; i++){
 +        qmat[i]=4;
 +    }
 +    ff_prores_idct(dst, qmat);
 +    for(i=0; i<64; i++) {
 +         dst[i] -= 512;
 +    }
 +}
 +
  static const struct algo idct_tab[] = {
-     { "FAANI",       ff_faanidct,          FF_IDCT_PERM_NONE },
      { "REF-DBL",     ff_ref_idct,          FF_IDCT_PERM_NONE },
      { "INT",         ff_j_rev_dct,         FF_IDCT_PERM_LIBMPEG2 },
      { "SIMPLE-C",    ff_simple_idct_8,     FF_IDCT_PERM_NONE },
 +    { "PR-C",        ff_prores_idct_wrap,  FF_IDCT_PERM_NONE, 0, 1 },
+ #if CONFIG_FAANIDCT
+     { "FAANI",       ff_faanidct,          FF_IDCT_PERM_NONE },
+ #endif /* CONFIG_FAANIDCT */
  #if CONFIG_MPEG4_DECODER
      { "XVID",        ff_xvid_idct,         FF_IDCT_PERM_NONE, 0, 1 },
  #endif /* CONFIG_MPEG4_DECODER */
@@@ -106,7 -96,7 +110,7 @@@ static const struct algo idct_tab_arch[
  DECLARE_ALIGNED(16, static int16_t, block)[64];
  DECLARE_ALIGNED(8,  static int16_t, block1)[64];
  
 -static void init_block(int16_t block[64], int test, int is_idct, AVLFG *prng)
 +static void init_block(int16_t block[64], int test, int is_idct, AVLFG *prng, int vals)
  {
      int i, j;
  
      switch (test) {
      case 0:
          for (i = 0; i < 64; i++)
 -            block[i] = (av_lfg_get(prng) % 512) - 256;
 +            block[i] = (av_lfg_get(prng) % (2*vals)) -vals;
          if (is_idct) {
              ff_ref_fdct(block);
              for (i = 0; i < 64; i++)
          break;
      case 1:
          j = av_lfg_get(prng) % 10 + 1;
 -        for (i = 0; i < j; i++)
 -            block[av_lfg_get(prng) % 64] = av_lfg_get(prng) % 512 - 256;
 +        for (i = 0; i < j; i++) {
 +            int idx = av_lfg_get(prng) % 64;
 +            block[idx] = av_lfg_get(prng) % (2*vals) -vals;
 +        }
          break;
      case 2:
 -        block[ 0] = av_lfg_get(prng) % 4096 - 2048;
 +        block[ 0] = av_lfg_get(prng) % (16*vals) - (8*vals);
          block[63] = (block[0] & 1) ^ 1;
          break;
      }
@@@ -155,10 -143,6 +159,10 @@@ static void permute(int16_t dst[64], co
          for (i = 0; i < 64; i++)
              dst[(i & 0x24) | ((i & 3) << 3) | ((i >> 3) & 3)] = src[i];
          break;
 +    case FF_IDCT_PERM_TRANSPOSE:
 +        for (i = 0; i < 64; i++)
 +            dst[(i>>3) | ((i<<3)&0x38)] = src[i];
 +        break;
      default:
          for (i = 0; i < 64; i++)
              dst[i] = src[i];
      }
  }
  
 -static int dct_error(const struct algo *dct, int test, int is_idct, int speed)
 +static int dct_error(const struct algo *dct, int test, int is_idct, int speed, const int bits)
  {
      void (*ref)(int16_t *block) = is_idct ? ff_ref_idct : ff_ref_fdct;
      int it, i, scale;
      int maxout = 0;
      int blockSumErrMax = 0, blockSumErr;
      AVLFG prng;
 +    const int vals=1<<bits;
      double omse, ome;
      int spec_err;
  
      for (i = 0; i < 64; i++)
          sysErr[i] = 0;
      for (it = 0; it < NB_ITS; it++) {
 -        init_block(block1, test, is_idct, &prng);
 +        init_block(block1, test, is_idct, &prng, vals);
          permute(block, block1, dct->perm_type);
  
          dct->func(block);
          }
  
          ref(block1);
 +        if (!strcmp(dct->name, "PR-SSE2"))
 +            for (i = 0; i < 64; i++)
 +                block1[i] = av_clip(block1[i], 4-512, 1019-512);
  
          blockSumErr = 0;
          for (i = 0; i < 64; i++) {
  
      spec_err = is_idct && (err_inf > 1 || omse > 0.02 || fabs(ome) > 0.0015);
  
 -    printf("%s %s: ppe=%d omse=%0.8f ome=%0.8f syserr=%0.8f maxout=%d blockSumErr=%d\n",
 +    printf("%s %s: max_err=%d omse=%0.8f ome=%0.8f syserr=%0.8f maxout=%d blockSumErr=%d\n",
             is_idct ? "IDCT" : "DCT", dct->name, err_inf,
             omse, ome, (double) sysErrMax / NB_ITS,
             maxout, blockSumErrMax);
          return 0;
  
      /* speed test */
 -    init_block(block, test, is_idct, &prng);
 +
 +    init_block(block, test, is_idct, &prng, vals);
      permute(block1, block, dct->perm_type);
  
 -    ti = av_gettime();
 +    ti = av_gettime_relative();
      it1 = 0;
      do {
          for (it = 0; it < NB_ITS_SPEED; it++) {
              memcpy(block, block1, sizeof(block));
              dct->func(block);
          }
 +        emms_c();
          it1 += NB_ITS_SPEED;
 -        ti1 = av_gettime() - ti;
 +        ti1 = av_gettime_relative() - ti;
      } while (ti1 < 1000000);
 -    emms_c();
  
      printf("%s %s: %0.1f kdct/s\n", is_idct ? "IDCT" : "DCT", dct->name,
             (double) it1 * 1000.0 / (double) ti1);
@@@ -387,32 -366,13 +391,32 @@@ static void idct248_error(const char *n
              if (v > err_max)
                  err_max = v;
          }
 +#if 0
 +        printf("ref=\n");
 +        for(i=0;i<8;i++) {
 +            int j;
 +            for(j=0;j<8;j++) {
 +                printf(" %3d", img_dest1[i*8+j]);
 +            }
 +            printf("\n");
 +        }
 +
 +        printf("out=\n");
 +        for(i=0;i<8;i++) {
 +            int j;
 +            for(j=0;j<8;j++) {
 +                printf(" %3d", img_dest[i*8+j]);
 +            }
 +            printf("\n");
 +        }
 +#endif
      }
      printf("%s %s: err_inf=%d\n", 1 ? "IDCT248" : "DCT248", name, err_max);
  
      if (!speed)
          return;
  
 -    ti = av_gettime();
 +    ti = av_gettime_relative();
      it1 = 0;
      do {
          for (it = 0; it < NB_ITS_SPEED; it++) {
                  block[i] = block1[i];
              idct248_put(img_dest, 8, block);
          }
 +        emms_c();
          it1 += NB_ITS_SPEED;
 -        ti1 = av_gettime() - ti;
 +        ti1 = av_gettime_relative() - ti;
      } while (ti1 < 1000000);
 -    emms_c();
  
      printf("%s %s: %0.1f kdct/s\n", 1 ? "IDCT248" : "DCT248", name,
             (double) it1 * 1000.0 / (double) ti1);
  
  static void help(void)
  {
 -    printf("dct-test [-i] [<test-number>]\n"
 +    printf("dct-test [-i] [<test-number>] [<bits>]\n"
             "test-number 0 -> test with random matrixes\n"
             "            1 -> test with random sparse matrixes\n"
             "            2 -> do 3. test from mpeg4 std\n"
 +           "bits        Number of time domain bits to use, 8 is default\n"
             "-i          test IDCT implementations\n"
             "-4          test IDCT248 implementations\n"
             "-t          speed test\n");
@@@ -452,7 -411,6 +456,7 @@@ int main(int argc, char **argv
      int test = 1;
      int speed = 0;
      int err = 0;
 +    int bits=8;
  
      ff_ref_dct_init();
  
  
      if (optind < argc)
          test = atoi(argv[optind]);
 +    if(optind+1 < argc) bits= atoi(argv[optind+1]);
  
 -    printf("Libav DCT/IDCT test\n");
 +    printf("ffmpeg DCT/IDCT test\n");
  
      if (test_248_dct) {
          idct248_error("SIMPLE-C", ff_simple_idct248_put, speed);
          const int cpu_flags = av_get_cpu_flags();
          if (test_idct) {
              for (i = 0; i < FF_ARRAY_ELEMS(idct_tab); i++)
 -                err |= dct_error(&idct_tab[i], test, test_idct, speed);
 +                err |= dct_error(&idct_tab[i], test, test_idct, speed, bits);
  
              for (i = 0; idct_tab_arch[i].name; i++)
                  if (!(~cpu_flags & idct_tab_arch[i].cpu_flag))
 -                    err |= dct_error(&idct_tab_arch[i], test, test_idct, speed);
 +                    err |= dct_error(&idct_tab_arch[i], test, test_idct, speed, bits);
          }
  #if CONFIG_FDCTDSP
          else {
              for (i = 0; i < FF_ARRAY_ELEMS(fdct_tab); i++)
 -                err |= dct_error(&fdct_tab[i], test, test_idct, speed);
 +                err |= dct_error(&fdct_tab[i], test, test_idct, speed, bits);
  
              for (i = 0; fdct_tab_arch[i].name; i++)
                  if (!(~cpu_flags & fdct_tab_arch[i].cpu_flag))
 -                    err |= dct_error(&fdct_tab_arch[i], test, test_idct, speed);
 +                    err |= dct_error(&fdct_tab_arch[i], test, test_idct, speed, bits);
          }
  #endif /* CONFIG_FDCTDSP */
      }
diff --combined libavcodec/fdctdsp.c
index 80acca333d1624bd30024b3e039b0351863e90ce,f299eae27228e4932a1f8a07c247134130518902..c4b7358caf646de49037eb25993d59d61da24f81
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -33,9 -33,11 +33,11 @@@ av_cold void ff_fdctdsp_init(FDCTDSPCon
      } else if (avctx->dct_algo == FF_DCT_FASTINT) {
          c->fdct    = ff_fdct_ifast;
          c->fdct248 = ff_fdct_ifast248;
+ #if CONFIG_FAANDCT
      } else if (avctx->dct_algo == FF_DCT_FAAN) {
          c->fdct    = ff_faandct;
          c->fdct248 = ff_faandct248;
+ #endif /* CONFIG_FAANDCT */
      } else {
          c->fdct    = ff_jpeg_fdct_islow_8; // slow/accurate/default
          c->fdct248 = ff_fdct248_islow_8;
diff --combined libavcodec/idctdsp.c
index 19e81262613f6dae3eeb66d7764ed39f720b7081,a9b8727468ba31baad494f6edf780364c44ba8f9..75695ef437f9e517a5420d5ab09ddb7e1b468e3f
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -24,7 -24,6 +24,7 @@@
  #include "faanidct.h"
  #include "idctdsp.h"
  #include "simple_idct.h"
 +#include "xvididct.h"
  
  av_cold void ff_init_scantable(uint8_t *permutation, ScanTable *st,
                                 const uint8_t *src_scantable)
@@@ -83,7 -82,7 +83,7 @@@ av_cold void ff_init_scantable_permutat
  void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size);
  void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size);
  
 -static void put_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels,
 +static void put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,
                                   int line_size)
  {
      int i;
      }
  }
  
 +static void put_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels,
 +                                 int line_size)
 +{
 +    int i;
 +
 +    /* read the pixels */
 +    for(i=0;i<4;i++) {
 +        pixels[0] = av_clip_uint8(block[0]);
 +        pixels[1] = av_clip_uint8(block[1]);
 +        pixels[2] = av_clip_uint8(block[2]);
 +        pixels[3] = av_clip_uint8(block[3]);
 +
 +        pixels += line_size;
 +        block += 8;
 +    }
 +}
 +
 +static void put_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pixels,
 +                                 int line_size)
 +{
 +    int i;
 +
 +    /* read the pixels */
 +    for(i=0;i<2;i++) {
 +        pixels[0] = av_clip_uint8(block[0]);
 +        pixels[1] = av_clip_uint8(block[1]);
 +
 +        pixels += line_size;
 +        block += 8;
 +    }
 +}
 +
  static void put_signed_pixels_clamped_c(const int16_t *block,
 -                                        uint8_t *restrict pixels,
 +                                        uint8_t *av_restrict pixels,
                                          int line_size)
  {
      int i, j;
      }
  }
  
 -static void add_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels,
 +static void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,
                                   int line_size)
  {
      int i;
      }
  }
  
 +static void add_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels,
 +                          int line_size)
 +{
 +    int i;
 +
 +    /* read the pixels */
 +    for(i=0;i<4;i++) {
 +        pixels[0] = av_clip_uint8(pixels[0] + block[0]);
 +        pixels[1] = av_clip_uint8(pixels[1] + block[1]);
 +        pixels[2] = av_clip_uint8(pixels[2] + block[2]);
 +        pixels[3] = av_clip_uint8(pixels[3] + block[3]);
 +        pixels += line_size;
 +        block += 8;
 +    }
 +}
 +
 +static void add_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pixels,
 +                          int line_size)
 +{
 +    int i;
 +
 +    /* read the pixels */
 +    for(i=0;i<2;i++) {
 +        pixels[0] = av_clip_uint8(pixels[0] + block[0]);
 +        pixels[1] = av_clip_uint8(pixels[1] + block[1]);
 +        pixels += line_size;
 +        block += 8;
 +    }
 +}
 +
 +static void ff_jref_idct4_put(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    ff_j_rev_dct4 (block);
 +    put_pixels_clamped4_c(block, dest, line_size);
 +}
 +static void ff_jref_idct4_add(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    ff_j_rev_dct4 (block);
 +    add_pixels_clamped4_c(block, dest, line_size);
 +}
 +
 +static void ff_jref_idct2_put(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    ff_j_rev_dct2 (block);
 +    put_pixels_clamped2_c(block, dest, line_size);
 +}
 +static void ff_jref_idct2_add(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    ff_j_rev_dct2 (block);
 +    add_pixels_clamped2_c(block, dest, line_size);
 +}
 +
 +static void ff_jref_idct1_put(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    dest[0] = av_clip_uint8((block[0] + 4)>>3);
 +}
 +static void ff_jref_idct1_add(uint8_t *dest, int line_size, int16_t *block)
 +{
 +    dest[0] = av_clip_uint8(dest[0] + ((block[0] + 4)>>3));
 +}
 +
  av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
  {
      const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
  
 -    if (avctx->bits_per_raw_sample == 10) {
 -        c->idct_put  = ff_simple_idct_put_10;
 -        c->idct_add  = ff_simple_idct_add_10;
 -        c->idct      = ff_simple_idct_10;
 +    if (avctx->lowres==1) {
 +        c->idct_put  = ff_jref_idct4_put;
 +        c->idct_add  = ff_jref_idct4_add;
 +        c->idct      = ff_j_rev_dct4;
          c->perm_type = FF_IDCT_PERM_NONE;
 -    } else if (avctx->idct_algo == FF_IDCT_INT) {
 -        c->idct_put  = ff_jref_idct_put;
 -        c->idct_add  = ff_jref_idct_add;
 -        c->idct      = ff_j_rev_dct;
 -        c->perm_type = FF_IDCT_PERM_LIBMPEG2;
 -#if CONFIG_FAANIDCT
 -    } else if (avctx->idct_algo == FF_IDCT_FAAN) {
 -        c->idct_put  = ff_faanidct_put;
 -        c->idct_add  = ff_faanidct_add;
 -        c->idct      = ff_faanidct;
 +    } else if (avctx->lowres==2) {
 +        c->idct_put  = ff_jref_idct2_put;
 +        c->idct_add  = ff_jref_idct2_add;
 +        c->idct      = ff_j_rev_dct2;
          c->perm_type = FF_IDCT_PERM_NONE;
 -#endif /* CONFIG_FAANIDCT */
 -    } else { // accurate/default
 -        c->idct_put  = ff_simple_idct_put_8;
 -        c->idct_add  = ff_simple_idct_add_8;
 -        c->idct      = ff_simple_idct_8;
 +    } else if (avctx->lowres==3) {
 +        c->idct_put  = ff_jref_idct1_put;
 +        c->idct_add  = ff_jref_idct1_add;
 +        c->idct      = ff_j_rev_dct1;
          c->perm_type = FF_IDCT_PERM_NONE;
 +    } else {
 +        if (avctx->bits_per_raw_sample == 10) {
 +            c->idct_put              = ff_simple_idct_put_10;
 +            c->idct_add              = ff_simple_idct_add_10;
 +            c->idct                  = ff_simple_idct_10;
 +            c->perm_type             = FF_IDCT_PERM_NONE;
 +        } else if (avctx->bits_per_raw_sample == 12) {
 +            c->idct_put              = ff_simple_idct_put_12;
 +            c->idct_add              = ff_simple_idct_add_12;
 +            c->idct                  = ff_simple_idct_12;
 +            c->perm_type             = FF_IDCT_PERM_NONE;
 +        } else {
 +            if (avctx->idct_algo == FF_IDCT_INT) {
 +                c->idct_put  = ff_jref_idct_put;
 +                c->idct_add  = ff_jref_idct_add;
 +                c->idct      = ff_j_rev_dct;
 +                c->perm_type = FF_IDCT_PERM_LIBMPEG2;
++#if CONFIG_FAANIDCT
 +            } else if (avctx->idct_algo == FF_IDCT_FAAN) {
 +                c->idct_put  = ff_faanidct_put;
 +                c->idct_add  = ff_faanidct_add;
 +                c->idct      = ff_faanidct;
 +                c->perm_type = FF_IDCT_PERM_NONE;
++#endif /* CONFIG_FAANIDCT */
 +            } else { // accurate/default
 +                c->idct_put  = ff_simple_idct_put_8;
 +                c->idct_add  = ff_simple_idct_add_8;
 +                c->idct      = ff_simple_idct_8;
 +                c->perm_type = FF_IDCT_PERM_NONE;
 +            }
 +        }
      }
  
      c->put_pixels_clamped        = put_pixels_clamped_c;
      c->put_signed_pixels_clamped = put_signed_pixels_clamped_c;
      c->add_pixels_clamped        = add_pixels_clamped_c;
  
 -    ff_put_pixels_clamped = c->put_pixels_clamped;
 -    ff_add_pixels_clamped = c->add_pixels_clamped;
 +    if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID)
 +        ff_xvid_idct_init(c, avctx);
  
 +    if (ARCH_ALPHA)
 +        ff_idctdsp_init_alpha(c, avctx, high_bit_depth);
      if (ARCH_ARM)
          ff_idctdsp_init_arm(c, avctx, high_bit_depth);
      if (ARCH_PPC)
      if (ARCH_X86)
          ff_idctdsp_init_x86(c, avctx, high_bit_depth);
  
 +    ff_put_pixels_clamped = c->put_pixels_clamped;
 +    ff_add_pixels_clamped = c->add_pixels_clamped;
 +
      ff_init_scantable_permutation(c->idct_permutation,
                                    c->perm_type);
  }
index f0ae8c3dcb248b31026cf6c8cc1b3dcad6ab624a,17322e5046a08203b692c77ef3e00ed34bf0aa1e..40f82777c12976f0d4200a22671b7350f3a4e8cf
@@@ -5,20 -5,20 +5,20 @@@
   *
   * 4MV & hq & B-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
  #include "internal.h"
  #include "bytestream.h"
  #include <limits.h>
 +#include "sp5x.h"
  
  #define QUANT_BIAS_SHIFT 8
  
  #define QMAT_SHIFT_MMX 16
 -#define QMAT_SHIFT 22
 +#define QMAT_SHIFT 21
  
  static int encode_picture(MpegEncContext *s, int picture_number);
  static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
@@@ -90,8 -89,10 +90,10 @@@ void ff_convert_matrix(MpegEncContext *
      for (qscale = qmin; qscale <= qmax; qscale++) {
          int i;
          if (fdsp->fdct == ff_jpeg_fdct_islow_8  ||
-             fdsp->fdct == ff_jpeg_fdct_islow_10 ||
-             fdsp->fdct == ff_faandct) {
+ #if CONFIG_FAANDCT
+             fdsp->fdct == ff_faandct            ||
+ #endif /* CONFIG_FAANDCT */
+             fdsp->fdct == ff_jpeg_fdct_islow_10) {
              for (i = 0; i < 64; i++) {
                  const int j = s->idsp.idct_permutation[i];
                  /* 16 <= qscale * quant_matrix[i] <= 7905
                   *           3444240 >= (1 << 36) / (x) >= 275 */
  
                  qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT + 14)) /
 -                                        (ff_aanscales[i] * qscale *
 -                                         quant_matrix[j]));
 +                                        (ff_aanscales[i] * (int64_t)qscale * quant_matrix[j]));
              }
          } else {
              for (i = 0; i < 64; i++) {
@@@ -233,23 -235,6 +235,23 @@@ static void mpv_encode_defaults(MpegEnc
      s->picture_in_gop_number = 0;
  }
  
 +av_cold int ff_dct_encode_init(MpegEncContext *s) {
 +    if (ARCH_X86)
 +        ff_dct_encode_init_x86(s);
 +
 +    if (CONFIG_H263_ENCODER)
 +        ff_h263dsp_init(&s->h263dsp);
 +    if (!s->dct_quantize)
 +        s->dct_quantize = ff_dct_quantize_c;
 +    if (!s->denoise_dct)
 +        s->denoise_dct  = denoise_dct_c;
 +    s->fast_dct_quantize = s->dct_quantize;
 +    if (s->avctx->trellis)
 +        s->dct_quantize  = dct_quantize_trellis_c;
 +
 +    return 0;
 +}
 +
  /* init video encoder */
  av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
  {
          }
          break;
      case AV_CODEC_ID_MJPEG:
 +    case AV_CODEC_ID_AMV:
          format_supported = 0;
          /* JPEG color space */
          if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P ||
              avctx->pix_fmt == AV_PIX_FMT_YUVJ422P ||
 +            avctx->pix_fmt == AV_PIX_FMT_YUVJ444P ||
              (avctx->color_range == AVCOL_RANGE_JPEG &&
               (avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
 -              avctx->pix_fmt == AV_PIX_FMT_YUV422P)))
 +              avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
 +              avctx->pix_fmt == AV_PIX_FMT_YUV444P)))
              format_supported = 1;
          /* MPEG color space */
          else if (avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL &&
                   (avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
 -                  avctx->pix_fmt == AV_PIX_FMT_YUV422P))
 +                  avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
 +                  avctx->pix_fmt == AV_PIX_FMT_YUV444P))
              format_supported = 1;
  
          if (!format_supported) {
      }
  
      switch (avctx->pix_fmt) {
 +    case AV_PIX_FMT_YUVJ444P:
 +    case AV_PIX_FMT_YUV444P:
 +        s->chroma_format = CHROMA_444;
 +        break;
      case AV_PIX_FMT_YUVJ422P:
      case AV_PIX_FMT_YUV422P:
          s->chroma_format = CHROMA_422;
      s->height   = avctx->height;
      if (avctx->gop_size > 600 &&
          avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
 -        av_log(avctx, AV_LOG_ERROR,
 -               "Warning keyframe interval too large! reducing it ...\n");
 +        av_log(avctx, AV_LOG_WARNING,
 +               "keyframe interval too large!, reducing it from %d to %d\n",
 +               avctx->gop_size, 600);
          avctx->gop_size = 600;
      }
      s->gop_size     = avctx->gop_size;
      if (avctx->max_b_frames > MAX_B_FRAMES) {
          av_log(avctx, AV_LOG_ERROR, "Too many B-frames requested, maximum "
                 "is %d.\n", MAX_B_FRAMES);
 +        avctx->max_b_frames = MAX_B_FRAMES;
      }
      s->max_b_frames = avctx->max_b_frames;
      s->codec_id     = avctx->codec->id;
      s->mpeg_quant         = avctx->mpeg_quant;
      s->rtp_mode           = !!avctx->rtp_payload_size;
      s->intra_dc_precision = avctx->intra_dc_precision;
 +
 +    // workaround some differences between how applications specify dc precission
 +    if (s->intra_dc_precision < 0) {
 +        s->intra_dc_precision += 8;
 +    } else if (s->intra_dc_precision >= 8)
 +        s->intra_dc_precision -= 8;
 +
 +    if (s->intra_dc_precision < 0) {
 +        av_log(avctx, AV_LOG_ERROR,
 +                "intra dc precision must be positive, note some applications use"
 +                " 0 and some 8 as base meaning 8bit, the value must not be smaller than that\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) {
 +        av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n");
 +        return AVERROR(EINVAL);
 +    }
      s->user_specified_pts = AV_NOPTS_VALUE;
  
      if (s->gop_size <= 1) {
      s->loop_filter      = !!(s->flags & CODEC_FLAG_LOOP_FILTER);
  
      if (avctx->rc_max_rate && !avctx->rc_buffer_size) {
 -        av_log(avctx, AV_LOG_ERROR,
 -               "a vbv buffer size is needed, "
 -               "for encoding with a maximum bitrate\n");
 +        switch(avctx->codec_id) {
 +        case AV_CODEC_ID_MPEG1VIDEO:
 +        case AV_CODEC_ID_MPEG2VIDEO:
 +            avctx->rc_buffer_size = FFMAX(avctx->rc_max_rate, 15000000) * 112L / 15000000 * 16384;
 +            break;
 +        case AV_CODEC_ID_MPEG4:
 +        case AV_CODEC_ID_MSMPEG4V1:
 +        case AV_CODEC_ID_MSMPEG4V2:
 +        case AV_CODEC_ID_MSMPEG4V3:
 +            if       (avctx->rc_max_rate >= 15000000) {
 +                avctx->rc_buffer_size = 320 + (avctx->rc_max_rate - 15000000L) * (760-320) / (38400000 - 15000000);
 +            } else if(avctx->rc_max_rate >=  2000000) {
 +                avctx->rc_buffer_size =  80 + (avctx->rc_max_rate -  2000000L) * (320- 80) / (15000000 -  2000000);
 +            } else if(avctx->rc_max_rate >=   384000) {
 +                avctx->rc_buffer_size =  40 + (avctx->rc_max_rate -   384000L) * ( 80- 40) / ( 2000000 -   384000);
 +            } else
 +                avctx->rc_buffer_size = 40;
 +            avctx->rc_buffer_size *= 16384;
 +            break;
 +        }
 +        if (avctx->rc_buffer_size) {
 +            av_log(avctx, AV_LOG_INFO, "Automatically choosing VBV buffer size of %d kbyte\n", avctx->rc_buffer_size/8192);
 +        }
 +    }
 +
 +    if ((!avctx->rc_max_rate) != (!avctx->rc_buffer_size)) {
 +        av_log(avctx, AV_LOG_ERROR, "Either both buffer size and max rate or neither must be specified\n");
          return -1;
      }
  
      }
  
      if (avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate) {
 -        av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n");
 +        av_log(avctx, AV_LOG_ERROR, "bitrate above max bitrate\n");
          return -1;
      }
  
      if (!s->fixed_qscale &&
          avctx->bit_rate * av_q2d(avctx->time_base) >
              avctx->bit_rate_tolerance) {
 -        av_log(avctx, AV_LOG_ERROR,
 -               "bitrate tolerance too small for bitrate\n");
 -        return -1;
 +        av_log(avctx, AV_LOG_WARNING,
 +               "bitrate tolerance %d too small for bitrate %d, overriding\n", avctx->bit_rate_tolerance, avctx->bit_rate);
 +        avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base);
      }
  
      if (s->avctx->rc_max_rate &&
          av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n");
          return -1;
      }
 +    if (s->max_b_frames < 0) {
 +        av_log(avctx, AV_LOG_ERROR,
 +               "max b frames must be 0 or positive for mpegvideo based encoders\n");
 +        return -1;
 +    }
  
      if ((s->codec_id == AV_CODEC_ID_MPEG4 ||
           s->codec_id == AV_CODEC_ID_H263  ||
           s->codec_id == AV_CODEC_ID_H263P) &&
          (avctx->sample_aspect_ratio.num > 255 ||
           avctx->sample_aspect_ratio.den > 255)) {
 -        av_log(avctx, AV_LOG_ERROR,
 -               "Invalid pixel aspect ratio %i/%i, limit is 255/255\n",
 +        av_log(avctx, AV_LOG_WARNING,
 +               "Invalid pixel aspect ratio %i/%i, limit is 255/255 reducing\n",
                 avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
 +        av_reduce(&avctx->sample_aspect_ratio.num, &avctx->sample_aspect_ratio.den,
 +                   avctx->sample_aspect_ratio.num,  avctx->sample_aspect_ratio.den, 255);
 +    }
 +
 +    if ((s->codec_id == AV_CODEC_ID_H263  ||
 +         s->codec_id == AV_CODEC_ID_H263P) &&
 +        (avctx->width  > 2048 ||
 +         avctx->height > 1152 )) {
 +        av_log(avctx, AV_LOG_ERROR, "H.263 does not support resolutions above 2048x1152\n");
 +        return -1;
 +    }
 +    if ((s->codec_id == AV_CODEC_ID_H263  ||
 +         s->codec_id == AV_CODEC_ID_H263P) &&
 +        ((avctx->width &3) ||
 +         (avctx->height&3) )) {
 +        av_log(avctx, AV_LOG_ERROR, "w/h must be a multiple of 4\n");
 +        return -1;
 +    }
 +
 +    if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO &&
 +        (avctx->width  > 4095 ||
 +         avctx->height > 4095 )) {
 +        av_log(avctx, AV_LOG_ERROR, "MPEG-1 does not support resolutions above 4095x4095\n");
 +        return -1;
 +    }
 +
 +    if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO &&
 +        (avctx->width  > 16383 ||
 +         avctx->height > 16383 )) {
 +        av_log(avctx, AV_LOG_ERROR, "MPEG-2 does not support resolutions above 16383x16383\n");
          return -1;
      }
  
 +    if (s->codec_id == AV_CODEC_ID_RV10 &&
 +        (avctx->width &15 ||
 +         avctx->height&15 )) {
 +        av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 16\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if (s->codec_id == AV_CODEC_ID_RV20 &&
 +        (avctx->width &3 ||
 +         avctx->height&3 )) {
 +        av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 4\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if ((s->codec_id == AV_CODEC_ID_WMV1 ||
 +         s->codec_id == AV_CODEC_ID_WMV2) &&
 +         avctx->width & 1) {
 +         av_log(avctx, AV_LOG_ERROR, "width must be multiple of 2\n");
 +         return -1;
 +    }
 +
      if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME)) &&
          s->codec_id != AV_CODEC_ID_MPEG4 && s->codec_id != AV_CODEC_ID_MPEG2VIDEO) {
          av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
      }
  
      // FIXME mpeg2 uses that too
 -    if (s->mpeg_quant && s->codec_id != AV_CODEC_ID_MPEG4) {
 +    if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
 +                          && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
          av_log(avctx, AV_LOG_ERROR,
                 "mpeg2 style quantization not supported by codec\n");
          return -1;
          s->codec_id != AV_CODEC_ID_MPEG4      &&
          s->codec_id != AV_CODEC_ID_MPEG1VIDEO &&
          s->codec_id != AV_CODEC_ID_MPEG2VIDEO &&
 +        s->codec_id != AV_CODEC_ID_MJPEG      &&
          (s->codec_id != AV_CODEC_ID_H263P)) {
          av_log(avctx, AV_LOG_ERROR,
                 "multi threaded encoding not supported by codec\n");
  
      if (s->avctx->thread_count < 1) {
          av_log(avctx, AV_LOG_ERROR,
 -               "automatic thread number detection not supported by codec,"
 +               "automatic thread number detection not supported by codec, "
                 "patch welcome\n");
          return -1;
      }
  
 -    if (s->avctx->thread_count > 1)
 +    if (s->avctx->slices > 1 || s->avctx->thread_count > 1)
          s->rtp_mode = 1;
  
 +    if (s->avctx->thread_count > 1 && s->codec_id == AV_CODEC_ID_H263P)
 +        s->h263_slice_structured = 1;
 +
      if (!avctx->time_base.den || !avctx->time_base.num) {
          av_log(avctx, AV_LOG_ERROR, "framerate not set\n");
          return -1;
          //return -1;
      }
  
 -    if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG1VIDEO ||
 -        s->codec_id == AV_CODEC_ID_MPEG2VIDEO || s->codec_id == AV_CODEC_ID_MJPEG) {
 +    if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO || s->codec_id == AV_CODEC_ID_MJPEG || s->codec_id==AV_CODEC_ID_AMV) {
          // (a + x * 3 / 8) / x
          s->intra_quant_bias = 3 << (QUANT_BIAS_SHIFT - 3);
          s->inter_quant_bias = 0;
          s->inter_quant_bias = -(1 << (QUANT_BIAS_SHIFT - 2));
      }
  
 +    if (avctx->qmin > avctx->qmax || avctx->qmin <= 0) {
 +        av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are invalid, they must be 0 < min <= max\n");
 +        return AVERROR(EINVAL);
 +    }
 +
      if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
          s->intra_quant_bias = avctx->intra_quant_bias;
      if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
          s->inter_quant_bias = avctx->inter_quant_bias;
  
 +    av_log(avctx, AV_LOG_DEBUG, "intra_quant_bias = %d inter_quant_bias = %d\n",s->intra_quant_bias,s->inter_quant_bias);
 +
      if (avctx->codec_id == AV_CODEC_ID_MPEG4 &&
          s->avctx->time_base.den > (1 << 16) - 1) {
          av_log(avctx, AV_LOG_ERROR,
          s->rtp_mode   = 1;
          break;
      case AV_CODEC_ID_MJPEG:
 +    case AV_CODEC_ID_AMV:
          s->out_format = FMT_MJPEG;
          s->intra_only = 1; /* force intra only for jpeg */
          if (!CONFIG_MJPEG_ENCODER ||
          break;
      case AV_CODEC_ID_H263:
          if (!CONFIG_H263_ENCODER)
 -        return -1;
 +            return -1;
          if (ff_match_2uint16(ff_h263_format, FF_ARRAY_ELEMS(ff_h263_format),
                               s->width, s->height) == 8) {
 -            av_log(avctx, AV_LOG_INFO,
 +            av_log(avctx, AV_LOG_ERROR,
                     "The specified picture size of %dx%d is not valid for "
                     "the H.263 codec.\nValid sizes are 128x96, 176x144, "
 -                   "352x288, 704x576, and 1408x1152."
 +                   "352x288, 704x576, and 1408x1152. "
                     "Try H.263+.\n", s->width, s->height);
              return -1;
          }
      if (ff_mpv_common_init(s) < 0)
          return -1;
  
 -    if (ARCH_X86)
 -        ff_mpv_encode_init_x86(s);
 -
      ff_fdctdsp_init(&s->fdsp, avctx);
      ff_me_cmp_init(&s->mecc, avctx);
      ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
      FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail);
  
      FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix,   64 * 32 * sizeof(int), fail);
 +    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix, 64 * 32 * sizeof(int), fail);
      FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix,   64 * 32 * sizeof(int), fail);
      FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
 +    FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
      FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail);
      FF_ALLOCZ_OR_GOTO(s->avctx, s->input_picture,
                        MAX_PICTURE_COUNT * sizeof(Picture *), fail);
                            2 * 64 * sizeof(uint16_t), fail);
      }
  
 -    if (CONFIG_H263_ENCODER)
 -        ff_h263dsp_init(&s->h263dsp);
 -    if (!s->dct_quantize)
 -        s->dct_quantize = ff_dct_quantize_c;
 -    if (!s->denoise_dct)
 -        s->denoise_dct  = denoise_dct_c;
 -    s->fast_dct_quantize = s->dct_quantize;
 -    if (avctx->trellis)
 -        s->dct_quantize  = dct_quantize_trellis_c;
 +    ff_dct_encode_init(s);
  
      if ((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant)
          s->chroma_qscale_table = ff_h263_chroma_qscale_table;
@@@ -993,10 -867,6 +995,10 @@@ av_cold int ff_mpv_encode_end(AVCodecCo
      av_freep(&s->avctx->stats_out);
      av_freep(&s->ac_stats);
  
 +    if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
 +    if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
 +    s->q_chroma_intra_matrix=   NULL;
 +    s->q_chroma_intra_matrix16= NULL;
      av_freep(&s->q_intra_matrix);
      av_freep(&s->q_inter_matrix);
      av_freep(&s->q_intra_matrix16);
@@@ -1061,17 -931,18 +1063,17 @@@ static int load_input_picture(MpegEncCo
  
          if (pts != AV_NOPTS_VALUE) {
              if (s->user_specified_pts != AV_NOPTS_VALUE) {
 -                int64_t time = pts;
                  int64_t last = s->user_specified_pts;
  
 -                if (time <= last) {
 +                if (pts <= last) {
                      av_log(s->avctx, AV_LOG_ERROR,
 -                           "Error, Invalid timestamp=%"PRId64", "
 -                           "last=%"PRId64"\n", pts, s->user_specified_pts);
 -                    return -1;
 +                           "Invalid pts (%"PRId64") <= last (%"PRId64")\n",
 +                           pts, last);
 +                    return AVERROR(EINVAL);
                  }
  
                  if (!s->low_delay && display_picture_number == 1)
 -                    s->dts_delta = time - last;
 +                    s->dts_delta = pts - last;
              }
              s->user_specified_pts = pts;
          } else {
      }
  
      if (pic_arg) {
 -        if (!pic_arg->buf[0]);
 +        if (!pic_arg->buf[0])
              direct = 0;
          if (pic_arg->linesize[0] != s->linesize)
              direct = 0;
              direct = 0;
          if (pic_arg->linesize[2] != s->uvlinesize)
              direct = 0;
 +        if ((s->width & 15) || (s->height & 15))
 +            direct = 0;
 +        if (((intptr_t)(pic_arg->data[0])) & (STRIDE_ALIGN-1))
 +            direct = 0;
 +        if (s->linesize & (STRIDE_ALIGN-1))
 +            direct = 0;
  
 -        av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
 +        av_dlog(s->avctx, "%d %d %"PTRDIFF_SPECIFIER" %"PTRDIFF_SPECIFIER"\n", pic_arg->linesize[0],
                  pic_arg->linesize[1], s->linesize, s->uvlinesize);
  
          if (direct) {
                      int h = s->height >> v_shift;
                      uint8_t *src = pic_arg->data[i];
                      uint8_t *dst = pic->f->data[i];
 +                    int vpad = 16;
 +
 +                    if (   s->codec_id == AV_CODEC_ID_MPEG2VIDEO
 +                        && !s->progressive_sequence
 +                        && FFALIGN(s->height, 32) - s->height > 16)
 +                        vpad = 32;
  
                      if (!s->avctx->rc_buffer_size)
                          dst += INPLACE_OFFSET;
                      if (src_stride == dst_stride)
                          memcpy(dst, src, src_stride * h);
                      else {
 -                        while (h--) {
 -                            memcpy(dst, src, w);
 -                            dst += dst_stride;
 +                        int h2 = h;
 +                        uint8_t *dst2 = dst;
 +                        while (h2--) {
 +                            memcpy(dst2, src, w);
 +                            dst2 += dst_stride;
                              src += src_stride;
                          }
                      }
 +                    if ((s->width & 15) || (s->height & (vpad-1))) {
 +                        s->mpvencdsp.draw_edges(dst, dst_stride,
 +                                                w, h,
 +                                                16>>h_shift,
 +                                                vpad>>v_shift,
 +                                                EDGE_BOTTOM);
 +                    }
                  }
              }
          }
@@@ -1214,23 -1064,19 +1216,23 @@@ static int skip_check(MpegEncContext *s
                  uint8_t *rptr = ref->f->data[plane] + 8 * (x + y * stride);
                  int v = s->mecc.frame_skip_cmp[1](s, dptr, rptr, stride, 8);
  
 -                switch (s->avctx->frame_skip_exp) {
 +                switch (FFABS(s->avctx->frame_skip_exp)) {
                  case 0: score    =  FFMAX(score, v);          break;
                  case 1: score   += FFABS(v);                  break;
 -                case 2: score   += v * v;                     break;
 -                case 3: score64 += FFABS(v * v * (int64_t)v); break;
 -                case 4: score64 += v * v * (int64_t)(v * v);  break;
 +                case 2: score64 += v * (int64_t)v;                       break;
 +                case 3: score64 += FFABS(v * (int64_t)v * v);            break;
 +                case 4: score64 += (v * (int64_t)v) * (v * (int64_t)v);  break;
                  }
              }
          }
      }
 +    emms_c();
  
      if (score)
          score64 = score;
 +    if (s->avctx->frame_skip_exp < 0)
 +        score64 = pow(score64 / (double)(s->mb_width * s->mb_height),
 +                      -1.0/s->avctx->frame_skip_exp);
  
      if (score64 < s->avctx->frame_skip_threshold)
          return 1;
@@@ -1263,7 -1109,7 +1265,7 @@@ static int estimate_best_b_count(MpegEn
      int64_t best_rd  = INT64_MAX;
      int best_b_count = -1;
  
 -    assert(scale >= 0 && scale <= 3);
 +    av_assert0(scale >= 0 && scale <= 3);
  
      //emms_c();
      //s->next_picture_ptr->quality;
      for (i = 0; i < s->max_b_frames + 2; i++) {
          Picture pre_input, *pre_input_ptr = i ? s->input_picture[i - 1] :
                                                  s->next_picture_ptr;
 +        uint8_t *data[4];
  
          if (pre_input_ptr && (!i || s->input_picture[i - 1])) {
              pre_input = *pre_input_ptr;
 +            memcpy(data, pre_input_ptr->f->data, sizeof(data));
  
              if (!pre_input.shared && i) {
 -                pre_input.f->data[0] += INPLACE_OFFSET;
 -                pre_input.f->data[1] += INPLACE_OFFSET;
 -                pre_input.f->data[2] += INPLACE_OFFSET;
 +                data[0] += INPLACE_OFFSET;
 +                data[1] += INPLACE_OFFSET;
 +                data[2] += INPLACE_OFFSET;
              }
  
              s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[0],
                                         s->tmp_frames[i]->linesize[0],
 -                                       pre_input.f->data[0],
 +                                       data[0],
                                         pre_input.f->linesize[0],
                                         c->width, c->height);
              s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[1],
                                         s->tmp_frames[i]->linesize[1],
 -                                       pre_input.f->data[1],
 +                                       data[1],
                                         pre_input.f->linesize[1],
                                         c->width >> 1, c->height >> 1);
              s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[2],
                                         s->tmp_frames[i]->linesize[2],
 -                                       pre_input.f->data[2],
 +                                       data[2],
                                         pre_input.f->linesize[2],
                                         c->width >> 1, c->height >> 1);
          }
@@@ -1380,19 -1224,6 +1382,19 @@@ static int select_input_picture(MpegEnc
  
      /* set next picture type & ordering */
      if (!s->reordered_input_picture[0] && s->input_picture[0]) {
 +        if (s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor) {
 +            if (s->picture_in_gop_number < s->gop_size &&
 +                s->next_picture_ptr &&
 +                skip_check(s, s->input_picture[0], s->next_picture_ptr)) {
 +                // FIXME check that te gop check above is +-1 correct
 +                av_frame_unref(s->input_picture[0]->f);
 +
 +                ff_vbv_update(s, 0);
 +
 +                goto no_output_pic;
 +            }
 +        }
 +
          if (/*s->picture_in_gop_number >= s->gop_size ||*/
              !s->next_picture_ptr || s->intra_only) {
              s->reordered_input_picture[0] = s->input_picture[0];
          } else {
              int b_frames;
  
 -            if (s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor) {
 -                if (s->picture_in_gop_number < s->gop_size &&
 -                    skip_check(s, s->input_picture[0], s->next_picture_ptr)) {
 -                    // FIXME check that te gop check above is +-1 correct
 -                    av_frame_unref(s->input_picture[0]->f);
 -
 -                    emms_c();
 -                    ff_vbv_update(s, 0);
 -
 -                    goto no_output_pic;
 -                }
 -            }
 -
              if (s->flags & CODEC_FLAG_PASS2) {
                  for (i = 0; i < s->max_b_frames + 1; i++) {
                      int pict_num = s->input_picture[0]->f->display_picture_number + i;
@@@ -1550,26 -1394,25 +1552,26 @@@ no_output_pic
  
  static void frame_end(MpegEncContext *s)
  {
 -    int i;
 -
      if (s->unrestricted_mv &&
          s->current_picture.reference &&
          !s->intra_only) {
          const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
          int hshift = desc->log2_chroma_w;
          int vshift = desc->log2_chroma_h;
 -        s->mpvencdsp.draw_edges(s->current_picture.f->data[0], s->linesize,
 +        s->mpvencdsp.draw_edges(s->current_picture.f->data[0],
 +                                s->current_picture.f->linesize[0],
                                  s->h_edge_pos, s->v_edge_pos,
                                  EDGE_WIDTH, EDGE_WIDTH,
                                  EDGE_TOP | EDGE_BOTTOM);
 -        s->mpvencdsp.draw_edges(s->current_picture.f->data[1], s->uvlinesize,
 +        s->mpvencdsp.draw_edges(s->current_picture.f->data[1],
 +                                s->current_picture.f->linesize[1],
                                  s->h_edge_pos >> hshift,
                                  s->v_edge_pos >> vshift,
                                  EDGE_WIDTH >> hshift,
                                  EDGE_WIDTH >> vshift,
                                  EDGE_TOP | EDGE_BOTTOM);
 -        s->mpvencdsp.draw_edges(s->current_picture.f->data[2], s->uvlinesize,
 +        s->mpvencdsp.draw_edges(s->current_picture.f->data[2],
 +                                s->current_picture.f->linesize[2],
                                  s->h_edge_pos >> hshift,
                                  s->v_edge_pos >> vshift,
                                  EDGE_WIDTH >> hshift,
      if (s->pict_type!= AV_PICTURE_TYPE_B)
          s->last_non_b_pict_type = s->pict_type;
  
 -    if (s->encoding) {
 -        /* release non-reference frames */
 -        for (i = 0; i < MAX_PICTURE_COUNT; i++) {
 -            if (!s->picture[i].reference)
 -                ff_mpeg_unref_picture(s, &s->picture[i]);
 -        }
 -    }
 -
      s->avctx->coded_frame = s->current_picture_ptr->f;
  
  }
@@@ -1674,7 -1525,7 +1676,7 @@@ static int frame_start(MpegEncContext *
      }
  
      if (s->dct_error_sum) {
 -        assert(s->avctx->noise_reduction && s->encoding);
 +        av_assert2(s->avctx->noise_reduction && s->encoding);
          update_noise_reduction(s);
      }
  
@@@ -1699,7 -1550,8 +1701,7 @@@ int ff_mpv_encode_picture(AVCodecContex
  
      /* output? */
      if (s->new_picture.f->data[0]) {
 -        if (!pkt->data &&
 -            (ret = ff_alloc_packet(pkt, s->mb_width*s->mb_height*MAX_MB_BYTES)) < 0)
 +        if ((ret = ff_alloc_packet2(avctx, pkt, s->mb_width*s->mb_height*(MAX_MB_BYTES+100)+10000)) < 0)
              return ret;
          if (s->mb_info) {
              s->mb_info_ptr = av_packet_new_side_data(pkt,
@@@ -1777,16 -1629,14 +1779,16 @@@ vbv_retry
                  goto vbv_retry;
              }
  
 -            assert(s->avctx->rc_max_rate);
 +            av_assert0(s->avctx->rc_max_rate);
          }
  
          if (s->flags & CODEC_FLAG_PASS1)
              ff_write_pass1_stats(s);
  
          for (i = 0; i < 4; i++) {
 -            s->current_picture_ptr->f->error[i] = s->current_picture.f->error[i];
 +            s->current_picture_ptr->f->error[i] =
 +            s->current_picture.f->error[i] =
 +                s->current_picture.error[i];
              avctx->error[i] += s->current_picture_ptr->f->error[i];
          }
  
          s->frame_bits  = put_bits_count(&s->pb);
  
          stuffing_count = ff_vbv_update(s, s->frame_bits);
 +        s->stuffing_bits = 8*stuffing_count;
          if (stuffing_count) {
              if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) <
                      stuffing_count + 50) {
  
              vbv_delay = FFMAX(vbv_delay, min_delay);
  
 -            assert(vbv_delay < 0xFFFF);
 +            av_assert0(vbv_delay < 0xFFFF);
  
              s->vbv_delay_ptr[0] &= 0xF8;
              s->vbv_delay_ptr[0] |= vbv_delay >> 13;
      } else {
          s->frame_bits = 0;
      }
 -    assert((s->frame_bits & 7) == 0);
 +
 +    /* release non-reference frames */
 +    for (i = 0; i < MAX_PICTURE_COUNT; i++) {
 +        if (!s->picture[i].reference)
 +            ff_mpeg_unref_picture(s, &s->picture[i]);
 +    }
 +
 +    av_assert1((s->frame_bits & 7) == 0);
  
      pkt->size = s->frame_bits / 8;
      *got_packet = !!pkt->size;
@@@ -2012,17 -1854,15 +2014,17 @@@ static void get_visual_weight(int16_t *
  static av_always_inline void encode_mb_internal(MpegEncContext *s,
                                                  int motion_x, int motion_y,
                                                  int mb_block_height,
 +                                                int mb_block_width,
                                                  int mb_block_count)
  {
 -    int16_t weight[8][64];
 -    int16_t orig[8][64];
 +    int16_t weight[12][64];
 +    int16_t orig[12][64];
      const int mb_x = s->mb_x;
      const int mb_y = s->mb_y;
      int i;
 -    int skip_dct[8];
 +    int skip_dct[12];
      int dct_offset = s->linesize * 8; // default for progressive frames
 +    int uv_dct_offset = s->uvlinesize * 8;
      uint8_t *ptr_y, *ptr_cb, *ptr_cr;
      ptrdiff_t wrap_y, wrap_c;
  
      ptr_y  = s->new_picture.f->data[0] +
               (mb_y * 16 * wrap_y)              + mb_x * 16;
      ptr_cb = s->new_picture.f->data[1] +
 -             (mb_y * mb_block_height * wrap_c) + mb_x * 8;
 +             (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width;
      ptr_cr = s->new_picture.f->data[2] +
 -             (mb_y * mb_block_height * wrap_c) + mb_x * 8;
 +             (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width;
  
 -    if (mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) {
 -        uint8_t *ebuf = s->edge_emu_buffer + 32;
 +    if((mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){
 +        uint8_t *ebuf = s->edge_emu_buffer + 36 * wrap_y;
 +        int cw = (s->width  + s->chroma_x_shift) >> s->chroma_x_shift;
 +        int ch = (s->height + s->chroma_y_shift) >> s->chroma_y_shift;
          s->vdsp.emulated_edge_mc(ebuf, ptr_y,
                                   wrap_y, wrap_y,
                                   16, 16, mb_x * 16, mb_y * 16,
                                   s->width, s->height);
          ptr_y = ebuf;
 -        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y, ptr_cb,
 +        s->vdsp.emulated_edge_mc(ebuf + 16 * wrap_y, ptr_cb,
                                   wrap_c, wrap_c,
 -                                 8, mb_block_height, mb_x * 8, mb_y * 8,
 -                                 s->width >> 1, s->height >> 1);
 -        ptr_cb = ebuf + 18 * wrap_y;
 -        s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y + 8, ptr_cr,
 +                                 mb_block_width, mb_block_height,
 +                                 mb_x * mb_block_width, mb_y * mb_block_height,
 +                                 cw, ch);
 +        ptr_cb = ebuf + 16 * wrap_y;
 +        s->vdsp.emulated_edge_mc(ebuf + 16 * wrap_y + 16, ptr_cr,
                                   wrap_c, wrap_c,
 -                                 8, mb_block_height, mb_x * 8, mb_y * 8,
 -                                 s->width >> 1, s->height >> 1);
 -        ptr_cr = ebuf + 18 * wrap_y + 8;
 +                                 mb_block_width, mb_block_height,
 +                                 mb_x * mb_block_width, mb_y * mb_block_height,
 +                                 cw, ch);
 +        ptr_cr = ebuf + 16 * wrap_y + 16;
      }
  
      if (s->mb_intra) {
                      s->interlaced_dct = 1;
  
                      dct_offset = wrap_y;
 +                    uv_dct_offset = wrap_c;
                      wrap_y <<= 1;
 -                    if (s->chroma_format == CHROMA_422)
 +                    if (s->chroma_format == CHROMA_422 ||
 +                        s->chroma_format == CHROMA_444)
                          wrap_c <<= 1;
                  }
              }
          } else {
              s->pdsp.get_pixels(s->block[4], ptr_cb, wrap_c);
              s->pdsp.get_pixels(s->block[5], ptr_cr, wrap_c);
 -            if (!s->chroma_y_shift) { /* 422 */
 -                s->pdsp.get_pixels(s->block[6],
 -                                   ptr_cb + (dct_offset >> 1), wrap_c);
 -                s->pdsp.get_pixels(s->block[7],
 -                                   ptr_cr + (dct_offset >> 1), wrap_c);
 +            if (!s->chroma_y_shift && s->chroma_x_shift) { /* 422 */
 +                s->pdsp.get_pixels(s->block[6], ptr_cb + uv_dct_offset, wrap_c);
 +                s->pdsp.get_pixels(s->block[7], ptr_cr + uv_dct_offset, wrap_c);
 +            } else if (!s->chroma_y_shift && !s->chroma_x_shift) { /* 444 */
 +                s->pdsp.get_pixels(s->block[ 6], ptr_cb + 8, wrap_c);
 +                s->pdsp.get_pixels(s->block[ 7], ptr_cr + 8, wrap_c);
 +                s->pdsp.get_pixels(s->block[ 8], ptr_cb + uv_dct_offset, wrap_c);
 +                s->pdsp.get_pixels(s->block[ 9], ptr_cr + uv_dct_offset, wrap_c);
 +                s->pdsp.get_pixels(s->block[10], ptr_cb + uv_dct_offset + 8, wrap_c);
 +                s->pdsp.get_pixels(s->block[11], ptr_cr + uv_dct_offset + 8, wrap_c);
              }
          }
      } else {
                      s->interlaced_dct = 1;
  
                      dct_offset = wrap_y;
 +                    uv_dct_offset = wrap_c;
                      wrap_y <<= 1;
                      if (s->chroma_format == CHROMA_422)
                          wrap_c <<= 1;
              s->pdsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c);
              s->pdsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c);
              if (!s->chroma_y_shift) { /* 422 */
 -                s->pdsp.diff_pixels(s->block[6], ptr_cb + (dct_offset >> 1),
 -                                    dest_cb + (dct_offset >> 1), wrap_c);
 -                s->pdsp.diff_pixels(s->block[7], ptr_cr + (dct_offset >> 1),
 -                                    dest_cr + (dct_offset >> 1), wrap_c);
 +                s->pdsp.diff_pixels(s->block[6], ptr_cb + uv_dct_offset,
 +                                    dest_cb + uv_dct_offset, wrap_c);
 +                s->pdsp.diff_pixels(s->block[7], ptr_cr + uv_dct_offset,
 +                                    dest_cr + uv_dct_offset, wrap_c);
              }
          }
          /* pre quantization */
              if (s->mecc.sad[1](NULL, ptr_cr, dest_cr, wrap_c, 8) < 20 * s->qscale)
                  skip_dct[5] = 1;
              if (!s->chroma_y_shift) { /* 422 */
 -                if (s->mecc.sad[1](NULL, ptr_cb + (dct_offset >> 1),
 -                                   dest_cb + (dct_offset >> 1),
 +                if (s->mecc.sad[1](NULL, ptr_cb + uv_dct_offset,
 +                                   dest_cb + uv_dct_offset,
                                     wrap_c, 8) < 20 * s->qscale)
                      skip_dct[6] = 1;
 -                if (s->mecc.sad[1](NULL, ptr_cr + (dct_offset >> 1),
 -                                   dest_cr + (dct_offset >> 1),
 +                if (s->mecc.sad[1](NULL, ptr_cr + uv_dct_offset,
 +                                   dest_cr + uv_dct_offset,
                                     wrap_c, 8) < 20 * s->qscale)
                      skip_dct[7] = 1;
              }
              get_visual_weight(weight[5], ptr_cr                , wrap_c);
          if (!s->chroma_y_shift) { /* 422 */
              if (!skip_dct[6])
 -                get_visual_weight(weight[6], ptr_cb + (dct_offset >> 1),
 +                get_visual_weight(weight[6], ptr_cb + uv_dct_offset,
                                    wrap_c);
              if (!skip_dct[7])
 -                get_visual_weight(weight[7], ptr_cr + (dct_offset >> 1),
 +                get_visual_weight(weight[7], ptr_cr + uv_dct_offset,
                                    wrap_c);
          }
          memcpy(orig[0], s->block[0], sizeof(int16_t) * 64 * mb_block_count);
      }
  
      /* DCT & quantize */
 -    assert(s->out_format != FMT_MJPEG || s->qscale == 8);
 +    av_assert2(s->out_format != FMT_MJPEG || s->qscale == 8);
      {
          for (i = 0; i < mb_block_count; i++) {
              if (!skip_dct[i]) {
          s->block_last_index[5] = 0;
          s->block[4][0] =
          s->block[5][0] = (1024 + s->c_dc_scale / 2) / s->c_dc_scale;
 +        if (!s->chroma_y_shift) { /* 422 / 444 */
 +            for (i=6; i<12; i++) {
 +                s->block_last_index[i] = 0;
 +                s->block[i][0] = s->block[4][0];
 +            }
 +        }
      }
  
      // non c quantize code returns incorrect block_last_index FIXME
              ff_h263_encode_mb(s, s->block, motion_x, motion_y);
          break;
      case AV_CODEC_ID_MJPEG:
 +    case AV_CODEC_ID_AMV:
          if (CONFIG_MJPEG_ENCODER)
              ff_mjpeg_encode_mb(s, s->block);
          break;
      default:
 -        assert(0);
 +        av_assert1(0);
      }
  }
  
  static av_always_inline void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
  {
 -    if (s->chroma_format == CHROMA_420) encode_mb_internal(s, motion_x, motion_y,  8, 6);
 -    else                                encode_mb_internal(s, motion_x, motion_y, 16, 8);
 +    if (s->chroma_format == CHROMA_420) encode_mb_internal(s, motion_x, motion_y,  8, 8, 6);
 +    else if (s->chroma_format == CHROMA_422) encode_mb_internal(s, motion_x, motion_y, 16, 8, 8);
 +    else encode_mb_internal(s, motion_x, motion_y, 16, 16, 12);
  }
  
  static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){
@@@ -2484,7 -2304,7 +2486,7 @@@ static inline void encode_mb_hq(MpegEnc
          s->dest[0] = s->rd_scratchpad;
          s->dest[1] = s->rd_scratchpad + 16*s->linesize;
          s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8;
 -        assert(s->linesize >= 32); //FIXME
 +        av_assert0(s->linesize >= 32); //FIXME
      }
  
      encode_mb(s, motion_x, motion_y);
@@@ -2530,7 -2350,7 +2532,7 @@@ static int sse(MpegEncContext *s, uint8
          }
      }
  
 -    assert(acc>=0);
 +    av_assert2(acc>=0);
  
      return acc;
  }
@@@ -2580,8 -2400,6 +2582,8 @@@ static int pre_estimate_motion_thread(A
  static int estimate_motion_thread(AVCodecContext *c, void *arg){
      MpegEncContext *s= *(void**)arg;
  
 +    ff_check_alignment();
 +
      s->me.dia_size= s->avctx->dia_size;
      s->first_slice_line=1;
      for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
@@@ -2608,8 -2426,6 +2610,8 @@@ static int mb_var_thread(AVCodecContex
      MpegEncContext *s= *(void**)arg;
      int mb_x, mb_y;
  
 +    ff_check_alignment();
 +
      for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
          for(mb_x=0; mb_x < s->mb_width; mb_x++) {
              int xx = mb_x * 16;
@@@ -2637,7 -2453,7 +2639,7 @@@ static void write_slice_end(MpegEncCont
  
          ff_mpeg4_stuffing(&s->pb);
      }else if(CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG){
 -        ff_mjpeg_encode_stuffing(&s->pb);
 +        ff_mjpeg_encode_stuffing(s);
      }
  
      avpriv_align_put_bits(&s->pb);
@@@ -2701,8 -2517,6 +2703,8 @@@ static int encode_thread(AVCodecContex
      uint8_t bit_buf_tex[2][MAX_MB_BYTES];
      PutBitContext pb[2], pb2[2], tex_pb[2];
  
 +    ff_check_alignment();
 +
      for(i=0; i<2; i++){
          init_put_bits(&pb    [i], bit_buf    [i], MAX_MB_BYTES);
          init_put_bits(&pb2   [i], bit_buf2   [i], MAX_MB_BYTES);
          /* note: quant matrix value (8) is implied here */
          s->last_dc[i] = 128 << s->intra_dc_precision;
  
 -        s->current_picture.f->error[i] = 0;
 +        s->current_picture.error[i] = 0;
 +    }
 +    if(s->codec_id==AV_CODEC_ID_AMV){
 +        s->last_dc[0] = 128*8/13;
 +        s->last_dc[1] = 128*8/14;
 +        s->last_dc[2] = 128*8/14;
      }
      s->mb_skip_run = 0;
      memset(s->last_mv, 0, sizeof(s->last_mv));
              if(s->data_partitioning){
                  if(   s->pb2   .buf_end - s->pb2   .buf - (put_bits_count(&s->    pb2)>>3) < MAX_MB_BYTES
                     || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){
 -                    av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
 +                    av_log(s->avctx, AV_LOG_ERROR, "encoded partitioned frame too large\n");
                      return -1;
                  }
              }
                  if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1;
  
                  switch(s->codec_id){
 +                case AV_CODEC_ID_H261:
 +                    is_gob_start=0;//FIXME
 +                    break;
                  case AV_CODEC_ID_H263:
                  case AV_CODEC_ID_H263P:
                      if(!s->h263_slice_structured)
                  case AV_CODEC_ID_MPEG1VIDEO:
                      if(s->mb_skip_run) is_gob_start=0;
                      break;
 +                case AV_CODEC_ID_MJPEG:
 +                    if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1;
 +                    break;
                  }
  
                  if(is_gob_start){
                          }
                      }
  
 -                    assert((put_bits_count(&s->pb)&7) == 0);
 +                    av_assert2((put_bits_count(&s->pb)&7) == 0);
                      current_packet_size= put_bits_ptr(&s->pb) - s->ptr_lastgob;
  
                      if (s->error_rate && s->resync_mb_x + s->resync_mb_y > 0) {
                          int16_t ac[6][16];
                          const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0;
                          static const int dquant_tab[4]={-1,1,-2,2};
 +                        int storecoefs = s->mb_intra && s->dc_val[0];
  
 -                        assert(backup_s.dquant == 0);
 +                        av_assert2(backup_s.dquant == 0);
  
                          //FIXME intra
                          s->mv_dir= best_s.mv_dir;
                              if(qp < s->avctx->qmin || qp > s->avctx->qmax)
                                  continue;
                              backup_s.dquant= dquant;
 -                            if(s->mb_intra && s->dc_val[0]){
 +                            if(storecoefs){
                                  for(i=0; i<6; i++){
                                      dc[i]= s->dc_val[0][ s->block_index[i] ];
                                      memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(int16_t)*16);
                              encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb,
                                           &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]);
                              if(best_s.qscale != qp){
 -                                if(s->mb_intra && s->dc_val[0]){
 +                                if(storecoefs){
                                      for(i=0; i<6; i++){
                                          s->dc_val[0][ s->block_index[i] ]= dc[i];
                                          memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(int16_t)*16);
                  if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16;
                  if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16;
  
 -                s->current_picture.f->error[0] += sse(
 +                s->current_picture.error[0] += sse(
                      s, s->new_picture.f->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16,
                      s->dest[0], w, h, s->linesize);
 -                s->current_picture.f->error[1] += sse(
 +                s->current_picture.error[1] += sse(
                      s, s->new_picture.f->data[1] + s->mb_x*8  + s->mb_y*s->uvlinesize*chr_h,
                      s->dest[1], w>>1, h>>s->chroma_y_shift, s->uvlinesize);
 -                s->current_picture.f->error[2] += sse(
 +                s->current_picture.error[2] += sse(
                      s, s->new_picture.f->data[2] + s->mb_x*8  + s->mb_y*s->uvlinesize*chr_h,
                      s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize);
              }
@@@ -3353,9 -3155,9 +3355,9 @@@ static void merge_context_after_encode(
      MERGE(misc_bits);
      MERGE(er.error_count);
      MERGE(padding_bug_score);
 -    MERGE(current_picture.f->error[0]);
 -    MERGE(current_picture.f->error[1]);
 -    MERGE(current_picture.f->error[2]);
 +    MERGE(current_picture.error[0]);
 +    MERGE(current_picture.error[1]);
 +    MERGE(current_picture.error[2]);
  
      if(dst->avctx->noise_reduction){
          for(i=0; i<64; i++){
@@@ -3408,7 -3210,7 +3410,7 @@@ static int estimate_qp(MpegEncContext *
  
  /* must be called before writing the header */
  static void set_frame_distances(MpegEncContext * s){
 -    assert(s->current_picture_ptr->f->pts != AV_NOPTS_VALUE);
 +    av_assert1(s->current_picture_ptr->f->pts != AV_NOPTS_VALUE);
      s->time = s->current_picture_ptr->f->pts * s->avctx->time_base.num;
  
      if(s->pict_type==AV_PICTURE_TYPE_B){
@@@ -3464,13 -3266,6 +3466,13 @@@ static int encode_picture(MpegEncContex
          update_qscale(s);
      }
  
 +    if(s->codec_id != AV_CODEC_ID_AMV && s->codec_id != AV_CODEC_ID_MJPEG){
 +        if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
 +        if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
 +        s->q_chroma_intra_matrix   = s->q_intra_matrix;
 +        s->q_chroma_intra_matrix16 = s->q_intra_matrix16;
 +    }
 +
      s->mb_intra=0; //for the rate distortion & bit compare functions
      for(i=1; i<context_count; i++){
          ret = ff_update_duplicate_context(s->thread_context[i], s);
          s->pict_type= AV_PICTURE_TYPE_I;
          for(i=0; i<s->mb_stride*s->mb_height; i++)
              s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
 -        av_dlog(s, "Scene change detected, encoding as I Frame %d %d\n",
 +        if(s->msmpeg4_version >= 3)
 +            s->no_rounding=1;
 +        av_dlog(s, "Scene change detected, encoding as I Frame %"PRId64" %"PRId64"\n",
                  s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
      }
  
          s->qscale= 3; //reduce clipping problems
  
      if (s->out_format == FMT_MJPEG) {
 +        const uint16_t *  luma_matrix = ff_mpeg1_default_intra_matrix;
 +        const uint16_t *chroma_matrix = ff_mpeg1_default_intra_matrix;
 +
 +        if (s->avctx->intra_matrix) {
 +            chroma_matrix =
 +            luma_matrix = s->avctx->intra_matrix;
 +        }
 +        if (s->avctx->chroma_intra_matrix)
 +            chroma_matrix = s->avctx->chroma_intra_matrix;
 +
          /* for mjpeg, we do include qscale in the matrix */
          for(i=1;i<64;i++){
              int j = s->idsp.idct_permutation[i];
  
 -            s->intra_matrix[j] = av_clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
 +            s->chroma_intra_matrix[j] = av_clip_uint8((chroma_matrix[i] * s->qscale) >> 3);
 +            s->       intra_matrix[j] = av_clip_uint8((  luma_matrix[i] * s->qscale) >> 3);
          }
          s->y_dc_scale_table=
          s->c_dc_scale_table= ff_mpeg2_dc_scale_table[s->intra_dc_precision];
 +        s->chroma_intra_matrix[0] =
          s->intra_matrix[0] = ff_mpeg2_dc_scale_table[s->intra_dc_precision][8];
          ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
                         s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
 +        ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16,
 +                       s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1);
 +        s->qscale= 8;
 +    }
 +    if(s->codec_id == AV_CODEC_ID_AMV){
 +        static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13};
 +        static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14};
 +        for(i=1;i<64;i++){
 +            int j= s->idsp.idct_permutation[ff_zigzag_direct[i]];
 +
 +            s->intra_matrix[j] = sp5x_quant_table[5*2+0][i];
 +            s->chroma_intra_matrix[j] = sp5x_quant_table[5*2+1][i];
 +        }
 +        s->y_dc_scale_table= y;
 +        s->c_dc_scale_table= c;
 +        s->intra_matrix[0] = 13;
 +        s->chroma_intra_matrix[0] = 14;
 +        ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
 +                       s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
 +        ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16,
 +                       s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1);
          s->qscale= 8;
      }
  
      if (s->current_picture.f->key_frame)
          s->picture_in_gop_number=0;
  
 +    s->mb_x = s->mb_y = 0;
      s->last_bits= put_bits_count(&s->pb);
      switch(s->out_format) {
      case FMT_MJPEG:
          if (CONFIG_MJPEG_ENCODER)
              ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable,
 -                                           s->intra_matrix);
 +                                           s->intra_matrix, s->chroma_intra_matrix);
          break;
      case FMT_H261:
          if (CONFIG_H261_ENCODER)
              ff_mpeg1_encode_picture_header(s, picture_number);
          break;
      default:
 -        assert(0);
 +        av_assert0(0);
      }
      bits= put_bits_count(&s->pb);
      s->header_bits= bits - s->last_bits;
@@@ -3760,7 -3519,7 +3762,7 @@@ static int dct_quantize_trellis_c(MpegE
          block[0] = (block[0] + (q >> 1)) / q;
          start_i = 1;
          last_non_zero = 0;
 -        qmat = s->q_intra_matrix[qscale];
 +        qmat = n < 4 ? s->q_intra_matrix[qscale] : s->q_chroma_intra_matrix[qscale];
          if(s->mpeg_quant || s->out_format == FMT_MPEG1)
              bias= 1<<(QMAT_SHIFT-1);
          length     = s->intra_ac_vlc_length;
  //                coeff[2][k]= -level+2;
              }
              coeff_count[i]= FFMIN(level, 2);
 -            assert(coeff_count[i]);
 +            av_assert2(coeff_count[i]);
              max |=level;
          }else{
              coeff[0][i]= (level>>31)|1;
              const int alevel= FFABS(level);
              int unquant_coeff;
  
 -            assert(level);
 +            av_assert2(level);
  
 -            if(s->out_format == FMT_H263){
 +            if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                  unquant_coeff= alevel*qmul + qadd;
              }else{ //MPEG1
                  j = s->idsp.idct_permutation[scantable[i]]; // FIXME: optimize
                      }
                  }
  
 -                if(s->out_format == FMT_H263){
 +                if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                      for(j=survivor_count-1; j>=0; j--){
                          int run= i - survivor[j];
                          int score= distortion + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
                      }
                  }
  
 -                if(s->out_format == FMT_H263){
 +                if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                    for(j=survivor_count-1; j>=0; j--){
                          int run= i - survivor[j];
                          int score= distortion + score_tab[i-run];
          survivor[ survivor_count++ ]= i+1;
      }
  
 -    if(s->out_format != FMT_H263){
 +    if(s->out_format != FMT_H263 && s->out_format != FMT_H261){
          last_score= 256*256*256*120;
          for(i= survivor[0]; i<=last_non_zero + 1; i++){
              int score= score_tab[i];
              int alevel= FFABS(level);
              int unquant_coeff, score, distortion;
  
 -            if(s->out_format == FMT_H263){
 +            if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
                      unquant_coeff= (alevel*qmul + qadd)>>3;
              }else{ //MPEG1
                      unquant_coeff = (((  alevel  << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;
      }
  
      i= last_i;
 -    assert(last_level);
 +    av_assert2(last_level);
  
      block[ perm_scantable[last_non_zero] ]= last_level;
      i -= last_run + 1;
@@@ -4105,8 -3864,8 +4107,8 @@@ STOP_TIMER("memset rem[]")
          weight[i] = w;
  //        w=weight[i] = (63*qns + (w/2)) / w;
  
 -        assert(w>0);
 -        assert(w<(1<<6));
 +        av_assert2(w>0);
 +        av_assert2(w<(1<<6));
          sum += w*w;
      }
      lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6);
@@@ -4172,7 -3931,7 +4174,7 @@@ STOP_TIMER("dct")
              const int level= block[0];
              int change, old_coeff;
  
 -            assert(s->mb_intra);
 +            av_assert2(s->mb_intra);
  
              old_coeff= q*level;
  
              }else{
                  old_coeff=0;
                  run2--;
 -                assert(run2>=0 || i >= last_non_zero );
 +                av_assert2(run2>=0 || i >= last_non_zero );
              }
  
              for(change=-1; change<=1; change+=2){
                                           - last_length[UNI_AC_ENC_INDEX(run, level+64)];
                          }
                      }else{
 -                        assert(FFABS(new_level)==1);
 +                        av_assert2(FFABS(new_level)==1);
  
                          if(analyze_gradient){
                              int g= d1[ scantable[i] ];
                      }
                  }else{
                      new_coeff=0;
 -                    assert(FFABS(level)==1);
 +                    av_assert2(FFABS(level)==1);
  
                      if(i < last_non_zero){
                          int next_i= i + run2 + 1;
                  score *= lambda;
  
                  unquant_change= new_coeff - old_coeff;
 -                assert((score < 100*lambda && score > -100*lambda) || lambda==0);
 +                av_assert2((score < 100*lambda && score > -100*lambda) || lambda==0);
  
                  score += s->mpvencdsp.try_8x8basis(rem, weight, basis[j],
                                                     unquant_change);
@@@ -4338,7 -4097,7 +4340,7 @@@ STOP_TIMER("iterative step")
  
              if(best_coeff > last_non_zero){
                  last_non_zero= best_coeff;
 -                assert(block[j]);
 +                av_assert2(block[j]);
  #ifdef REFINE_STATS
  after_last++;
  #endif
@@@ -4366,7 -4125,7 +4368,7 @@@ if(block[j])
  #ifdef REFINE_STATS
  count++;
  if(256*256*256*64 % count == 0){
 -    printf("after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number);
 +    av_log(s->avctx, AV_LOG_DEBUG, "after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number);
  }
  #endif
              run=0;
@@@ -4429,7 -4188,7 +4431,7 @@@ int ff_dct_quantize_c(MpegEncContext *s
          block[0] = (block[0] + (q >> 1)) / q;
          start_i = 1;
          last_non_zero = 0;
 -        qmat = s->q_intra_matrix[qscale];
 +        qmat = n < 4 ? s->q_intra_matrix[qscale] : s->q_chroma_intra_matrix[qscale];
          bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
      } else {
          start_i = 0;