cmdutils: update year to 2013

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
update for 0.9.3
2025-12-06 14:59:59 +01:00 · 2013-09-23 00:08:48 +02:00 · 2013-09-23 00:02:30 +02:00 · 2013-09-23 00:02:30 +02:00 · 2013-09-23 00:02:30 +02:00 · 2013-09-23 00:02:30 +02:00
7716 changed files with 379242 additions and 1359139 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*.pnm -diff -text
-tests/ref/fate/sub-scc eol=crlf
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,53 @@
-*.a
+.config
+.version
 *.o
-*.o.*
 *.d
+*.exe
+*.ho
+*-example
+*-test
+*_g
 *.def
 *.dll
-*.dylib
-*.exe
-*.exp
-*.gcda
-*.gcno
-*.h.c
-*.ilk
 *.lib
-*.pc
-*.pdb
-*.so
-*.so.*
-*.swp
-*.ver
-*.version
-*.ptx
-*.ptx.c
-*_g
-\#*
-.\#*
-/.config
-/.version
-/ffmpeg
-/ffplay
-/ffprobe
-/config.asm
-/config.h
-/coverage.info
-/avversion.h
-/lcov/
-/src
-/mapfile
-/tools/python/__pycache__/
+*.exp
+config.*
+doc/*.1
+doc/*.html
+doc/*.pod
+doxy
+ffmpeg
+ffplay
+ffprobe
+ffserver
+avconv
+libavcodec/*_tablegen
+libavcodec/*_tables.c
+libavcodec/*_tables.h
+libavcodec/codec_names.h
+libavcodec/libavcodec*
+libavcore/libavcore*
+libavdevice/libavdevice*
+libavfilter/libavfilter*
+libavformat/libavformat*
+libavutil/avconfig.h
+libavutil/libavutil*
+libpostproc/libpostproc*
+libswresample/libswresample*
+libswscale/libswscale*
+tests/audiogen
+tests/base64
+tests/data
+tests/rotozoom
+tests/tiny_psnr
+tests/videogen
+tests/vsynth1
+tests/vsynth2
+tools/cws2fws
+tools/graph2dot
+tools/lavfi-showfiltfmts
+tools/pktdumper
+tools/probetest
+tools/qt-faststart
+tools/trasher
+version.h
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +0,0 @@
-language: c
-sudo: false
-os:
-  - linux
-  - osx
-addons:
-  apt:
-    packages:
-      - nasm
-      - diffutils
-compiler:
-  - clang
-  - gcc
-matrix:
-    exclude:
-        - os: osx
-          compiler: gcc
-cache:
-  directories:
-    - ffmpeg-samples
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
-script:
-  - mkdir -p ffmpeg-samples
-  - ./configure --samples=ffmpeg-samples --cc=$CC
-  - make -j 8
-  - make fate-rsync
-  - make check -j 8
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +0,0 @@
-# Note to Github users
-Patches should be submitted to the [ffmpeg-devel mailing list](https://ffmpeg.org/mailman/listinfo/ffmpeg-devel) using `git format-patch` or `git send-email`. Github pull requests should be avoided because they are not part of our review process and **will be ignored**.
-
-See [https://ffmpeg.org/developer.html#Contributing](https://ffmpeg.org/developer.html#Contributing) for more information.
--- a/COPYING.LGPLv2.1
+++ b/COPYING.LGPLv2.1
@@ -500,3 +500,5 @@ necessary.  Here is a sample; alter the names:
  Ty Coon, President of Vice

 That's all there is to it!
+
+
--- a/59
+++ b/59
@@ -1,6 +1,55 @@
-See the Git history of the project (git://source.ffmpeg.org/ffmpeg) to
-get the names of people who have contributed to FFmpeg.
+This file contains the names of some of the people who have contributed to
+FFmpeg. The names are sorted alphabetically by last name.  As this file is
+currently quite outdated and git serves as a much better tool for determining
+authorship, it remains here for historical reasons only.

-To check the log, you can type the command "git log" in the FFmpeg
-source directory, or browse the online repository at
-http://source.ffmpeg.org.
+Dénes Balatoni
+Michel Bardiaux
+Fabrice Bellard
+Patrice Bensoussan
+Alex Beregszaszi
+BERO
+Thilo Borgmann
+Mario Brito
+Ronald Bultje
+Alex Converse
+Maarten Daniels
+Reimar Doeffinger
+Tim Ferguson
+Brian Foley
+Arpad Gereoffy
+Philip Gladstone
+Vladimir Gneushev
+Roine Gustafsson
+David Hammerton
+Wolfgang Hesseler
+Marc Hoffman
+Falk Hueffner
+Aurélien Jacobs
+Steven Johnson
+Zdenek Kabelac
+Robin Kay
+Todd Kirby
+Nick Kurshev
+Benjamin Larsson
+Loïc Le Loarer
+Daniel Maas
+Mike Melanson
+Loren Merritt
+Jeff Muizelaar
+Michael Niedermayer
+François Revol
+Peter Ross
+Måns Rullgård
+Stefano Sabatini
+Roman Shaposhnik
+Oded Shimon
+Dieter Shirley
+Konstantin Shishkov
+Juan J. Sierralta
+Ewald Snel
+Sascha Sommer
+Leon van Stuivenberg
+Roberto Togni
+Lionel Ulmer
+Reynaldo Verdejo
--- a/976
+++ b/976
--- a/1642
+++ b/1642
--- a/15
+++ b/15
@@ -0,0 +1,15 @@
+
+1) Type './configure' to create the configuration. A list of configure
+options is printed by running 'configure --help'.
+
+'configure' can be launched from a directory different from the FFmpeg
+sources to build the objects out of tree. To do this, use an absolute
+path when launching 'configure', e.g. '/ffmpegdir/ffmpeg/configure'.
+
+2) Then type 'make' to build FFmpeg. GNU Make 3.81 or later is required.
+
+3) Type 'make install' to install all binaries and libraries you built.
+
+NOTICE
+
+ - Non system dependencies (e.g. libx264, libvpx) are disabled by default.
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,17 +0,0 @@
-## Installing FFmpeg
-
-1. Type `./configure` to create the configuration. A list of configure
-options is printed by running `configure --help`.
-
-    `configure` can be launched from a directory different from the FFmpeg
-sources to build the objects out of tree. To do this, use an absolute
-path when launching `configure`, e.g. `/ffmpegdir/ffmpeg/configure`.
-
-2. Then type `make` to build FFmpeg. GNU Make 3.81 or later is required.
-
-3. Type `make install` to install all binaries and libraries you built.
-
-NOTICE
------
-
- - Non system dependencies (e.g. libx264, libvpx) are disabled by default.
--- a/46
+++ b/46
@@ -0,0 +1,46 @@
+FFmpeg:
+-------
+
+Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
+or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
+files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
+FFmpeg.
+
+Some optional parts of FFmpeg are licensed under the GNU General Public License
+version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
+these parts are used by default, you have to explicitly pass --enable-gpl to
+configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
+
+Specifically, the GPL parts of FFmpeg are
+
+- libpostproc
+- optional x86 optimizations in the files
+  libavcodec/x86/idct_mmx.c
+- the X11 grabber in libavdevice/x11grab.c
+
+There are a handful of files under other licensing terms, namely:
+
+* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
+  are taken from libjpeg, see the top of the files for licensing details.
+
+Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
+the configure parameter --enable-version3 will activate this licensing option
+for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
+COPYING.GPLv3 to learn the exact legal terms that apply in this case.
+
+
+external libraries:
+-------------------
+
+Some external libraries, e.g. libx264, are under GPL and can be used in
+conjunction with FFmpeg. They require --enable-gpl to be passed to configure
+as well.
+
+The OpenCORE external libraries are under the Apache License 2.0. That license
+is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
+those licenses. So to combine the OpenCORE libraries with FFmpeg, the license
+version needs to be upgraded by passing --enable-version3 to configure.
+
+The nonfree external libraries libfaac and libaacplus can be hooked up in FFmpeg.
+You need to pass --enable-nonfree to configure to enable it. Employ this option
+with care as FFmpeg then becomes nonfree and unredistributable.
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,111 +0,0 @@
-# License
-
-Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
-or later (LGPL v2.1+). Read the file `COPYING.LGPLv2.1` for details. Some other
-files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
-FFmpeg.
-
-Some optional parts of FFmpeg are licensed under the GNU General Public License
-version 2 or later (GPL v2+). See the file `COPYING.GPLv2` for details. None of
-these parts are used by default, you have to explicitly pass `--enable-gpl` to
-configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
-
-Specifically, the GPL parts of FFmpeg are:
-
- libpostproc
- optional x86 optimization in the files
-    - `libavcodec/x86/flac_dsp_gpl.asm`
-    - `libavcodec/x86/idct_mmx.c`
-    - `libavfilter/x86/vf_removegrain.asm`
- the following building and testing tools
-    - `compat/solaris/make_sunver.pl`
-    - `doc/t2h.pm`
-    - `doc/texi2pod.pl`
-    - `libswresample/swresample-test.c`
-    - `tests/checkasm/*`
-    - `tests/tiny_ssim.c`
- the following filters in libavfilter:
-    - `vf_blackframe.c`
-    - `vf_boxblur.c`
-    - `vf_colormatrix.c`
-    - `vf_cover_rect.c`
-    - `vf_cropdetect.c`
-    - `vf_delogo.c`
-    - `vf_eq.c`
-    - `vf_find_rect.c`
-    - `vf_fspp.c`
-    - `vf_geq.c`
-    - `vf_histeq.c`
-    - `vf_hqdn3d.c`
-    - `vf_interlace.c`
-    - `vf_kerndeint.c`
-    - `vf_mcdeint.c`
-    - `vf_mpdecimate.c`
-    - `vf_owdenoise.c`
-    - `vf_perspective.c`
-    - `vf_phase.c`
-    - `vf_pp.c`
-    - `vf_pp7.c`
-    - `vf_pullup.c`
-    - `vf_repeatfields.c`
-    - `vf_sab.c`
-    - `vf_smartblur.c`
-    - `vf_spp.c`
-    - `vf_stereo3d.c`
-    - `vf_super2xsai.c`
-    - `vf_tinterlace.c`
-    - `vf_uspp.c`
-    - `vsrc_mptestsrc.c`
-
-Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
-the configure parameter `--enable-version3` will activate this licensing option
-for you. Read the file `COPYING.LGPLv3` or, if you have enabled GPL parts,
-`COPYING.GPLv3` to learn the exact legal terms that apply in this case.
-
-There are a handful of files under other licensing terms, namely:
-
-* The files `libavcodec/jfdctfst.c`, `libavcodec/jfdctint_template.c` and
-  `libavcodec/jrevdct.c` are taken from libjpeg, see the top of the files for
-  licensing details. Specifically note that you must credit the IJG in the
-  documentation accompanying your program if you only distribute executables.
-  You must also indicate any changes including additions and deletions to
-  those three files in the documentation.
-* `tests/reference.pnm` is under the expat license.
-
-
-## External libraries
-
-FFmpeg can be combined with a number of external libraries, which sometimes
-affect the licensing of binaries resulting from the combination.
-
-### Compatible libraries
-
-The following libraries are under GPL:
- frei0r
- libcdio
- librubberband
- libvidstab
- libx264
- libx265
- libxavs
- libxvid
-
-When combining them with FFmpeg, FFmpeg needs to be licensed as GPL as well by
-passing `--enable-gpl` to configure.
-
-The OpenCORE and VisualOn libraries are under the Apache License 2.0. That
-license is incompatible with the LGPL v2.1 and the GPL v2, but not with
-version 3 of those licenses. So to combine these libraries with FFmpeg, the
-license version needs to be upgraded by passing `--enable-version3` to configure.
-
-### Incompatible libraries
-
-There are certain libraries you can combine with FFmpeg whose licenses are not
-compatible with the GPL and/or the LGPL. If you wish to enable these
-libraries, even in circumstances that their license may be incompatible, pass
-`--enable-nonfree` to configure. This will cause the resulting binary to be
-unredistributable.
-
-The Fraunhofer FDK AAC and OpenSSL libraries are under licenses which are
-incompatible with the GPLv2 and v3. To the best of our knowledge, they are
-compatible with the LGPL.
--- a/448
+++ b/448
@@ -4,16 +4,17 @@ FFmpeg maintainers
 Below is a list of the people maintaining different parts of the
 FFmpeg code.

-Please try to keep entries where you are the maintainer up to date!
+Please try to keep entries where you are the maintainer upto date!

 Names in () mean that the maintainer currently has no time to maintain the code.
-A (CC <address>) after the name means that the maintainer prefers to be CC-ed on
-patches and related discussions.
+A CC after the name means that the maintainer prefers to be CC-ed on patches
+and related discussions.


 Project Leader
 ==============

+Michael Niedermayer
  final design decisions


@@ -29,6 +30,9 @@ ffplay:
 ffprobe:
  ffprobe.c                             Stefano Sabatini

+ffserver:
+  ffserver.c, ffserver.h                Baptiste Coudurier
+
 Commandline utility code:
  cmdutils.c, cmdutils.h                Michael Niedermayer

@@ -39,25 +43,14 @@ QuickTime faststart:
 Miscellaneous Areas
 ===================

-documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
+documentation                           Mike Melanson
+website                                 Robert Swain, Lou Logan
+build system (configure,Makefiles)      Diego Biurrun, Mans Rullgard
+project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Döffinger
+mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
-API tests                               Ludmila Glinskih
-
-
-Communication
-=============
-
-website                                 Deby Barbara Lepage
-fate.ffmpeg.org                         Timothy Gu
-Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos
-mailing lists                           Baptiste Coudurier
-Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
-Twitter                                 Lou Logan, Reynaldo H. Verdejo Pinochet
-Launchpad                               Timothy Gu
-ffmpeg-security                         Andreas Cadhalpun, Carl Eugen Hoyos, Clément Bœsch, Michael Niedermayer, Reimar Doeffinger, Rodger Combs, wm4


 libavutil
@@ -69,25 +62,11 @@ Internal Interfaces:
  libavutil/common.h                    Michael Niedermayer

 Other:
-  aes_ctr.c, aes_ctr.h                  Eran Kornblau
-  bprint                                Nicolas George
-  bswap.h
-  des                                   Reimar Doeffinger
-  dynarray.h                            Nicolas George
-  eval.c, eval.h                        Michael Niedermayer
-  float_dsp                             Loren Merritt
-  hash                                  Reimar Doeffinger
-  hwcontext_cuda*                       Timo Rothenpieler
  intfloat*                             Michael Niedermayer
-  integer.c, integer.h                  Michael Niedermayer
-  lzo                                   Reimar Doeffinger
-  mathematics.c, mathematics.h          Michael Niedermayer
-  mem.c, mem.h                          Michael Niedermayer
-  opencl.c, opencl.h                    Wei Gao
-  opt.c, opt.h                          Michael Niedermayer
  rational.c, rational.h                Michael Niedermayer
-  rc4                                   Reimar Doeffinger
-  ripemd.c, ripemd.h                    James Almer
+  mathematics.c, mathematics.h          Michael Niedermayer
+  integer.c, integer.h                  Michael Niedermayer
+  bswap.h


 libavcodec
@@ -98,14 +77,16 @@ Generic Parts:
    avcodec.h                           Michael Niedermayer
  utility code:
    utils.c                             Michael Niedermayer
+    mem.c                               Michael Niedermayer
+    opt.c, opt.h                        Michael Niedermayer
+  arithmetic expression evaluator:
+    eval.c                              Michael Niedermayer
  audio and video frame extraction:
    parser.c                            Michael Niedermayer
  bitstream reading:
    bitstream.c, bitstream.h            Michael Niedermayer
  CABAC:
    cabac.h, cabac.c                    Michael Niedermayer
-  codec names:
-    codec_names.sh                      Nicolas George
  DSP utilities:
    dsputils.c, dsputils.h              Michael Niedermayer
  entropy coding:
@@ -113,114 +94,104 @@ Generic Parts:
    lzw.*                               Michael Niedermayer
  floating point AAN DCT:
    faandct.c, faandct.h                Michael Niedermayer
-  Non-power-of-two MDCT:
-    mdct15.c, mdct15.h                  Rostislav Pehlivanov
  Golomb coding:
    golomb.c, golomb.h                  Michael Niedermayer
+  LPC:
+    lpc.c, lpc.h                        Justin Ruggles
  motion estimation:
    motion*                             Michael Niedermayer
  rate control:
    ratecontrol.c                       Michael Niedermayer
+    libxvid_rc.c                        Michael Niedermayer
  simple IDCT:
    simple_idct.c, simple_idct.h        Michael Niedermayer
  postprocessing:
    libpostproc/*                       Michael Niedermayer
  table generation:
    tableprint.c, tableprint.h          Reimar Doeffinger
-  fixed point FFT:
-    fft*                                Zeljko Lukac
-  Text Subtitles                        Clément Bœsch

 Codecs:
  4xm.c                                 Michael Niedermayer
  8bps.c                                Roberto Togni
  8svx.c                                Jaikrishnan Menon
-  aacenc*, aaccoder.c                   Rostislav Pehlivanov
+  aasc.c                                Kostya Shishkov
+  ac3*                                  Justin Ruggles
  alacenc.c                             Jaikrishnan Menon
-  alsdec.c                              Thilo Borgmann, Umair Khan
-  aptx.c                                Aurelien Jacobs
+  alsdec.c                              Thilo Borgmann
+  apedec.c                              Kostya Shishkov
  ass*                                  Aurelien Jacobs
  asv*                                  Michael Niedermayer
-  atrac3plus*                           Maxim Poliakovski
-  audiotoolbox*                         Rodger Combs
-  avs2*                                 Huiwen Ren
+  atrac3*                               Benjamin Larsson
  bgmc.c, bgmc.h                        Thilo Borgmann
+  bink.c                                Kostya Shishkov
  binkaudio.c                           Peter Ross
+  bmp.c                                 Mans Rullgard, Kostya Shishkov
  cavs*                                 Stefan Gehrer
-  cdxl.c                                Paul B Mahol
  celp_filters.*                        Vitor Sessak
  cinepak.c                             Roberto Togni
-  cinepakenc.c                          Rl / Aetey G.T. AB
-  ccaption_dec.c                        Anshul Maheshwari, Aman Gupta
  cljr                                  Alex Beregszaszi
-  cpia.c                                Stephan Hilb
+  cook.c, cookdata.h                    Benjamin Larsson
  crystalhd.c                           Philip Langdale
  cscd.c                                Reimar Doeffinger
-  cuviddec.c                            Timo Rothenpieler
-  dca*                                  foo86
-  dirac*                                Rostislav Pehlivanov
+  dca.c                                 Kostya Shishkov, Benjamin Larsson
  dnxhd*                                Baptiste Coudurier
-  dolby_e*                              foo86
  dpcm.c                                Mike Melanson
-  dss_sp.c                              Oleksij Rempel
+  dxa.c                                 Kostya Shishkov
  dv.c                                  Roman Shaposhnik
-  dvbsubdec.c                           Anshul Maheshwari
  eacmv*, eaidct*, eat*                 Peter Ross
-  evrc*                                 Paul B Mahol
-  exif.c, exif.h                        Thilo Borgmann
-  ffv1*                                 Michael Niedermayer
-  ffwavesynth.c                         Nicolas George
-  fifo.c                                Jan Sebechlebsky
+  ffv1.c                                Michael Niedermayer
+  flac*                                 Justin Ruggles
+  flashsv*                              Benjamin Larsson
  flicvideo.c                           Mike Melanson
  g722.c                                Martin Storsjo
  g726.c                                Roman Shaposhnik
  gifdec.c                              Baptiste Coudurier
+  h264*                                 Loren Merritt, Michael Niedermayer
  h261*                                 Michael Niedermayer
  h263*                                 Michael Niedermayer
-  h264*                                 Loren Merritt, Michael Niedermayer
-  hap*                                  Tom Butterworth
-  huffyuv*                              Michael Niedermayer
+  huffyuv.c                             Michael Niedermayer
  idcinvideo.c                          Mike Melanson
+  imc*                                  Benjamin Larsson
+  indeo2*                               Kostya Shishkov
+  indeo5*                               Kostya Shishkov
  interplayvideo.c                      Mike Melanson
-  jni*, ffjni*                          Matthieu Bouron
-  jpeg2000*                             Nicolas Bertrand
+  ivi*                                  Kostya Shishkov
+  jpeg_ls.c                             Kostya Shishkov
  jvdec.c                               Peter Ross
+  kmvc.c                                Kostya Shishkov
  lcl*.c                                Roberto Togni, Reimar Doeffinger
-  libcelt_dec.c                         Nicolas George
-  libcodec2.c                           Tomas Härdin
-  libdirac*                             David Conrad
-  libdavs2.c                            Huiwen Ren
  libgsm.c                              Michel Bardiaux
-  libkvazaar.c                          Arttu Ylä-Outinen
+  libdirac*                             David Conrad
  libopenjpeg.c                         Jaikrishnan Menon
  libopenjpegenc.c                      Michael Bradshaw
+  libschroedinger*                      David Conrad
+  libspeexdec.c                         Justin Ruggles
  libtheoraenc.c                        David Conrad
  libvorbis.c                           David Conrad
-  libvpx*                               James Zern
  libxavs.c                             Stefan Gehrer
-  libzvbi-teletextdec.c                 Marton Balint
+  libx264.c                             Mans Rullgard, Jason Garrett-Glaser
+  loco.c                                Kostya Shishkov
  lzo.h, lzo.c                          Reimar Doeffinger
  mdec.c                                Michael Niedermayer
  mimic.c                               Ramiro Polla
-  mjpeg*.c                              Michael Niedermayer
-  mlp*                                  Ramiro Polla, Jai Luthra
+  mjpeg.c                               Michael Niedermayer
+  mlp*                                  Ramiro Polla
  mmvideo.c                             Peter Ross
+  mpc*                                  Kostya Shishkov
  mpeg12.c, mpeg12data.h                Michael Niedermayer
  mpegvideo.c, mpegvideo.h              Michael Niedermayer
-  mqc*                                  Nicolas Bertrand
  msmpeg4.c, msmpeg4data.h              Michael Niedermayer
  msrle.c                               Mike Melanson
  msvideo1.c                            Mike Melanson
+  nellymoserdec.c                       Benjamin Larsson
  nuv.c                                 Reimar Doeffinger
-  nvdec*, nvenc*                        Timo Rothenpieler
-  opus*                                 Rostislav Pehlivanov
-  paf.*                                 Paul B Mahol
  pcx.c                                 Ivo van Poorten
  pgssubdec.c                           Reimar Doeffinger
  ptx.c                                 Ivo van Poorten
  qcelp*                                Reynaldo H. Verdejo Pinochet
-  qdm2.c, qdm2data.h                    Roberto Togni
-  qsv*                                  Mark Thompson, Zhong Li
+  qdm2.c, qdm2data.h                    Roberto Togni, Benjamin Larsson
+  qdrw.c                                Kostya Shishkov
+  qpeg.c                                Kostya Shishkov
  qtrle.c                               Mike Melanson
  ra144.c, ra144.h, ra288.c, ra288.h    Roberto Togni
  resample2.c                           Michael Niedermayer
@@ -228,51 +199,55 @@ Codecs:
  rpza.c                                Roberto Togni
  rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
  rv10.c                                Michael Niedermayer
+  rv3*                                  Kostya Shishkov
+  rv4*                                  Kostya Shishkov
  s3tc*                                 Ivo van Poorten
+  smacker.c                             Kostya Shishkov
  smc.c                                 Mike Melanson
-  smvjpegdec.c                          Ash Hughes
-  snow*                                 Michael Niedermayer, Loren Merritt
+  snow.c                                Michael Niedermayer, Loren Merritt
  sonic.c                               Alex Beregszaszi
-  speedhq.c                             Steinar H. Gunderson
  srt*                                  Aurelien Jacobs
  sunrast.c                             Ivo van Poorten
  svq3.c                                Michael Niedermayer
-  tak*                                  Paul B Mahol
+  targa.c                               Kostya Shishkov
+  tiff.c                                Kostya Shishkov
  truemotion1*                          Mike Melanson
+  truemotion2*                          Kostya Shishkov
+  truespeech.c                          Kostya Shishkov
+  tscc.c                                Kostya Shishkov
  tta.c                                 Alex Beregszaszi, Jaikrishnan Menon
-  ttaenc.c                              Paul B Mahol
  txd.c                                 Ivo van Poorten
-  v4l2_*                                Jorge Ramirez-Ortiz
-  vc2*                                  Rostislav Pehlivanov
+  ulti*                                 Kostya Shishkov
+  v410*.c                               Derek Buitenhuis
+  vb.c                                  Kostya Shishkov
+  vble.c                                Derek Buitenhuis
+  vc1*                                  Kostya Shishkov
  vcr1.c                                Michael Niedermayer
-  videotoolboxenc.c                     Rick Kern, Aman Gupta
-  vima.c                                Paul B Mahol
-  vorbisdec.c                           Denes Balatoni, David Conrad
-  vorbisenc.c                           Oded Shimon
+  vmnc.c                                Kostya Shishkov
+  vorbis_enc.c                          Oded Shimon
+  vorbis_dec.c                          Denes Balatoni, David Conrad
  vp3*                                  Mike Melanson
  vp5                                   Aurelien Jacobs
  vp6                                   Aurelien Jacobs
-  vp8                                   David Conrad, Ronald Bultje
-  vp9                                   Ronald Bultje
+  vp8                                   David Conrad, Jason Garrett-Glaser, Ronald Bultje
  vqavideo.c                            Mike Melanson
+  wavpack.c                             Kostya Shishkov
  wmaprodec.c                           Sascha Sommer
  wmavoice.c                            Ronald S. Bultje
  wmv2.c                                Michael Niedermayer
+  wnv1.c                                Kostya Shishkov
  xan.c                                 Mike Melanson
-  xbm*                                  Paul B Mahol
-  xface                                 Stefano Sabatini
+  xl.c                                  Kostya Shishkov
  xvmc.c                                Ivan Kalvachev
-  xwd*                                  Paul B Mahol
+  zmbv*                                 Kostya Shishkov

 Hardware acceleration:
  crystalhd.c                           Philip Langdale
-  dxva2*                                Hendrik Leppkes, Laurent Aimar, Steve Lhomme
-  d3d11va*                              Steve Lhomme
-  mediacodec*                           Matthieu Bouron, Aman Gupta
+  dxva2*                                Laurent Aimar
+  libstagefright.cpp                    Mohamed Naufal
  vaapi*                                Gwenole Beauchesne
-  vaapi_encode*                         Mark Thompson
-  vdpau*                                Philip Langdale, Carl Eugen Hoyos
-  videotoolbox*                         Rick Kern, Aman Gupta
+  vda*                                  Sebastien Zwickert
+  vdpau*                                Carl Eugen Hoyos


 libavdevice
@@ -281,92 +256,18 @@ libavdevice
    libavdevice/avdevice.h


-  avfoundation.m                        Thilo Borgmann
-  android_camera.c                      Felix Matouschek
-  decklink*                             Marton Balint
-  dshow.c                               Roger Pack (CC rogerdpack@gmail.com)
-  fbdev_enc.c                           Lukasz Marek
-  gdigrab.c                             Roger Pack (CC rogerdpack@gmail.com)
-  iec61883.c                            Georg Lippitsch
-  lavfi                                 Stefano Sabatini
  libdc1394.c                           Roman Shaposhnik
-  opengl_enc.c                          Lukasz Marek
-  pulse_audio_enc.c                     Lukasz Marek
-  sdl                                   Stefano Sabatini
-  sdl2.c                                Josh de Kock
-  v4l2.c                                Giorgio Vazzana
+  v4l2.c                                Luca Abeni
  vfwcap.c                              Ramiro Polla
-  xv.c                                  Lukasz Marek
+

 libavfilter
 ===========

-Generic parts:
-  graphdump.c                           Nicolas George
-
-  motion_estimation.c                   Davinder Singh
-
-Filters:
-  f_drawgraph.c                         Paul B Mahol
-  af_adelay.c                           Paul B Mahol
-  af_aecho.c                            Paul B Mahol
-  af_afade.c                            Paul B Mahol
-  af_amerge.c                           Nicolas George
-  af_aphaser.c                          Paul B Mahol
-  af_aresample.c                        Michael Niedermayer
-  af_astats.c                           Paul B Mahol
-  af_atempo.c                           Pavel Koshevoy
-  af_biquads.c                          Paul B Mahol
-  af_chorus.c                           Paul B Mahol
-  af_compand.c                          Paul B Mahol
-  af_firequalizer.c                     Muhammad Faiz
-  af_hdcd.c                             Burt P.
-  af_ladspa.c                           Paul B Mahol
-  af_loudnorm.c                         Kyle Swanson
-  af_pan.c                              Nicolas George
-  af_sidechaincompress.c                Paul B Mahol
-  af_silenceremove.c                    Paul B Mahol
-  avf_aphasemeter.c                     Paul B Mahol
-  avf_avectorscope.c                    Paul B Mahol
-  avf_showcqt.c                         Muhammad Faiz
-  vf_blend.c                            Paul B Mahol
-  vf_bwdif                              Thomas Mundt (CC <thomas.mundt@hr.de>)
-  vf_chromakey.c                        Timo Rothenpieler
-  vf_colorchannelmixer.c                Paul B Mahol
-  vf_colorconstancy.c                   Mina Sami    (CC <minas.gorgy@gmail.com>)
-  vf_colorbalance.c                     Paul B Mahol
-  vf_colorkey.c                         Timo Rothenpieler
-  vf_colorlevels.c                      Paul B Mahol
-  vf_coreimage.m                        Thilo Borgmann
-  vf_deband.c                           Paul B Mahol
-  vf_dejudder.c                         Nicholas Robbins
-  vf_delogo.c                           Jean Delvare (CC <jdelvare@suse.com>)
-  vf_drawbox.c/drawgrid                 Andrey Utkin
-  vf_extractplanes.c                    Paul B Mahol
-  vf_histogram.c                        Paul B Mahol
-  vf_hqx.c                              Clément Bœsch
-  vf_idet.c                             Pascal Massimino
-  vf_il.c                               Paul B Mahol
-  vf_(t)interlace                       Thomas Mundt (CC <thomas.mundt@hr.de>)
-  vf_lenscorrection.c                   Daniel Oberhoff
-  vf_mergeplanes.c                      Paul B Mahol
-  vf_mestimate.c                        Davinder Singh
-  vf_minterpolate.c                     Davinder Singh
-  vf_neighbor.c                         Paul B Mahol
-  vf_psnr.c                             Paul B Mahol
-  vf_random.c                           Paul B Mahol
-  vf_readvitc.c                         Tobias Rapp (CC t.rapp at noa-archive dot com)
-  vf_scale.c                            Michael Niedermayer
-  vf_separatefields.c                   Paul B Mahol
-  vf_ssim.c                             Paul B Mahol
-  vf_stereo3d.c                         Paul B Mahol
-  vf_telecine.c                         Paul B Mahol
-  vf_tonemap_opencl.c                   Ruiling Song
-  vf_yadif.c                            Michael Niedermayer
-  vf_zoompan.c                          Paul B Mahol
-
-Sources:
+Video filters:
  vsrc_mandelbrot.c                     Michael Niedermayer
+  vf_yadif.c                            Michael Niedermayer
+

 libavformat
 ===========
@@ -376,245 +277,146 @@ Generic parts:
    libavformat/avformat.h              Michael Niedermayer
  Utility Code:
    libavformat/utils.c                 Michael Niedermayer
-  Text Subtitles                        Clément Bœsch


 Muxers/Demuxers:
  4xm.c                                 Mike Melanson
-  aadec.c                               Vesselin Bontchev (vesselin.bontchev at yandex dot com)
  adtsenc.c                             Robert Swain
-  afc.c                                 Paul B Mahol
-  aiffdec.c                             Baptiste Coudurier, Matthieu Bouron
-  aiffenc.c                             Baptiste Coudurier, Matthieu Bouron
-  apngdec.c                             Benoit Fouet
+  aiff.c                                Baptiste Coudurier
+  ape.c                                 Kostya Shishkov
  ass*                                  Aurelien Jacobs
-  astdec.c                              Paul B Mahol
-  astenc.c                              James Almer
  avi*                                  Michael Niedermayer
-  avisynth.c                            Stephen Hutchinson
-  avr.c                                 Paul B Mahol
  bink.c                                Peter Ross
-  boadec.c                              Michael Niedermayer
-  brstm.c                               Paul B Mahol
  caf*                                  Peter Ross
-  cdxl.c                                Paul B Mahol
-  codec2.c                              Tomas Härdin
  crc.c                                 Michael Niedermayer
-  dashdec.c                             Steven Liu
-  dashenc.c                             Karthick Jeyapal
  daud.c                                Reimar Doeffinger
-  dss.c                                 Oleksij Rempel
-  dtsdec.c                              foo86
-  dtshddec.c                            Paul B Mahol
  dv.c                                  Roman Shaposhnik
+  dxa.c                                 Kostya Shishkov
  electronicarts.c                      Peter Ross
-  epafdec.c                             Paul B Mahol
  ffm*                                  Baptiste Coudurier
+  flac*                                 Justin Ruggles
  flic.c                                Mike Melanson
-  flvdec.c                              Michael Niedermayer
-  flvenc.c                              Michael Niedermayer, Steven Liu
+  flvdec.c, flvenc.c                    Michael Niedermayer
  gxf.c                                 Reimar Doeffinger
  gxfenc.c                              Baptiste Coudurier
-  hlsenc.c                              Christian Suloway, Steven Liu
  idcin.c                               Mike Melanson
  idroqdec.c                            Mike Melanson
  iff.c                                 Jaikrishnan Menon
-  img2*.c                               Michael Niedermayer
  ipmovie.c                             Mike Melanson
-  ircam*                                Paul B Mahol
+  img2.c                                Michael Niedermayer
  iss.c                                 Stefan Gehrer
  jvdec.c                               Peter Ross
  libmodplug.c                          Clément Bœsch
-  libopenmpt.c                          Josh de Kock
+  libnut.c                              Oded Shimon
  lmlm4.c                               Ivo van Poorten
-  lvfdec.c                              Paul B Mahol
  lxfdec.c                              Tomas Härdin
  matroska.c                            Aurelien Jacobs
  matroskadec.c                         Aurelien Jacobs
  matroskaenc.c                         David Conrad
-  matroska subtitles (matroskaenc.c)    John Peebles
  metadata*                             Aurelien Jacobs
-  mgsts.c                               Paul B Mahol
  microdvd*                             Aurelien Jacobs
  mm.c                                  Peter Ross
-  mov.c                                 Baptiste Coudurier
-  movenc.c                              Baptiste Coudurier, Matthieu Bouron
-  movenccenc.c                          Eran Kornblau
+  mov.c                                 Michael Niedermayer, Baptiste Coudurier
+  movenc.c                              Michael Niedermayer, Baptiste Coudurier
+  mpc.c                                 Kostya Shishkov
  mpeg.c                                Michael Niedermayer
  mpegenc.c                             Michael Niedermayer
-  mpegts.c                              Marton Balint
-  mpegtsenc.c                           Baptiste Coudurier
+  mpegts*                               Baptiste Coudurier
  msnwc_tcp.c                           Ramiro Polla
  mtv.c                                 Reynaldo H. Verdejo Pinochet
  mxf*                                  Baptiste Coudurier
-  nistspheredec.c                       Paul B Mahol
  nsvdec.c                              Francois Revol
-  nut*                                  Michael Niedermayer
+  nut.c                                 Michael Niedermayer
  nuv.c                                 Reimar Doeffinger
  oggdec.c, oggdec.h                    David Conrad
  oggenc.c                              Baptiste Coudurier
  oggparse*.c                           David Conrad
-  oggparsedaala*                        Rostislav Pehlivanov
  oma.c                                 Maxim Poliakovski
-  paf.c                                 Paul B Mahol
  psxstr.c                              Mike Melanson
  pva.c                                 Ivo van Poorten
-  pvfdec.c                              Paul B Mahol
  r3d.c                                 Baptiste Coudurier
  raw.c                                 Michael Niedermayer
  rdt.c                                 Ronald S. Bultje
  rl2.c                                 Sascha Sommer
-  rmdec.c, rmenc.c                      Ronald S. Bultje
+  rmdec.c, rmenc.c                      Ronald S. Bultje, Kostya Shishkov
+  rtmp*                                 Kostya Shishkov
  rtp.c, rtpenc.c                       Martin Storsjo
-  rtpdec_ac3.*                          Gilles Chanteperdrix
-  rtpdec_dv.*                           Thomas Volkert
-  rtpdec_h261.*, rtpenc_h261.*          Thomas Volkert
-  rtpdec_hevc.*, rtpenc_hevc.*          Thomas Volkert
-  rtpdec_mpa_robust.*                   Gilles Chanteperdrix
  rtpdec_asf.*                          Ronald S. Bultje
-  rtpdec_vc2hq.*, rtpenc_vc2hq.*        Thomas Volkert
-  rtpdec_vp9.c                          Thomas Volkert
  rtpenc_mpv.*, rtpenc_aac.*            Martin Storsjo
-  s337m.c                               foo86
-  sbgdec.c                              Nicolas George
+  rtsp.c                                Luca Barbato
  sdp.c                                 Martin Storsjo
  segafilm.c                            Mike Melanson
-  segment.c                             Stefano Sabatini
-  smjpeg*                               Paul B Mahol
-  spdif*                                Anssi Hannula
+  siff.c                                Kostya Shishkov
+  smacker.c                             Kostya Shishkov
  srtdec.c                              Aurelien Jacobs
  swf.c                                 Baptiste Coudurier
-  takdec.c                              Paul B Mahol
  tta.c                                 Alex Beregszaszi
  txd.c                                 Ivo van Poorten
  voc.c                                 Aurelien Jacobs
  wav.c                                 Michael Niedermayer
  wc3movie.c                            Mike Melanson
-  webm dash (matroskaenc.c)             Vignesh Venkatasubramanian
-  webvtt*                               Matthew J Heaney
  westwood.c                            Mike Melanson
  wtv.c                                 Peter Ross
-  wvenc.c                               Paul B Mahol
+  wv.c                                  Kostya Shishkov

 Protocols:
-  async.c                               Zhang Rui
-  bluray.c                              Petri Hintukainen
-  ftp.c                                 Lukasz Marek
  http.c                                Ronald S. Bultje
-  libssh.c                              Lukasz Marek
  mms*.c                                Ronald S. Bultje
  udp.c                                 Luca Abeni
-  icecast.c                             Marvin Scholz
-
-
-libswresample
-=============
-
-Generic parts:
-  audioconvert.c                        Michael Niedermayer
-  dither.c                              Michael Niedermayer
-  rematrix*.c                           Michael Niedermayer
-  swresample*.c                         Michael Niedermayer
-
-Resamplers:
-  resample*.c                           Michael Niedermayer
-  soxr_resample.c                       Rob Sykes


 Operating systems / CPU architectures
 =====================================

-Alpha                                   Falk Hueffner
-MIPS                                    Manojkumar Bhosale, Shiyou Yin
+Alpha                                   Mans Rullgard, Falk Hueffner
+ARM                                     Mans Rullgard
+AVR32                                   Mans Rullgard
+MIPS                                    Mans Rullgard
 Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
-Linux / PowerPC                         Lauri Kasanen
+Linux / PowerPC                         Luca Barbato
 Windows MinGW                           Alex Beregszaszi, Ramiro Polla
 Windows Cygwin                          Victor Paesa
-Windows MSVC                            Matthew Oliver, Hendrik Leppkes
-Windows ICL                             Matthew Oliver
 ADI/Blackfin DSP                        Marc Hoffman
 Sparc                                   Roman Shaposhnik
-OS/2                                    KO Myung-Hun
-
-
-Developers with git write access who are currently not maintaining any specific part
-====================================================================================
-Alex Converse
-Andreas Cadhalpun
-Anuradha Suraparaju
-Ben Littler
-Benjamin Larsson
-Bobby Bingham
-Daniel Verkamp
-Derek Buitenhuis
-Ganesh Ajjanagadde
-Henrik Gramner
-Ivan Uskov
-James Darnley
-Jan Ekström
-Joakim Plate
-Jun Zhao
-Kieran Kunhya
-Kirill Gavrilov
-Martin Storsjö
-Panagiotis Issaris
-Pedro Arthur
-Sebastien Zwickert
-Vittorio Giovara
-wm4
-(this list is incomplete)
+x86                                     Michael Niedermayer


 Releases
 ========

-2.8                                     Michael Niedermayer
-2.7                                     Michael Niedermayer
-2.6                                     Michael Niedermayer
-2.5                                     Michael Niedermayer
-
-If you want to maintain an older release, please contact us
+0.5                                     *Deprecated/Unmaintained*
+0.6                                     *Deprecated/Unmaintained*
+0.7                                     Michael Niedermayer
+0.8                                     Michael Niedermayer
+0.9                                     Michael Niedermayer


-GnuPG Fingerprints and IRC nicknames of maintainers and contributors
-====================================================================

-IRC nicknames are in parentheses. These apply
-to the IRC channels listed on the website.
+GnuPG Fingerprints of maintainers and contributors
+==================================================

-Alexander Strasser            1C96 78B7 83CB 8AA7 9AF5 D1EB A7D8 A57B A876 E58F
 Anssi Hannula                 1A92 FF42 2DD9 8D2E 8AF7 65A9 4278 C520 513D F3CB
-Ash Hughes                    694D 43D2 D180 C7C7 6421 ABD3 A641 D0B7 623D 6029
+Anton Khirnov                 6D0C 6625 56F8 65D1 E5F5 814B B50A 1241 C067 07AB
 Attila Kinali                 11F0 F9A6 A1D2 11F6 C745 D10C 6520 BCDD F2DF E765
 Baptiste Coudurier            8D77 134D 20CC 9220 201F C5DB 0AC9 325C 5C1A BAAA
 Ben Littler                   3EE3 3723 E560 3214 A8CD 4DEB 2CDB FCE7 768C 8D2C
 Benoit Fouet                  B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8
-Clément Bœsch                 52D0 3A82 D445 F194 DB8B 2B16 87EE 2CB8 F4B8 FCF9
 Daniel Verkamp                78A6 07ED 782C 653E C628 B8B9 F0EB 8DD8 2F0E 21C7
-FFmpeg release signing key    FCF9 86EA 15E6 E293 A564 4F10 B432 2F04 D676 58D8
-Ganesh Ajjanagadde            C96A 848E 97C3 CEA2 AB72 5CE4 45F9 6A2D 3C36 FB1B
+Diego Biurrun                 8227 1E31 B6D9 4994 7427 E220 9CAE D6CC 4757 FCC5
 Gwenole Beauchesne            2E63 B3A6 3E44 37E2 017D 2704 53C7 6266 B153 99C4
 Jaikrishnan Menon             61A1 F09F 01C9 2D45 78E1 C862 25DC 8831 AF70 D368
-James Almer                   7751 2E8C FD94 A169 57E6 9A7A 1463 01AD 7376 59E0
-Jean Delvare                  7CA6 9F44 60F1 BDC4 1FD2 C858 A552 6B9B B3CD 4E6A
+Justin Ruggles                3136 ECC0 C10D 6C04 5F43 CA29 FCBE CD2A 3787 1EBF
 Loren Merritt                 ABD9 08F4 C920 3F65 D8BE 35D7 1540 DAA7 060F 56DE
-Lou Logan (llogan)            7D68 DC73 CBEF EABB 671A B6CF 621C 2E28 82F8 DC3A
+Lou Logan                     7D68 DC73 CBEF EABB 671A B6CF 621C 2E28 82F8 DC3A
+Luca Barbato                  6677 4209 213C 8843 5B67 29E7 E84C 78C2 84E9 0E34
 Michael Niedermayer           9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB
-Nicolas George                24CE 01CE 9ACC 5CEB 74D8 8D9D B063 D997 36E5 4C93
-Nikolay Aleksandrov           8978 1D8C FB71 588E 4B27 EAA8 C4F0 B5FC E011 13B1
 Panagiotis Issaris            6571 13A3 33D9 3726 F728 AA98 F643 B12E ECF3 E029
 Peter Ross                    A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B
-Philip Langdale               5DC5 8D66 5FBA 3A43 18EC 045E F8D6 B194 6A75 682E
-Reimar Doeffinger             C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7
+Reimar Döffinger              C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7
 Reinhard Tartler              9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4
 Reynaldo H. Verdejo Pinochet  6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A
 Robert Swain                  EE7A 56EA 4A81 A7B5 2001 A521 67FA 362D A2FC 3E71
 Sascha Sommer                 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C
-Stefano Sabatini              0D0B AD6B 5330 BBAD D3D6 6A0C 719C 2839 FC43 2D5F
-Steinar H. Gunderson          C2E9 004F F028 C18E 4EAD DB83 7F61 7561 7797 8F76
-Stephan Hilb                  4F38 0B3A 5F39 B99B F505 E562 8D5C 5554 4E17 8863
-Tiancheng "Timothy" Gu        9456 AFC0 814A 8139 E994 8351 7FE6 B095 B582 B0D4
-Tim Nicholson                 38CF DB09 3ED0 F607 8B67 6CED 0C0B FC44 8B0B FC83
-Tomas Härdin (thardin)        A79D 4E3D F38F 763F 91F5 8B33 A01E 8AE0 41BB 2551
-Wei Gao                       4269 7741 857A 0E60 9EC5 08D2 4744 4EFA 62C1 87B9
+Stefano Sabatini              9A43 10F8 D32C D33C 48E7 C52C 5DF2 8E4D B2EE 066B
+Tomas Härdin                  D133 29CA 4EEC 9DB4 7076 F697 B04B 7403 3313 41FD
--- a/179
+++ b/179
@@ -1,81 +1,72 @@
 MAIN_MAKEFILE=1
-include ffbuild/config.mak
+include config.mak

 vpath %.c    $(SRC_PATH)
 vpath %.cpp  $(SRC_PATH)
 vpath %.h    $(SRC_PATH)
-vpath %.inc  $(SRC_PATH)
-vpath %.m    $(SRC_PATH)
 vpath %.S    $(SRC_PATH)
 vpath %.asm  $(SRC_PATH)
-vpath %.rc   $(SRC_PATH)
 vpath %.v    $(SRC_PATH)
 vpath %.texi $(SRC_PATH)
-vpath %.cu   $(SRC_PATH)
-vpath %.ptx  $(SRC_PATH)
-vpath %/fate_config.sh.template $(SRC_PATH)

-TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
-HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
+PROGS-$(CONFIG_FFMPEG)   += ffmpeg
+PROGS-$(CONFIG_AVCONV)   += avconv
+PROGS-$(CONFIG_FFPLAY)   += ffplay
+PROGS-$(CONFIG_FFPROBE)  += ffprobe
+PROGS-$(CONFIG_FFSERVER) += ffserver

-# $(FFLIBS-yes) needs to be in linking order
-FFLIBS-$(CONFIG_AVDEVICE)   += avdevice
-FFLIBS-$(CONFIG_AVFILTER)   += avfilter
-FFLIBS-$(CONFIG_AVFORMAT)   += avformat
-FFLIBS-$(CONFIG_AVCODEC)    += avcodec
-FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
-FFLIBS-$(CONFIG_POSTPROC)   += postproc
-FFLIBS-$(CONFIG_SWRESAMPLE) += swresample
-FFLIBS-$(CONFIG_SWSCALE)    += swscale
+PROGS      := $(PROGS-yes:%=%$(EXESUF))
+INSTPROGS   = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF))
+OBJS        = $(PROGS-yes:%=%.o) cmdutils.o
+TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
+HOSTPROGS  := $(TESTTOOLS:%=tests/%)
+TOOLS       = qt-faststart trasher
+TOOLS-$(CONFIG_ZLIB) += cws2fws
+
+BASENAMES   = ffmpeg avconv ffplay ffprobe ffserver
+ALLPROGS    = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF))
+ALLPROGS_G  = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
+ALLMANPAGES = $(BASENAMES:%=%.1)
+
+FFLIBS-$(CONFIG_AVDEVICE) += avdevice
+FFLIBS-$(CONFIG_AVFILTER) += avfilter
+FFLIBS-$(CONFIG_AVFORMAT) += avformat
+FFLIBS-$(CONFIG_AVCODEC)  += avcodec
+FFLIBS-$(CONFIG_POSTPROC) += postproc
+FFLIBS-$(CONFIG_SWRESAMPLE)+= swresample
+FFLIBS-$(CONFIG_SWSCALE)  += swscale

 FFLIBS := avutil

-DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
+DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset)

-SKIPHEADERS = compat/w32pthreads.h
+SKIPHEADERS = cmdutils_common_opts.h

-# first so "all" becomes default target
-all: all-yes
-
-include $(SRC_PATH)/tools/Makefile
-include $(SRC_PATH)/ffbuild/common.mak
+include $(SRC_PATH)/common.mak

 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS  := $(DEP_LIBS)
-FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
+
+all: $(PROGS)
+
+$(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+	$(CP) $< $@$(PROGSSUF)
+	$(STRIP) $@$(PROGSSUF)

 $(TOOLS): %$(EXESUF): %.o
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
+	$(LD) $(LDFLAGS) -o $@ $< $(ELIBS)

-target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+tools/cws2fws$(EXESUF): ELIBS = -lz

-tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-
-tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
-tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
-tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
-tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
-
-CONFIGURABLE_COMPONENTS =                                           \
-    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
-    $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
-    $(SRC_PATH)/libavcodec/parsers.c                                \
-    $(SRC_PATH)/libavformat/protocols.c                             \
-
-config.h: ffbuild/.config
-ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
+config.h: .config
+.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
 	@-tput bold 2>/dev/null
-	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
+	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
 	@-tput sgr0 2>/dev/null

-SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
-               HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
-               ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
-               ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
-               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
-               MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
+SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
+               ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
+               HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS

 define RESET
 $(1) :=
@@ -86,83 +77,89 @@ define DOSUBDIR
 $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 SUBDIR := $(1)/
 include $(SRC_PATH)/$(1)/Makefile
-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
-include $(SRC_PATH)/ffbuild/library.mak
 endef

 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))

-include $(SRC_PATH)/fftools/Makefile
-include $(SRC_PATH)/doc/Makefile
-include $(SRC_PATH)/doc/examples/Makefile
+ffplay.o: CFLAGS += $(SDL_CFLAGS)
+ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
+ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)

-libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
+%$(PROGSSUF)_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
+	$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)

-$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
-ifeq ($(STRIPTYPE),direct)
-	$(STRIP) -o $@ $<
-else
-	$(CP) $< $@
-	$(STRIP) $@
-endif
+OBJDIRS += tools

-%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+-include $(wildcard tools/*.d)

-VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh
+VERSION_SH  = $(SRC_PATH)/version.sh
 GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD

-.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak
+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
 .version: M=@

-libavutil/ffversion.h .version:
-	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
+version.h .version:
+	$(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
 	$(Q)touch .version

 # force version.sh to run whenever version might have changed
 -include .version

+ifdef PROGS
+install: install-progs install-data
+endif
+
 install: install-libs install-headers

 install-libs: install-libs-yes

+install-progs-yes:
+install-progs-$(CONFIG_SHARED): install-libs
+
+install-progs: install-progs-yes $(PROGS)
+	$(Q)mkdir -p "$(BINDIR)"
+	$(INSTALL) -c -m 755 $(INSTPROGS) "$(BINDIR)"
+
 install-data: $(DATA_FILES)
 	$(Q)mkdir -p "$(DATADIR)"
 	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"

-uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
+uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
+
+uninstall-progs:
+	$(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))

 uninstall-data:
 	$(RM) -r "$(DATADIR)"

 clean::
+	$(RM) $(ALLPROGS) $(ALLPROGS_G)
 	$(RM) $(CLEANSUFFIXES)
-	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
+	$(RM) $(TOOLS)
+	$(RM) $(CLEANSUFFIXES:%=tools/%)
+	$(RM) coverage.info
 	$(RM) -r coverage-html
-	$(RM) -rf coverage.info coverage.info.in lcov

-distclean:: clean
-	$(RM) .version avversion.h config.asm config.h mapfile  \
-		ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
-		version.h libavutil/ffversion.h libavcodec/codec_names.h \
-		libavcodec/bsf_list.c libavformat/protocol_list.c \
-		libavcodec/codec_list.c libavcodec/parser_list.c \
-		libavformat/muxer_list.c libavformat/demuxer_list.c
-ifeq ($(SRC_LINK),src)
-	$(RM) src
-endif
-	$(RM) -rf doc/examples/pc-uninstalled
+distclean::
+	$(RM) $(DISTCLEANSUFFIXES)
+	$(RM) config.* .version version.h libavutil/avconfig.h

 config:
 	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)

-build: all alltools examples testprogs
-check: all alltools examples testprogs fate
+# Without the sed genthml thinks "libavutil" and "./libavutil" are two different things
+coverage.info: $(wildcard *.gcda *.gcno */*.gcda */*.gcno */*/*.gcda */*/*.gcno)
+	$(Q)lcov -c -d . -b . | sed -e 's#/./#/#g' > $@

+coverage-html: coverage.info
+	$(Q)mkdir -p $@
+	$(Q)genhtml -o $@ $<
+	$(Q)touch $@
+
+include $(SRC_PATH)/doc/Makefile
 include $(SRC_PATH)/tests/Makefile

-$(sort $(OUTDIRS)):
+$(sort $(OBJDIRS)):
 	$(Q)mkdir -p $@

 # Dummy rule to stop make trying to rebuild removed or renamed headers
@@ -173,5 +170,5 @@ $(sort $(OUTDIRS)):
 # so this saves some time on slow systems.
 .SUFFIXES:

-.PHONY: all all-yes alltools build check config testprogs
-.PHONY: *clean install* uninstall*
+.PHONY: all all-yes alltools *clean config examples install*
+.PHONY: testprogs uninstall*
--- a/12
+++ b/12
@@ -0,0 +1,12 @@
+FFmpeg README
+-------------
+
+1) Documentation
+----------------
+
+* Read the documentation in the doc/ directory.
+
+2) Licensing
+------------
+
+* See the LICENSE file.
--- a/README.md
+++ b/README.md
@@ -1,46 +0,0 @@
-FFmpeg README
-=============
-
-FFmpeg is a collection of libraries and tools to process multimedia content
-such as audio, video, subtitles and related metadata.
-
-## Libraries
-
-* `libavcodec` provides implementation of a wider range of codecs.
-* `libavformat` implements streaming protocols, container formats and basic I/O access.
-* `libavutil` includes hashers, decompressors and miscellaneous utility functions.
-* `libavfilter` provides a mean to alter decoded Audio and Video through chain of filters.
-* `libavdevice` provides an abstraction to access capture and playback devices.
-* `libswresample` implements audio mixing and resampling routines.
-* `libswscale` implements color conversion and scaling routines.
-
-## Tools
-
-* [ffmpeg](https://ffmpeg.org/ffmpeg.html) is a command line toolbox to
-  manipulate, convert and stream multimedia content.
-* [ffplay](https://ffmpeg.org/ffplay.html) is a minimalistic multimedia player.
-* [ffprobe](https://ffmpeg.org/ffprobe.html) is a simple analysis tool to inspect
-  multimedia content.
-* Additional small tools such as `aviocat`, `ismindex` and `qt-faststart`.
-
-## Documentation
-
-The offline documentation is available in the **doc/** directory.
-
-The online documentation is available in the main [website](https://ffmpeg.org)
-and in the [wiki](https://trac.ffmpeg.org).
-
-### Examples
-
-Coding examples are available in the **doc/examples** directory.
-
-## License
-
-FFmpeg codebase is mainly LGPL-licensed with optional components licensed under
-GPL. Please refer to the LICENSE file for detailed information.
-
-## Contributing
-
-Patches should be submitted to the ffmpeg-devel mailing list using
-`git format-patch` or `git send-email`. Github pull requests should be
-avoided because they are not part of our review process and will be ignored.
--- a/2
+++ b/2
@@ -1 +1 @@
-4.1.git
+0.9.3
--- a/1
+++ b/1
@@ -0,0 +1 @@
+0.9.3
--- a/avconv.c
+++ b/avconv.c
--- a/cmdutils.c
+++ b/cmdutils.c
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -0,0 +1,367 @@
+/*
+ * Various utilities for command line tools
+ * copyright (c) 2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * 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.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FFMPEG_CMDUTILS_H
+#define FFMPEG_CMDUTILS_H
+
+#include <stdint.h>
+
+#include "libavcodec/avcodec.h"
+#include "libavfilter/avfilter.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
+
+#ifdef __MINGW32__
+#undef main /* We don't want SDL to override our main() */
+#endif
+
+/**
+ * program name, defined by the program for show_version().
+ */
+extern const char program_name[];
+
+/**
+ * program birth year, defined by the program for show_banner()
+ */
+extern const int program_birth_year;
+
+extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
+extern AVFormatContext *avformat_opts;
+extern struct SwsContext *sws_opts;
+extern AVDictionary *format_opts, *codec_opts;
+
+/**
+ * Initialize the cmdutils option system, in particular
+ * allocate the *_opts contexts.
+ */
+void init_opts(void);
+/**
+ * Uninitialize the cmdutils option system, in particular
+ * free the *_opts contexts and their contents.
+ */
+void uninit_opts(void);
+
+/**
+ * Trivial log callback.
+ * Only suitable for opt_help and similar since it lacks prefix handling.
+ */
+void log_callback_help(void* ptr, int level, const char* fmt, va_list vl);
+
+/**
+ * Fallback for options that are not explicitly handled, these will be
+ * parsed through AVOptions.
+ */
+int opt_default(const char *opt, const char *arg);
+
+/**
+ * Set the libav* libraries log level.
+ */
+int opt_loglevel(const char *opt, const char *arg);
+
+int opt_report(const char *opt);
+
+int opt_codec_debug(const char *opt, const char *arg);
+
+/**
+ * Limit the execution time.
+ */
+int opt_timelimit(const char *opt, const char *arg);
+
+/**
+ * Parse a string and return its corresponding value as a double.
+ * Exit from the application if the string cannot be correctly
+ * parsed or the corresponding value is invalid.
+ *
+ * @param context the context of the value to be set (e.g. the
+ * corresponding commandline option name)
+ * @param numstr the string to be parsed
+ * @param type the type (OPT_INT64 or OPT_FLOAT) as which the
+ * string should be parsed
+ * @param min the minimum valid accepted value
+ * @param max the maximum valid accepted value
+ */
+double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max);
+
+/**
+ * Parse a string specifying a time and return its corresponding
+ * value as a number of microseconds. Exit from the application if
+ * the string cannot be correctly parsed.
+ *
+ * @param context the context of the value to be set (e.g. the
+ * corresponding commandline option name)
+ * @param timestr the string to be parsed
+ * @param is_duration a flag which tells how to interpret timestr, if
+ * not zero timestr is interpreted as a duration, otherwise as a
+ * date
+ *
+ * @see parse_date()
+ */
+int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration);
+
+typedef struct SpecifierOpt {
+    char *specifier;    /**< stream/chapter/program/... specifier */
+    union {
+        uint8_t *str;
+        int        i;
+        int64_t  i64;
+        float      f;
+        double   dbl;
+    } u;
+} SpecifierOpt;
+
+typedef struct {
+    const char *name;
+    int flags;
+#define HAS_ARG    0x0001
+#define OPT_BOOL   0x0002
+#define OPT_EXPERT 0x0004
+#define OPT_STRING 0x0008
+#define OPT_VIDEO  0x0010
+#define OPT_AUDIO  0x0020
+#define OPT_GRAB   0x0040
+#define OPT_INT    0x0080
+#define OPT_FLOAT  0x0100
+#define OPT_SUBTITLE 0x0200
+#define OPT_INT64  0x0400
+#define OPT_EXIT   0x0800
+#define OPT_DATA   0x1000
+#define OPT_FUNC2  0x2000
+#define OPT_OFFSET 0x4000       /* option is specified as an offset in a passed optctx */
+#define OPT_SPEC   0x8000       /* option is to be stored in an array of SpecifierOpt.
+                                   Implies OPT_OFFSET. Next element after the offset is
+                                   an int containing element count in the array. */
+#define OPT_TIME  0x10000
+#define OPT_DOUBLE 0x20000
+     union {
+        void *dst_ptr;
+        int (*func_arg)(const char *, const char *);
+        int (*func2_arg)(void *, const char *, const char *);
+        size_t off;
+    } u;
+    const char *help;
+    const char *argname;
+} OptionDef;
+
+void show_help_options(const OptionDef *options, const char *msg, int mask, int value);
+
+/**
+ * Show help for all options with given flags in class and all its
+ * children.
+ */
+void show_help_children(const AVClass *class, int flags);
+
+/**
+ * Parse the command line arguments.
+ *
+ * @param optctx an opaque options context
+ * @param options Array with the definitions required to interpret every
+ * option of the form: -option_name [argument]
+ * @param parse_arg_function Name of the function called to process every
+ * argument without a leading option name flag. NULL if such arguments do
+ * not have to be processed.
+ */
+void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
+                   void (* parse_arg_function)(void *optctx, const char*));
+
+/**
+ * Parse one given option.
+ *
+ * @return on success 1 if arg was consumed, 0 otherwise; negative number on error
+ */
+int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);
+
+/**
+ * Find the '-loglevel' option in the commandline args and apply it.
+ */
+void parse_loglevel(int argc, char **argv, const OptionDef *options);
+
+/**
+ * Check if the given stream matches a stream specifier.
+ *
+ * @param s  Corresponding format context.
+ * @param st Stream from s to be checked.
+ * @param spec A stream specifier of the [v|a|s|d]:[\<stream index\>] form.
+ *
+ * @return 1 if the stream matches, 0 if it doesn't, <0 on error
+ */
+int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec);
+
+/**
+ * Filter out options for given codec.
+ *
+ * Create a new options dictionary containing only the options from
+ * opts which apply to the codec with ID codec_id.
+ *
+ * @param s Corresponding format context.
+ * @param st A stream from s for which the options should be filtered.
+ * @return a pointer to the created dictionary
+ */
+AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, AVFormatContext *s, AVStream *st);
+
+/**
+ * Setup AVCodecContext options for avformat_find_stream_info().
+ *
+ * Create an array of dictionaries, one dictionary for each stream
+ * contained in s.
+ * Each dictionary will contain the options from codec_opts which can
+ * be applied to the corresponding stream codec context.
+ *
+ * @return pointer to the created array of dictionaries, NULL if it
+ * cannot be created
+ */
+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts);
+
+/**
+ * Print an error message to stderr, indicating filename and a human
+ * readable description of the error code err.
+ *
+ * If strerror_r() is not available the use of this function in a
+ * multithreaded application may be unsafe.
+ *
+ * @see av_strerror()
+ */
+void print_error(const char *filename, int err);
+
+/**
+ * Print the program banner to stderr. The banner contents depend on the
+ * current version of the repository and of the libav* libraries used by
+ * the program.
+ */
+void show_banner(int argc, char **argv, const OptionDef *options);
+
+/**
+ * Print the version of the program to stdout. The version message
+ * depends on the current versions of the repository and of the libav*
+ * libraries.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_version(const char *opt, const char *arg);
+
+/**
+ * Print the license of the program to stdout. The license depends on
+ * the license of the libraries compiled into the program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_license(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the formats supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_formats(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the codecs supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_codecs(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the filters supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_filters(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the bit stream filters supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_bsfs(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the protocols supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_protocols(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the pixel formats supported by the
+ * program.
+ * This option processing function does not utilize the arguments.
+ */
+int opt_pix_fmts(const char *opt, const char *arg);
+
+/**
+ * Print a listing containing all the sample formats supported by the
+ * program.
+ */
+int show_sample_fmts(const char *opt, const char *arg);
+
+/**
+ * Return a positive value if a line read from standard input
+ * starts with [yY], otherwise return 0.
+ */
+int read_yesno(void);
+
+/**
+ * Read the file with name filename, and put its content in a newly
+ * allocated 0-terminated buffer.
+ *
+ * @param bufptr location where pointer to buffer is returned
+ * @param size   location where size of buffer is returned
+ * @return 0 in case of success, a negative value corresponding to an
+ * AVERROR error code in case of failure.
+ */
+int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
+
+/**
+ * Get a file corresponding to a preset file.
+ *
+ * If is_path is non-zero, look for the file in the path preset_name.
+ * Otherwise search for a file named arg.ffpreset in the directories
+ * $FFMPEG_DATADIR (if set), $HOME/.ffmpeg, and in the datadir defined
+ * at configuration time or in a "ffpresets" folder along the executable
+ * on win32, in that order. If no such file is found and
+ * codec_name is defined, then search for a file named
+ * codec_name-preset_name.ffpreset in the above-mentioned directories.
+ *
+ * @param filename buffer where the name of the found filename is written
+ * @param filename_size size in bytes of the filename buffer
+ * @param preset_name name of the preset to search
+ * @param is_path tell if preset_name is a filename path
+ * @param codec_name name of the codec for which to look for the
+ * preset, may be NULL
+ */
+FILE *get_preset_file(char *filename, size_t filename_size,
+                      const char *preset_name, int is_path, const char *codec_name);
+
+/**
+ * Do all the necessary cleanup and abort.
+ * This function is implemented in the avtools, not cmdutils.
+ */
+void exit_program(int ret);
+
+/**
+ * Realloc array to hold new_size elements of elem_size.
+ * Calls exit_program() on failure.
+ *
+ * @param elem_size size in bytes of each element
+ * @param size new element count will be written here
+ * @return reallocated array
+ */
+void *grow_array(void *array, int elem_size, int *size, int new_size);
+
+#endif /* CMDUTILS_H */
--- a/cmdutils_common_opts.h
+++ b/cmdutils_common_opts.h
@@ -0,0 +1,17 @@
+    { "L", OPT_EXIT, {(void*)opt_license}, "show license" },
+    { "h", OPT_EXIT, {(void*)opt_help}, "show help" },
+    { "?", OPT_EXIT, {(void*)opt_help}, "show help" },
+    { "help", OPT_EXIT, {(void*)opt_help}, "show help" },
+    { "-help", OPT_EXIT, {(void*)opt_help}, "show help" },
+    { "version", OPT_EXIT, {(void*)opt_version}, "show version" },
+    { "formats"  , OPT_EXIT, {(void*)opt_formats  }, "show available formats" },
+    { "codecs"   , OPT_EXIT, {(void*)opt_codecs   }, "show available codecs" },
+    { "bsfs"     , OPT_EXIT, {(void*)opt_bsfs     }, "show available bit stream filters" },
+    { "protocols", OPT_EXIT, {(void*)opt_protocols}, "show available protocols" },
+    { "filters",   OPT_EXIT, {(void*)opt_filters  }, "show available filters" },
+    { "pix_fmts" , OPT_EXIT, {(void*)opt_pix_fmts }, "show available pixel formats" },
+    { "sample_fmts", OPT_EXIT, {.func_arg = show_sample_fmts }, "show available audio sample formats" },
+    { "loglevel", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
+    { "v", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
+    { "debug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" },
+    { "report", 0, {(void*)opt_report}, "generate a report" },
--- a/common.mak
+++ b/common.mak
@@ -0,0 +1,120 @@
+#
+# common bits used by all libraries
+#
+
+# first so "all" becomes default target
+all: all-yes
+
+ifndef SUBDIR
+
+ifndef V
+Q      = @
+ECHO   = printf "$(1)\t%s\n" $(2)
+BRIEF  = CC CXX AS YASM AR LD HOSTCC STRIP CP
+SILENT = DEPCC YASMDEP RM RANLIB
+MSG    = $@
+M      = @$(call ECHO,$(TAG),$@);
+$(foreach VAR,$(BRIEF), \
+    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
+$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
+$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
+endif
+
+ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale swresample
+
+# NASM requires -I path terminated with /
+IFLAGS     := -I. -I$(SRC_PATH)/
+CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
+CFLAGS     += $(ECFLAGS)
+CCFLAGS     = $(CFLAGS)
+CXXFLAGS   := $(CFLAGS) $(CXXFLAGS)
+YASMFLAGS  += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
+HOSTCFLAGS += $(IFLAGS)
+LDFLAGS    := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
+
+define COMPILE
+       $($(1)DEP)
+       $($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $<
+endef
+
+COMPILE_C = $(call COMPILE,CC)
+COMPILE_CXX = $(call COMPILE,CXX)
+COMPILE_S = $(call COMPILE,AS)
+
+%.o: %.c
+	$(COMPILE_C)
+
+%.o: %.cpp
+	$(COMPILE_CXX)
+
+%.s: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $<
+
+%.o: %.S
+	$(COMPILE_S)
+
+%.ho: %.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+
+%.ver: %.v
+	$(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
+
+%.c %.h: TAG = GEN
+
+# Dummy rule to stop make trying to rebuild removed or renamed headers
+%.h:
+	@:
+
+# Disable suffix rules.  Most of the builtin rules are suffix rules,
+# so this saves some time on slow systems.
+.SUFFIXES:
+
+# Do not delete intermediate files from chains of implicit rules
+$(OBJS):
+endif
+
+OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)
+
+OBJS      += $(OBJS-yes)
+FFLIBS    := $(FFLIBS-yes) $(FFLIBS)
+TESTPROGS += $(TESTPROGS-yes)
+
+FFEXTRALIBS := $(FFLIBS:%=-l%$(BUILDSUF)) $(EXTRALIBS)
+
+EXAMPLES  := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))
+OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))
+TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
+TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))
+HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)
+HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))
+TOOLS     += $(TOOLS-yes)
+TOOLOBJS  := $(TOOLS:%=tools/%.o)
+TOOLS     := $(TOOLS:%=tools/%$(EXESUF))
+
+DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
+
+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
+SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
+SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
+checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
+
+alltools: $(TOOLS)
+
+$(HOSTOBJS): %.o: %.c
+	$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
+
+$(HOSTPROGS): %$(HOSTEXESUF): %.o
+	$(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
+
+$(OBJS):     | $(sort $(dir $(OBJS)))
+$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
+$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
+$(TOOLOBJS): | tools
+
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS))
+
+CLEANSUFFIXES     = *.d *.o *~ *.ho *.map *.ver *.gcno *.gcda
+DISTCLEANSUFFIXES = *.pc
+LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp
+
+-include $(wildcard $(OBJS:.o=.d) $(TESTOBJS:.o=.d))
--- a/compat/aix/math.h
+++ b/compat/aix/math.h
@@ -1,31 +0,0 @@
-/*
- * Work around the class() function in AIX math.h clashing with
- * identifiers named "class".
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_AIX_MATH_H
-#define COMPAT_AIX_MATH_H
-
-#define class class_in_math_h_causes_problems
-
-#include_next <math.h>
-
-#undef class
-
-#endif /* COMPAT_AIX_MATH_H */
--- a/compat/atomics/dummy/stdatomic.h
+++ b/compat/atomics/dummy/stdatomic.h
@@ -1,176 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * based on vlc_atomic.h from VLC
- * Copyright (C) 2010 Rémi Denis-Courmont
- */
-
-#ifndef COMPAT_ATOMICS_DUMMY_STDATOMIC_H
-#define COMPAT_ATOMICS_DUMMY_STDATOMIC_H
-
-#include <stdint.h>
-
-#define ATOMIC_FLAG_INIT 0
-
-#define ATOMIC_VAR_INIT(value) (value)
-
-#define atomic_init(obj, value) \
-do {                            \
-    *(obj) = (value);           \
-} while(0)
-
-#define kill_dependency(y) ((void)0)
-
-#define atomic_thread_fence(order) \
-    ((void)0)
-
-#define atomic_signal_fence(order) \
-    ((void)0)
-
-#define atomic_is_lock_free(obj) 0
-
-typedef intptr_t atomic_flag;
-typedef intptr_t atomic_bool;
-typedef intptr_t atomic_char;
-typedef intptr_t atomic_schar;
-typedef intptr_t atomic_uchar;
-typedef intptr_t atomic_short;
-typedef intptr_t atomic_ushort;
-typedef intptr_t atomic_int;
-typedef intptr_t atomic_uint;
-typedef intptr_t atomic_long;
-typedef intptr_t atomic_ulong;
-typedef intptr_t atomic_llong;
-typedef intptr_t atomic_ullong;
-typedef intptr_t atomic_wchar_t;
-typedef intptr_t atomic_int_least8_t;
-typedef intptr_t atomic_uint_least8_t;
-typedef intptr_t atomic_int_least16_t;
-typedef intptr_t atomic_uint_least16_t;
-typedef intptr_t atomic_int_least32_t;
-typedef intptr_t atomic_uint_least32_t;
-typedef intptr_t atomic_int_least64_t;
-typedef intptr_t atomic_uint_least64_t;
-typedef intptr_t atomic_int_fast8_t;
-typedef intptr_t atomic_uint_fast8_t;
-typedef intptr_t atomic_int_fast16_t;
-typedef intptr_t atomic_uint_fast16_t;
-typedef intptr_t atomic_int_fast32_t;
-typedef intptr_t atomic_uint_fast32_t;
-typedef intptr_t atomic_int_fast64_t;
-typedef intptr_t atomic_uint_fast64_t;
-typedef intptr_t atomic_intptr_t;
-typedef intptr_t atomic_uintptr_t;
-typedef intptr_t atomic_size_t;
-typedef intptr_t atomic_ptrdiff_t;
-typedef intptr_t atomic_intmax_t;
-typedef intptr_t atomic_uintmax_t;
-
-#define atomic_store(object, desired)   \
-do {                                    \
-    *(object) = (desired);              \
-} while (0)
-
-#define atomic_store_explicit(object, desired, order) \
-    atomic_store(object, desired)
-
-#define atomic_load(object) \
-    (*(object))
-
-#define atomic_load_explicit(object, order) \
-    atomic_load(object)
-
-static inline intptr_t atomic_exchange(intptr_t *object, intptr_t desired)
-{
-    intptr_t ret = *object;
-    *object = desired;
-    return ret;
-}
-
-#define atomic_exchange_explicit(object, desired, order) \
-    atomic_exchange(object, desired)
-
-static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
-                                                 intptr_t desired)
-{
-    int ret;
-    if (*object == *expected) {
-        *object = desired;
-        ret = 1;
-    } else {
-        *expected = *object;
-        ret = 0;
-    }
-    return ret;
-}
-
-#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak(object, expected, desired) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_weak(object, expected, desired)
-
-#define FETCH_MODIFY(opname, op)                                            \
-static inline intptr_t atomic_fetch_ ## opname(intptr_t *object, intptr_t operand) \
-{                                                                    \
-    intptr_t ret;                                                    \
-    ret = *object;                                                   \
-    *object = *object op operand;                                    \
-    return ret;                                                      \
-}
-
-FETCH_MODIFY(add, +)
-FETCH_MODIFY(sub, -)
-FETCH_MODIFY(or,  |)
-FETCH_MODIFY(xor, ^)
-FETCH_MODIFY(and, &)
-
-#undef FETCH_MODIFY
-
-#define atomic_fetch_add_explicit(object, operand, order) \
-    atomic_fetch_add(object, operand)
-
-#define atomic_fetch_sub_explicit(object, operand, order) \
-    atomic_fetch_sub(object, operand)
-
-#define atomic_fetch_or_explicit(object, operand, order) \
-    atomic_fetch_or(object, operand)
-
-#define atomic_fetch_xor_explicit(object, operand, order) \
-    atomic_fetch_xor(object, operand)
-
-#define atomic_fetch_and_explicit(object, operand, order) \
-    atomic_fetch_and(object, operand)
-
-#define atomic_flag_test_and_set(object) \
-    atomic_exchange(object, 1)
-
-#define atomic_flag_test_and_set_explicit(object, order) \
-    atomic_flag_test_and_set(object)
-
-#define atomic_flag_clear(object) \
-    atomic_store(object, 0)
-
-#define atomic_flag_clear_explicit(object, order) \
-    atomic_flag_clear(object)
-
-#endif /* COMPAT_ATOMICS_DUMMY_STDATOMIC_H */
--- a/compat/atomics/gcc/stdatomic.h
+++ b/compat/atomics/gcc/stdatomic.h
@@ -1,173 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * based on vlc_atomic.h from VLC
- * Copyright (C) 2010 Rémi Denis-Courmont
- */
-
-#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H
-#define COMPAT_ATOMICS_GCC_STDATOMIC_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#define ATOMIC_FLAG_INIT 0
-
-#define ATOMIC_VAR_INIT(value) (value)
-
-#define atomic_init(obj, value) \
-do {                            \
-    *(obj) = (value);           \
-} while(0)
-
-#define kill_dependency(y) ((void)0)
-
-#define atomic_thread_fence(order) \
-    __sync_synchronize()
-
-#define atomic_signal_fence(order) \
-    ((void)0)
-
-#define atomic_is_lock_free(obj) 0
-
-typedef         _Bool      atomic_flag;
-typedef         _Bool      atomic_bool;
-typedef          char      atomic_char;
-typedef   signed char      atomic_schar;
-typedef unsigned char      atomic_uchar;
-typedef          short     atomic_short;
-typedef unsigned short     atomic_ushort;
-typedef          int       atomic_int;
-typedef unsigned int       atomic_uint;
-typedef          long      atomic_long;
-typedef unsigned long      atomic_ulong;
-typedef          long long atomic_llong;
-typedef unsigned long long atomic_ullong;
-typedef          wchar_t   atomic_wchar_t;
-typedef       int_least8_t atomic_int_least8_t;
-typedef      uint_least8_t atomic_uint_least8_t;
-typedef      int_least16_t atomic_int_least16_t;
-typedef     uint_least16_t atomic_uint_least16_t;
-typedef      int_least32_t atomic_int_least32_t;
-typedef     uint_least32_t atomic_uint_least32_t;
-typedef      int_least64_t atomic_int_least64_t;
-typedef     uint_least64_t atomic_uint_least64_t;
-typedef       int_fast8_t atomic_int_fast8_t;
-typedef      uint_fast8_t atomic_uint_fast8_t;
-typedef      int_fast16_t atomic_int_fast16_t;
-typedef     uint_fast16_t atomic_uint_fast16_t;
-typedef      int_fast32_t atomic_int_fast32_t;
-typedef     uint_fast32_t atomic_uint_fast32_t;
-typedef      int_fast64_t atomic_int_fast64_t;
-typedef     uint_fast64_t atomic_uint_fast64_t;
-typedef          intptr_t atomic_intptr_t;
-typedef         uintptr_t atomic_uintptr_t;
-typedef            size_t atomic_size_t;
-typedef         ptrdiff_t atomic_ptrdiff_t;
-typedef          intmax_t atomic_intmax_t;
-typedef         uintmax_t atomic_uintmax_t;
-
-#define atomic_store(object, desired)   \
-do {                                    \
-    *(object) = (desired);              \
-    __sync_synchronize();               \
-} while (0)
-
-#define atomic_store_explicit(object, desired, order) \
-    atomic_store(object, desired)
-
-#define atomic_load(object) \
-    (__sync_synchronize(), *(object))
-
-#define atomic_load_explicit(object, order) \
-    atomic_load(object)
-
-#define atomic_exchange(object, desired)                            \
-({                                                                  \
-    __typeof__(object) _obj = (object);                             \
-    __typeof__(*object) _old;                                       \
-    do                                                              \
-        _old = atomic_load(_obj);                                   \
-    while (!__sync_bool_compare_and_swap(_obj, _old, (desired)));   \
-    _old;                                                           \
-})
-
-#define atomic_exchange_explicit(object, desired, order) \
-    atomic_exchange(object, desired)
-
-#define atomic_compare_exchange_strong(object, expected, desired)   \
-({                                                                  \
-    __typeof__(object) _exp = (expected);                           \
-    __typeof__(*object) _old = *_exp;                               \
-    *_exp = __sync_val_compare_and_swap((object), _old, (desired)); \
-    *_exp == _old;                                                  \
-})
-
-#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak(object, expected, desired) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_weak(object, expected, desired)
-
-#define atomic_fetch_add(object, operand) \
-    __sync_fetch_and_add(object, operand)
-
-#define atomic_fetch_add_explicit(object, operand, order) \
-    atomic_fetch_add(object, operand)
-
-#define atomic_fetch_sub(object, operand) \
-    __sync_fetch_and_sub(object, operand)
-
-#define atomic_fetch_sub_explicit(object, operand, order) \
-    atomic_fetch_sub(object, operand)
-
-#define atomic_fetch_or(object, operand) \
-    __sync_fetch_and_or(object, operand)
-
-#define atomic_fetch_or_explicit(object, operand, order) \
-    atomic_fetch_or(object, operand)
-
-#define atomic_fetch_xor(object, operand) \
-    __sync_fetch_and_xor(object, operand)
-
-#define atomic_fetch_xor_explicit(object, operand, order) \
-    atomic_fetch_xor(object, operand)
-
-#define atomic_fetch_and(object, operand) \
-    __sync_fetch_and_and(object, operand)
-
-#define atomic_fetch_and_explicit(object, operand, order) \
-    atomic_fetch_and(object, operand)
-
-#define atomic_flag_test_and_set(object) \
-    atomic_exchange(object, 1)
-
-#define atomic_flag_test_and_set_explicit(object, order) \
-    atomic_flag_test_and_set(object)
-
-#define atomic_flag_clear(object) \
-    atomic_store(object, 0)
-
-#define atomic_flag_clear_explicit(object, order) \
-    atomic_flag_clear(object)
-
-#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */
--- a/compat/atomics/pthread/stdatomic.c
+++ b/compat/atomics/pthread/stdatomic.c
@@ -1,39 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * based on vlc_atomic.h from VLC
- * Copyright (C) 2010 Rémi Denis-Courmont
- */
-
-#include <pthread.h>
-#include <stdint.h>
-
-#include "stdatomic.h"
-
-static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
-
-void avpriv_atomic_lock(void)
-{
-    pthread_mutex_lock(&atomic_lock);
-}
-
-void avpriv_atomic_unlock(void)
-{
-    pthread_mutex_unlock(&atomic_lock);
-}
--- a/compat/atomics/pthread/stdatomic.h
+++ b/compat/atomics/pthread/stdatomic.h
@@ -1,197 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * based on vlc_atomic.h from VLC
- * Copyright (C) 2010 Rémi Denis-Courmont
- */
-
-#ifndef COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
-#define COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
-
-#include <stdint.h>
-
-#define ATOMIC_FLAG_INIT 0
-
-#define ATOMIC_VAR_INIT(value) (value)
-
-#define atomic_init(obj, value) \
-do {                            \
-    *(obj) = (value);           \
-} while(0)
-
-#define kill_dependency(y) ((void)0)
-
-#define atomic_signal_fence(order) \
-    ((void)0)
-
-#define atomic_is_lock_free(obj) 0
-
-typedef intptr_t atomic_flag;
-typedef intptr_t atomic_bool;
-typedef intptr_t atomic_char;
-typedef intptr_t atomic_schar;
-typedef intptr_t atomic_uchar;
-typedef intptr_t atomic_short;
-typedef intptr_t atomic_ushort;
-typedef intptr_t atomic_int;
-typedef intptr_t atomic_uint;
-typedef intptr_t atomic_long;
-typedef intptr_t atomic_ulong;
-typedef intptr_t atomic_llong;
-typedef intptr_t atomic_ullong;
-typedef intptr_t atomic_wchar_t;
-typedef intptr_t atomic_int_least8_t;
-typedef intptr_t atomic_uint_least8_t;
-typedef intptr_t atomic_int_least16_t;
-typedef intptr_t atomic_uint_least16_t;
-typedef intptr_t atomic_int_least32_t;
-typedef intptr_t atomic_uint_least32_t;
-typedef intptr_t atomic_int_least64_t;
-typedef intptr_t atomic_uint_least64_t;
-typedef intptr_t atomic_int_fast8_t;
-typedef intptr_t atomic_uint_fast8_t;
-typedef intptr_t atomic_int_fast16_t;
-typedef intptr_t atomic_uint_fast16_t;
-typedef intptr_t atomic_int_fast32_t;
-typedef intptr_t atomic_uint_fast32_t;
-typedef intptr_t atomic_int_fast64_t;
-typedef intptr_t atomic_uint_fast64_t;
-typedef intptr_t atomic_intptr_t;
-typedef intptr_t atomic_uintptr_t;
-typedef intptr_t atomic_size_t;
-typedef intptr_t atomic_ptrdiff_t;
-typedef intptr_t atomic_intmax_t;
-typedef intptr_t atomic_uintmax_t;
-
-void avpriv_atomic_lock(void);
-void avpriv_atomic_unlock(void);
-
-static inline void atomic_thread_fence(int order)
-{
-    avpriv_atomic_lock();
-    avpriv_atomic_unlock();
-}
-
-static inline void atomic_store(intptr_t *object, intptr_t desired)
-{
-    avpriv_atomic_lock();
-    *object = desired;
-    avpriv_atomic_unlock();
-}
-
-#define atomic_store_explicit(object, desired, order) \
-    atomic_store(object, desired)
-
-static inline intptr_t atomic_load(intptr_t *object)
-{
-    intptr_t ret;
-    avpriv_atomic_lock();
-    ret = *object;
-    avpriv_atomic_unlock();
-    return ret;
-}
-
-#define atomic_load_explicit(object, order) \
-    atomic_load(object)
-
-static inline intptr_t atomic_exchange(intptr_t *object, intptr_t desired)
-{
-    intptr_t ret;
-    avpriv_atomic_lock();
-    ret     = *object;
-    *object = desired;
-    avpriv_atomic_unlock();
-    return ret;
-}
-
-#define atomic_exchange_explicit(object, desired, order) \
-    atomic_exchange(object, desired)
-
-static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
-                                                 intptr_t desired)
-{
-    int ret;
-    avpriv_atomic_lock();
-    if (*object == *expected) {
-        ret     = 1;
-        *object = desired;
-    } else {
-        ret = 0;
-        *expected = *object;
-    }
-    avpriv_atomic_unlock();
-    return ret;
-}
-
-#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak(object, expected, desired) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_weak(object, expected, desired)
-
-#define FETCH_MODIFY(opname, op)                                                   \
-static inline intptr_t atomic_fetch_ ## opname(intptr_t *object, intptr_t operand) \
-{                                                                                  \
-    intptr_t ret;                                                                  \
-    avpriv_atomic_lock();                                                          \
-    ret = *object;                                                                 \
-    *object = *object op operand;                                                  \
-    avpriv_atomic_unlock();                                                        \
-    return ret;                                                                    \
-}
-
-FETCH_MODIFY(add, +)
-FETCH_MODIFY(sub, -)
-FETCH_MODIFY(or,  |)
-FETCH_MODIFY(xor, ^)
-FETCH_MODIFY(and, &)
-
-#undef FETCH_MODIFY
-
-#define atomic_fetch_add_explicit(object, operand, order) \
-    atomic_fetch_add(object, operand)
-
-#define atomic_fetch_sub_explicit(object, operand, order) \
-    atomic_fetch_sub(object, operand)
-
-#define atomic_fetch_or_explicit(object, operand, order) \
-    atomic_fetch_or(object, operand)
-
-#define atomic_fetch_xor_explicit(object, operand, order) \
-    atomic_fetch_xor(object, operand)
-
-#define atomic_fetch_and_explicit(object, operand, order) \
-    atomic_fetch_and(object, operand)
-
-#define atomic_flag_test_and_set(object) \
-    atomic_exchange(object, 1)
-
-#define atomic_flag_test_and_set_explicit(object, order) \
-    atomic_flag_test_and_set(object)
-
-#define atomic_flag_clear(object) \
-    atomic_store(object, 0)
-
-#define atomic_flag_clear_explicit(object, order) \
-    atomic_flag_clear(object)
-
-#endif /* COMPAT_ATOMICS_PTHREAD_STDATOMIC_H */
--- a/compat/atomics/suncc/stdatomic.h
+++ b/compat/atomics/suncc/stdatomic.h
@@ -1,186 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_ATOMICS_SUNCC_STDATOMIC_H
-#define COMPAT_ATOMICS_SUNCC_STDATOMIC_H
-
-#include <atomic.h>
-#include <mbarrier.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#define ATOMIC_FLAG_INIT 0
-
-#define ATOMIC_VAR_INIT(value) (value)
-
-#define atomic_init(obj, value) \
-do {                            \
-    *(obj) = (value);           \
-} while(0)
-
-#define kill_dependency(y) ((void)0)
-
-#define atomic_thread_fence(order) \
-    __machine_rw_barrier();
-
-#define atomic_signal_fence(order) \
-    ((void)0)
-
-#define atomic_is_lock_free(obj) 0
-
-typedef intptr_t atomic_flag;
-typedef intptr_t atomic_bool;
-typedef intptr_t atomic_char;
-typedef intptr_t atomic_schar;
-typedef intptr_t atomic_uchar;
-typedef intptr_t atomic_short;
-typedef intptr_t atomic_ushort;
-typedef intptr_t atomic_int;
-typedef intptr_t atomic_uint;
-typedef intptr_t atomic_long;
-typedef intptr_t atomic_ulong;
-typedef intptr_t atomic_llong;
-typedef intptr_t atomic_ullong;
-typedef intptr_t atomic_wchar_t;
-typedef intptr_t atomic_int_least8_t;
-typedef intptr_t atomic_uint_least8_t;
-typedef intptr_t atomic_int_least16_t;
-typedef intptr_t atomic_uint_least16_t;
-typedef intptr_t atomic_int_least32_t;
-typedef intptr_t atomic_uint_least32_t;
-typedef intptr_t atomic_int_least64_t;
-typedef intptr_t atomic_uint_least64_t;
-typedef intptr_t atomic_int_fast8_t;
-typedef intptr_t atomic_uint_fast8_t;
-typedef intptr_t atomic_int_fast16_t;
-typedef intptr_t atomic_uint_fast16_t;
-typedef intptr_t atomic_int_fast32_t;
-typedef intptr_t atomic_uint_fast32_t;
-typedef intptr_t atomic_int_fast64_t;
-typedef intptr_t atomic_uint_fast64_t;
-typedef intptr_t atomic_intptr_t;
-typedef intptr_t atomic_uintptr_t;
-typedef intptr_t atomic_size_t;
-typedef intptr_t atomic_ptrdiff_t;
-typedef intptr_t atomic_intmax_t;
-typedef intptr_t atomic_uintmax_t;
-
-static inline void atomic_store(intptr_t *object, intptr_t desired)
-{
-    *object = desired;
-    __machine_rw_barrier();
-}
-
-#define atomic_store_explicit(object, desired, order) \
-    atomic_store(object, desired)
-
-static inline intptr_t atomic_load(intptr_t *object)
-{
-    __machine_rw_barrier();
-    return *object;
-}
-
-#define atomic_load_explicit(object, order) \
-    atomic_load(object)
-
-#define atomic_exchange(object, desired) \
-    atomic_swap_ptr(object, desired)
-
-#define atomic_exchange_explicit(object, desired, order) \
-    atomic_exchange(object, desired)
-
-static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
-                                                 intptr_t desired)
-{
-    intptr_t  old = *expected;
-    *expected = (intptr_t)atomic_cas_ptr(object, (void *)old, (void *)desired);
-    return *expected == old;
-}
-
-#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak(object, expected, desired) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_weak(object, expected, desired)
-
-static inline intptr_t atomic_fetch_add(intptr_t *object, intptr_t operand)
-{
-    return atomic_add_ptr_nv(object, operand) - operand;
-}
-
-#define atomic_fetch_sub(object, operand) \
-    atomic_fetch_add(object, -(operand))
-
-static inline intptr_t atomic_fetch_or(intptr_t *object, intptr_t operand)
-{
-    intptr_t old;
-    do {
-        old = atomic_load(object);
-    } while (!atomic_compare_exchange_strong(object, old, old | operand));
-    return old;
-}
-
-static inline intptr_t atomic_fetch_xor(intptr_t *object, intptr_t operand)
-{
-    intptr_t old;
-    do {
-        old = atomic_load(object);
-    } while (!atomic_compare_exchange_strong(object, old, old ^ operand));
-    return old;
-}
-
-static inline intptr_t atomic_fetch_and(intptr_t *object, intptr_t operand)
-{
-    intptr_t old;
-    do {
-        old = atomic_load(object);
-    } while (!atomic_compare_exchange_strong(object, old, old & operand));
-    return old;
-}
-
-#define atomic_fetch_add_explicit(object, operand, order) \
-    atomic_fetch_add(object, operand)
-
-#define atomic_fetch_sub_explicit(object, operand, order) \
-    atomic_fetch_sub(object, operand)
-
-#define atomic_fetch_or_explicit(object, operand, order) \
-    atomic_fetch_or(object, operand)
-
-#define atomic_fetch_xor_explicit(object, operand, order) \
-    atomic_fetch_xor(object, operand)
-
-#define atomic_fetch_and_explicit(object, operand, order) \
-    atomic_fetch_and(object, operand)
-
-#define atomic_flag_test_and_set(object) \
-    atomic_exchange(object, 1)
-
-#define atomic_flag_test_and_set_explicit(object, order) \
-    atomic_flag_test_and_set(object)
-
-#define atomic_flag_clear(object) \
-    atomic_store(object, 0)
-
-#define atomic_flag_clear_explicit(object, order) \
-    atomic_flag_clear(object)
-
-#endif /* COMPAT_ATOMICS_SUNCC_STDATOMIC_H */
--- a/compat/atomics/win32/stdatomic.h
+++ b/compat/atomics/win32/stdatomic.h
@@ -1,181 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H
-#define COMPAT_ATOMICS_WIN32_STDATOMIC_H
-
-#define WIN32_LEAN_AND_MEAN
-#include <stddef.h>
-#include <stdint.h>
-#include <windows.h>
-
-#define ATOMIC_FLAG_INIT 0
-
-#define ATOMIC_VAR_INIT(value) (value)
-
-#define atomic_init(obj, value) \
-do {                            \
-    *(obj) = (value);           \
-} while(0)
-
-#define kill_dependency(y) ((void)0)
-
-#define atomic_thread_fence(order) \
-    MemoryBarrier();
-
-#define atomic_signal_fence(order) \
-    ((void)0)
-
-#define atomic_is_lock_free(obj) 0
-
-typedef intptr_t atomic_flag;
-typedef intptr_t atomic_bool;
-typedef intptr_t atomic_char;
-typedef intptr_t atomic_schar;
-typedef intptr_t atomic_uchar;
-typedef intptr_t atomic_short;
-typedef intptr_t atomic_ushort;
-typedef intptr_t atomic_int;
-typedef intptr_t atomic_uint;
-typedef intptr_t atomic_long;
-typedef intptr_t atomic_ulong;
-typedef intptr_t atomic_llong;
-typedef intptr_t atomic_ullong;
-typedef intptr_t atomic_wchar_t;
-typedef intptr_t atomic_int_least8_t;
-typedef intptr_t atomic_uint_least8_t;
-typedef intptr_t atomic_int_least16_t;
-typedef intptr_t atomic_uint_least16_t;
-typedef intptr_t atomic_int_least32_t;
-typedef intptr_t atomic_uint_least32_t;
-typedef intptr_t atomic_int_least64_t;
-typedef intptr_t atomic_uint_least64_t;
-typedef intptr_t atomic_int_fast8_t;
-typedef intptr_t atomic_uint_fast8_t;
-typedef intptr_t atomic_int_fast16_t;
-typedef intptr_t atomic_uint_fast16_t;
-typedef intptr_t atomic_int_fast32_t;
-typedef intptr_t atomic_uint_fast32_t;
-typedef intptr_t atomic_int_fast64_t;
-typedef intptr_t atomic_uint_fast64_t;
-typedef intptr_t atomic_intptr_t;
-typedef intptr_t atomic_uintptr_t;
-typedef intptr_t atomic_size_t;
-typedef intptr_t atomic_ptrdiff_t;
-typedef intptr_t atomic_intmax_t;
-typedef intptr_t atomic_uintmax_t;
-
-#define atomic_store(object, desired)   \
-do {                                    \
-    *(object) = (desired);              \
-    MemoryBarrier();                    \
-} while (0)
-
-#define atomic_store_explicit(object, desired, order) \
-    atomic_store(object, desired)
-
-#define atomic_load(object) \
-    (MemoryBarrier(), *(object))
-
-#define atomic_load_explicit(object, order) \
-    atomic_load(object)
-
-#define atomic_exchange(object, desired) \
-    InterlockedExchangePointer(object, desired);
-
-#define atomic_exchange_explicit(object, desired, order) \
-    atomic_exchange(object, desired)
-
-static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
-                                                 intptr_t desired)
-{
-    intptr_t old = *expected;
-    *expected = (intptr_t)InterlockedCompareExchangePointer(
-        (PVOID *)object, (PVOID)desired, (PVOID)old);
-    return *expected == old;
-}
-
-#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak(object, expected, desired) \
-    atomic_compare_exchange_strong(object, expected, desired)
-
-#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
-    atomic_compare_exchange_weak(object, expected, desired)
-
-#ifdef _WIN64
-#define atomic_fetch_add(object, operand) \
-    InterlockedExchangeAdd64(object, operand)
-
-#define atomic_fetch_sub(object, operand) \
-    InterlockedExchangeAdd64(object, -(operand))
-
-#define atomic_fetch_or(object, operand) \
-    InterlockedOr64(object, operand)
-
-#define atomic_fetch_xor(object, operand) \
-    InterlockedXor64(object, operand)
-
-#define atomic_fetch_and(object, operand) \
-    InterlockedAnd64(object, operand)
-#else
-#define atomic_fetch_add(object, operand) \
-    InterlockedExchangeAdd(object, operand)
-
-#define atomic_fetch_sub(object, operand) \
-    InterlockedExchangeAdd(object, -(operand))
-
-#define atomic_fetch_or(object, operand) \
-    InterlockedOr(object, operand)
-
-#define atomic_fetch_xor(object, operand) \
-    InterlockedXor(object, operand)
-
-#define atomic_fetch_and(object, operand) \
-    InterlockedAnd(object, operand)
-#endif /* _WIN64 */
-
-#define atomic_fetch_add_explicit(object, operand, order) \
-    atomic_fetch_add(object, operand)
-
-#define atomic_fetch_sub_explicit(object, operand, order) \
-    atomic_fetch_sub(object, operand)
-
-#define atomic_fetch_or_explicit(object, operand, order) \
-    atomic_fetch_or(object, operand)
-
-#define atomic_fetch_xor_explicit(object, operand, order) \
-    atomic_fetch_xor(object, operand)
-
-#define atomic_fetch_and_explicit(object, operand, order) \
-    atomic_fetch_and(object, operand)
-
-#define atomic_flag_test_and_set(object) \
-    atomic_exchange(object, 1)
-
-#define atomic_flag_test_and_set_explicit(object, order) \
-    atomic_flag_test_and_set(object)
-
-#define atomic_flag_clear(object) \
-    atomic_store(object, 0)
-
-#define atomic_flag_clear_explicit(object, order) \
-    atomic_flag_clear(object)
-
-#endif /* COMPAT_ATOMICS_WIN32_STDATOMIC_H */
--- a/compat/avisynth/avisynth_c.h
+++ b/compat/avisynth/avisynth_c.h
--- a/compat/avisynth/avs/capi.h
+++ b/compat/avisynth/avs/capi.h
@@ -1,94 +0,0 @@
-// Avisynth C Interface Version 0.20
-// Copyright 2003 Kevin Atkinson
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html .
-//
-// As a special exception, I give you permission to link to the
-// Avisynth C interface with independent modules that communicate with
-// the Avisynth C interface solely through the interfaces defined in
-// avisynth_c.h, regardless of the license terms of these independent
-// modules, and to copy and distribute the resulting combined work
-// under terms of your choice, provided that every copy of the
-// combined work is accompanied by a complete copy of the source code
-// of the Avisynth C interface and Avisynth itself (with the version
-// used to produce the combined work), being distributed under the
-// terms of the GNU General Public License plus this exception.  An
-// independent module is a module which is not derived from or based
-// on Avisynth C Interface, such as 3rd-party filters, import and
-// export plugins, or graphical user interfaces.
-
-#ifndef AVS_CAPI_H
-#define AVS_CAPI_H
-
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C
-#endif
-
-#ifdef BUILDING_AVSCORE
-#  if defined(GCC) && defined(X86_32)
-#    define AVSC_CC
-#  else // MSVC builds and 64-bit GCC
-#    ifndef AVSC_USE_STDCALL
-#      define AVSC_CC __cdecl
-#    else
-#      define AVSC_CC __stdcall
-#    endif
-#  endif
-#else // needed for programs that talk to AviSynth+
-#  ifndef AVSC_WIN32_GCC32 // see comment below
-#    ifndef AVSC_USE_STDCALL
-#      define AVSC_CC __cdecl
-#    else
-#      define AVSC_CC __stdcall
-#    endif
-#  else
-#    define AVSC_CC
-#  endif
-#endif
-
-// On 64-bit Windows, there's only one calling convention,
-// so there is no difference between MSVC and GCC. On 32-bit,
-// this isn't true. The convention that GCC needs to use to
-// even build AviSynth+ as 32-bit makes anything that uses
-// it incompatible with 32-bit MSVC builds of AviSynth+.
-// The AVSC_WIN32_GCC32 define is meant to provide a user
-// switchable way to make builds of FFmpeg to test 32-bit
-// GCC builds of AviSynth+ without having to screw around
-// with alternate headers, while still default to the usual
-// situation of using 32-bit MSVC builds of AviSynth+.
-
-// Hopefully, this situation will eventually be resolved
-// and a broadly compatible solution will arise so the
-// same 32-bit FFmpeg build can handle either MSVC or GCC
-// builds of AviSynth+.
-
-#define AVSC_INLINE static __inline
-
-#ifdef BUILDING_AVSCORE
-#  define AVSC_EXPORT __declspec(dllexport)
-#  define AVSC_API(ret, name) EXTERN_C AVSC_EXPORT ret AVSC_CC name
-#else
-#  define AVSC_EXPORT EXTERN_C __declspec(dllexport)
-#  ifndef AVSC_NO_DECLSPEC
-#    define AVSC_API(ret, name) EXTERN_C __declspec(dllimport) ret AVSC_CC name
-#  else
-#    define AVSC_API(ret, name) typedef ret (AVSC_CC *name##_func)
-#  endif
-#endif
-
-#endif //AVS_CAPI_H
--- a/compat/avisynth/avs/config.h
+++ b/compat/avisynth/avs/config.h
@@ -1,70 +0,0 @@
-// Avisynth C Interface Version 0.20
-// Copyright 2003 Kevin Atkinson
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html .
-//
-// As a special exception, I give you permission to link to the
-// Avisynth C interface with independent modules that communicate with
-// the Avisynth C interface solely through the interfaces defined in
-// avisynth_c.h, regardless of the license terms of these independent
-// modules, and to copy and distribute the resulting combined work
-// under terms of your choice, provided that every copy of the
-// combined work is accompanied by a complete copy of the source code
-// of the Avisynth C interface and Avisynth itself (with the version
-// used to produce the combined work), being distributed under the
-// terms of the GNU General Public License plus this exception.  An
-// independent module is a module which is not derived from or based
-// on Avisynth C Interface, such as 3rd-party filters, import and
-// export plugins, or graphical user interfaces.
-
-#ifndef AVS_CONFIG_H
-#define AVS_CONFIG_H
-
-// Undefine this to get cdecl calling convention
-#define AVSC_USE_STDCALL 1
-
-// NOTE TO PLUGIN AUTHORS:
-// Because FRAME_ALIGN can be substantially higher than the alignment
-// a plugin actually needs, plugins should not use FRAME_ALIGN to check for
-// alignment. They should always request the exact alignment value they need.
-// This is to make sure that plugins work over the widest range of AviSynth
-// builds possible.
-#define FRAME_ALIGN 64
-
-#if   defined(_M_AMD64) || defined(__x86_64)
-#   define X86_64
-#elif defined(_M_IX86) || defined(__i386__)
-#   define X86_32
-#else
-#   error Unsupported CPU architecture.
-#endif
-
-#if   defined(_MSC_VER)
-#   define MSVC
-#elif defined(__GNUC__)
-#   define GCC
-#elif defined(__clang__)
-#   define CLANG
-#else
-#   error Unsupported compiler.
-#endif
-
-#if   defined(GCC)
-#   undef __forceinline
-#   define __forceinline inline
-#endif
-
-#endif //AVS_CONFIG_H
--- a/compat/avisynth/avs/types.h
+++ b/compat/avisynth/avs/types.h
@@ -1,57 +0,0 @@
-// Avisynth C Interface Version 0.20
-// Copyright 2003 Kevin Atkinson
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html .
-//
-// As a special exception, I give you permission to link to the
-// Avisynth C interface with independent modules that communicate with
-// the Avisynth C interface solely through the interfaces defined in
-// avisynth_c.h, regardless of the license terms of these independent
-// modules, and to copy and distribute the resulting combined work
-// under terms of your choice, provided that every copy of the
-// combined work is accompanied by a complete copy of the source code
-// of the Avisynth C interface and Avisynth itself (with the version
-// used to produce the combined work), being distributed under the
-// terms of the GNU General Public License plus this exception.  An
-// independent module is a module which is not derived from or based
-// on Avisynth C Interface, such as 3rd-party filters, import and
-// export plugins, or graphical user interfaces.
-
-#ifndef AVS_TYPES_H
-#define AVS_TYPES_H
-
-// Define all types necessary for interfacing with avisynth.dll
-
-#ifdef __cplusplus
-  #include <cstddef>
-#else
-  #include <stddef.h>
-#endif
-
-// Raster types used by VirtualDub & Avisynth
-typedef unsigned int    Pixel32;
-typedef unsigned char   BYTE;
-
-// Audio Sample information
-typedef float SFLOAT;
-
-#ifdef __GNUC__
-typedef long long int INT64;
-#else
-typedef __int64 INT64;
-#endif
-
-#endif //AVS_TYPES_H
--- a/compat/avisynth/avxsynth_c.h
+++ b/compat/avisynth/avxsynth_c.h
@@ -1,728 +0,0 @@
-// Avisynth C Interface Version 0.20
-// Copyright 2003 Kevin Atkinson
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-// MA 02110-1301 USA, or visit
-// http://www.gnu.org/copyleft/gpl.html .
-//
-// As a special exception, I give you permission to link to the
-// Avisynth C interface with independent modules that communicate with
-// the Avisynth C interface solely through the interfaces defined in
-// avisynth_c.h, regardless of the license terms of these independent
-// modules, and to copy and distribute the resulting combined work
-// under terms of your choice, provided that every copy of the
-// combined work is accompanied by a complete copy of the source code
-// of the Avisynth C interface and Avisynth itself (with the version
-// used to produce the combined work), being distributed under the
-// terms of the GNU General Public License plus this exception.  An
-// independent module is a module which is not derived from or based
-// on Avisynth C Interface, such as 3rd-party filters, import and
-// export plugins, or graphical user interfaces.
-
-#ifndef __AVXSYNTH_C__
-#define __AVXSYNTH_C__
-
-#include "windowsPorts/windows2linux.h"
-#include <stdarg.h>
-
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C
-#endif
-
-#define AVSC_USE_STDCALL 1
-
-#ifndef AVSC_USE_STDCALL
-#  define AVSC_CC __cdecl
-#else
-#  define AVSC_CC __stdcall
-#endif
-
-#define AVSC_INLINE static __inline
-
-#ifdef AVISYNTH_C_EXPORTS
-#  define AVSC_EXPORT EXTERN_C
-#  define AVSC_API(ret, name) EXTERN_C __declspec(dllexport) ret AVSC_CC name
-#else
-#  define AVSC_EXPORT EXTERN_C __declspec(dllexport)
-#  ifndef AVSC_NO_DECLSPEC
-#    define AVSC_API(ret, name) EXTERN_C __declspec(dllimport) ret AVSC_CC name
-#  else
-#    define AVSC_API(ret, name) typedef ret (AVSC_CC *name##_func)
-#  endif
-#endif
-
-#ifdef __GNUC__
-typedef long long int INT64;
-#else
-typedef __int64 INT64;
-#endif
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Constants
-//
-
-#ifndef __AVXSYNTH_H__
-enum { AVISYNTH_INTERFACE_VERSION = 3 };
-#endif
-
-enum {AVS_SAMPLE_INT8  = 1<<0,
-      AVS_SAMPLE_INT16 = 1<<1,
-      AVS_SAMPLE_INT24 = 1<<2,
-      AVS_SAMPLE_INT32 = 1<<3,
-      AVS_SAMPLE_FLOAT = 1<<4};
-
-enum {AVS_PLANAR_Y=1<<0,
-      AVS_PLANAR_U=1<<1,
-      AVS_PLANAR_V=1<<2,
-      AVS_PLANAR_ALIGNED=1<<3,
-      AVS_PLANAR_Y_ALIGNED=AVS_PLANAR_Y|AVS_PLANAR_ALIGNED,
-      AVS_PLANAR_U_ALIGNED=AVS_PLANAR_U|AVS_PLANAR_ALIGNED,
-      AVS_PLANAR_V_ALIGNED=AVS_PLANAR_V|AVS_PLANAR_ALIGNED};
-
-  // Colorspace properties.
-enum {AVS_CS_BGR = 1<<28,
-      AVS_CS_YUV = 1<<29,
-      AVS_CS_INTERLEAVED = 1<<30,
-      AVS_CS_PLANAR = 1<<31};
-
-  // Specific colorformats
-enum {
-  AVS_CS_UNKNOWN = 0,
-  AVS_CS_BGR24 = 1<<0 | AVS_CS_BGR | AVS_CS_INTERLEAVED,
-  AVS_CS_BGR32 = 1<<1 | AVS_CS_BGR | AVS_CS_INTERLEAVED,
-  AVS_CS_YUY2 = 1<<2 | AVS_CS_YUV | AVS_CS_INTERLEAVED,
-  AVS_CS_YV12 = 1<<3 | AVS_CS_YUV | AVS_CS_PLANAR,  // y-v-u, planar
-  AVS_CS_I420 = 1<<4 | AVS_CS_YUV | AVS_CS_PLANAR,  // y-u-v, planar
-  AVS_CS_IYUV = 1<<4 | AVS_CS_YUV | AVS_CS_PLANAR  // same as above
-};
-
-enum {
-  AVS_IT_BFF = 1<<0,
-  AVS_IT_TFF = 1<<1,
-  AVS_IT_FIELDBASED = 1<<2};
-
-enum {
-  AVS_FILTER_TYPE=1,
-  AVS_FILTER_INPUT_COLORSPACE=2,
-  AVS_FILTER_OUTPUT_TYPE=9,
-  AVS_FILTER_NAME=4,
-  AVS_FILTER_AUTHOR=5,
-  AVS_FILTER_VERSION=6,
-  AVS_FILTER_ARGS=7,
-  AVS_FILTER_ARGS_INFO=8,
-  AVS_FILTER_ARGS_DESCRIPTION=10,
-  AVS_FILTER_DESCRIPTION=11};
-
-enum {  //SUBTYPES
-  AVS_FILTER_TYPE_AUDIO=1,
-  AVS_FILTER_TYPE_VIDEO=2,
-  AVS_FILTER_OUTPUT_TYPE_SAME=3,
-  AVS_FILTER_OUTPUT_TYPE_DIFFERENT=4};
-
-enum {
-  AVS_CACHE_NOTHING=0,
-  AVS_CACHE_RANGE=1,
-  AVS_CACHE_ALL=2,
-  AVS_CACHE_AUDIO=3,
-  AVS_CACHE_AUDIO_NONE=4,
-  AVS_CACHE_AUDIO_AUTO=5
-};
-
-#define AVS_FRAME_ALIGN 16
-
-typedef struct AVS_Clip AVS_Clip;
-typedef struct AVS_ScriptEnvironment AVS_ScriptEnvironment;
-
-/////////////////////////////////////////////////////////////////////
-//
-// AVS_VideoInfo
-//
-
-// AVS_VideoInfo is layed out identicly to VideoInfo
-typedef struct AVS_VideoInfo {
-  int width, height;    // width=0 means no video
-  unsigned fps_numerator, fps_denominator;
-  int num_frames;
-
-  int pixel_type;
-
-  int audio_samples_per_second;   // 0 means no audio
-  int sample_type;
-  INT64 num_audio_samples;
-  int nchannels;
-
-  // Imagetype properties
-
-  int image_type;
-} AVS_VideoInfo;
-
-// useful functions of the above
-AVSC_INLINE int avs_has_video(const AVS_VideoInfo * p)
-        { return (p->width!=0); }
-
-AVSC_INLINE int avs_has_audio(const AVS_VideoInfo * p)
-        { return (p->audio_samples_per_second!=0); }
-
-AVSC_INLINE int avs_is_rgb(const AVS_VideoInfo * p)
-        { return !!(p->pixel_type&AVS_CS_BGR); }
-
-AVSC_INLINE int avs_is_rgb24(const AVS_VideoInfo * p)
-        { return (p->pixel_type&AVS_CS_BGR24)==AVS_CS_BGR24; } // Clear out additional properties
-
-AVSC_INLINE int avs_is_rgb32(const AVS_VideoInfo * p)
-        { return (p->pixel_type & AVS_CS_BGR32) == AVS_CS_BGR32 ; }
-
-AVSC_INLINE int avs_is_yuv(const AVS_VideoInfo * p)
-        { return !!(p->pixel_type&AVS_CS_YUV ); }
-
-AVSC_INLINE int avs_is_yuy2(const AVS_VideoInfo * p)
-        { return (p->pixel_type & AVS_CS_YUY2) == AVS_CS_YUY2; }
-
-AVSC_INLINE int avs_is_yv12(const AVS_VideoInfo * p)
-        { return ((p->pixel_type & AVS_CS_YV12) == AVS_CS_YV12)||((p->pixel_type & AVS_CS_I420) == AVS_CS_I420); }
-
-AVSC_INLINE int avs_is_color_space(const AVS_VideoInfo * p, int c_space)
-        { return ((p->pixel_type & c_space) == c_space); }
-
-AVSC_INLINE int avs_is_property(const AVS_VideoInfo * p, int property)
-        { return ((p->pixel_type & property)==property ); }
-
-AVSC_INLINE int avs_is_planar(const AVS_VideoInfo * p)
-        { return !!(p->pixel_type & AVS_CS_PLANAR); }
-
-AVSC_INLINE int avs_is_field_based(const AVS_VideoInfo * p)
-        { return !!(p->image_type & AVS_IT_FIELDBASED); }
-
-AVSC_INLINE int avs_is_parity_known(const AVS_VideoInfo * p)
-        { return ((p->image_type & AVS_IT_FIELDBASED)&&(p->image_type & (AVS_IT_BFF | AVS_IT_TFF))); }
-
-AVSC_INLINE int avs_is_bff(const AVS_VideoInfo * p)
-        { return !!(p->image_type & AVS_IT_BFF); }
-
-AVSC_INLINE int avs_is_tff(const AVS_VideoInfo * p)
-        { return !!(p->image_type & AVS_IT_TFF); }
-
-AVSC_INLINE int avs_bits_per_pixel(const AVS_VideoInfo * p)
-{
-  switch (p->pixel_type) {
-      case AVS_CS_BGR24: return 24;
-      case AVS_CS_BGR32: return 32;
-      case AVS_CS_YUY2:  return 16;
-      case AVS_CS_YV12:
-      case AVS_CS_I420:  return 12;
-      default:           return 0;
-    }
-}
-AVSC_INLINE int avs_bytes_from_pixels(const AVS_VideoInfo * p, int pixels)
-        { return pixels * (avs_bits_per_pixel(p)>>3); }   // Will work on planar images, but will return only luma planes
-
-AVSC_INLINE int avs_row_size(const AVS_VideoInfo * p)
-        { return avs_bytes_from_pixels(p,p->width); }  // Also only returns first plane on planar images
-
-AVSC_INLINE int avs_bmp_size(const AVS_VideoInfo * vi)
-        { if (avs_is_planar(vi)) {int p = vi->height * ((avs_row_size(vi)+3) & ~3); p+=p>>1; return p;  } return vi->height * ((avs_row_size(vi)+3) & ~3); }
-
-AVSC_INLINE int avs_samples_per_second(const AVS_VideoInfo * p)
-        { return p->audio_samples_per_second; }
-
-
-AVSC_INLINE int avs_bytes_per_channel_sample(const AVS_VideoInfo * p)
-{
-    switch (p->sample_type) {
-      case AVS_SAMPLE_INT8:  return sizeof(signed char);
-      case AVS_SAMPLE_INT16: return sizeof(signed short);
-      case AVS_SAMPLE_INT24: return 3;
-      case AVS_SAMPLE_INT32: return sizeof(signed int);
-      case AVS_SAMPLE_FLOAT: return sizeof(float);
-      default: return 0;
-    }
-}
-AVSC_INLINE int avs_bytes_per_audio_sample(const AVS_VideoInfo * p)
-        { return p->nchannels*avs_bytes_per_channel_sample(p);}
-
-AVSC_INLINE INT64 avs_audio_samples_from_frames(const AVS_VideoInfo * p, INT64 frames)
-        { return ((INT64)(frames) * p->audio_samples_per_second * p->fps_denominator / p->fps_numerator); }
-
-AVSC_INLINE int avs_frames_from_audio_samples(const AVS_VideoInfo * p, INT64 samples)
-        { return (int)(samples * (INT64)p->fps_numerator / (INT64)p->fps_denominator / (INT64)p->audio_samples_per_second); }
-
-AVSC_INLINE INT64 avs_audio_samples_from_bytes(const AVS_VideoInfo * p, INT64 bytes)
-        { return bytes / avs_bytes_per_audio_sample(p); }
-
-AVSC_INLINE INT64 avs_bytes_from_audio_samples(const AVS_VideoInfo * p, INT64 samples)
-        { return samples * avs_bytes_per_audio_sample(p); }
-
-AVSC_INLINE int avs_audio_channels(const AVS_VideoInfo * p)
-        { return p->nchannels; }
-
-AVSC_INLINE int avs_sample_type(const AVS_VideoInfo * p)
-        { return p->sample_type;}
-
-// useful mutator
-AVSC_INLINE void avs_set_property(AVS_VideoInfo * p, int property)
-        { p->image_type|=property; }
-
-AVSC_INLINE void avs_clear_property(AVS_VideoInfo * p, int property)
-        { p->image_type&=~property; }
-
-AVSC_INLINE void avs_set_field_based(AVS_VideoInfo * p, int isfieldbased)
-        { if (isfieldbased) p->image_type|=AVS_IT_FIELDBASED; else p->image_type&=~AVS_IT_FIELDBASED; }
-
-AVSC_INLINE void avs_set_fps(AVS_VideoInfo * p, unsigned numerator, unsigned denominator)
-{
-    unsigned x=numerator, y=denominator;
-    while (y) {   // find gcd
-      unsigned t = x%y; x = y; y = t;
-    }
-    p->fps_numerator = numerator/x;
-    p->fps_denominator = denominator/x;
-}
-
-AVSC_INLINE int avs_is_same_colorspace(AVS_VideoInfo * x, AVS_VideoInfo * y)
-{
-        return (x->pixel_type == y->pixel_type)
-                || (avs_is_yv12(x) && avs_is_yv12(y));
-}
-
-/////////////////////////////////////////////////////////////////////
-//
-// AVS_VideoFrame
-//
-
-// VideoFrameBuffer holds information about a memory block which is used
-// for video data.  For efficiency, instances of this class are not deleted
-// when the refcount reaches zero; instead they're stored in a linked list
-// to be reused.  The instances are deleted when the corresponding AVS
-// file is closed.
-
-// AVS_VideoFrameBuffer is layed out identicly to VideoFrameBuffer
-// DO NOT USE THIS STRUCTURE DIRECTLY
-typedef struct AVS_VideoFrameBuffer {
-  unsigned char * data;
-  int data_size;
-  // sequence_number is incremented every time the buffer is changed, so
-  // that stale views can tell they're no longer valid.
-  long sequence_number;
-
-  long refcount;
-} AVS_VideoFrameBuffer;
-
-// VideoFrame holds a "window" into a VideoFrameBuffer.
-
-// AVS_VideoFrame is layed out identicly to IVideoFrame
-// DO NOT USE THIS STRUCTURE DIRECTLY
-typedef struct AVS_VideoFrame {
-  int refcount;
-  AVS_VideoFrameBuffer * vfb;
-  int offset, pitch, row_size, height, offsetU, offsetV, pitchUV;  // U&V offsets are from top of picture.
-} AVS_VideoFrame;
-
-// Access functions for AVS_VideoFrame
-AVSC_INLINE int avs_get_pitch(const AVS_VideoFrame * p) {
-        return p->pitch;}
-
-AVSC_INLINE int avs_get_pitch_p(const AVS_VideoFrame * p, int plane) {
-  switch (plane) {
-  case AVS_PLANAR_U: case AVS_PLANAR_V: return p->pitchUV;}
-  return p->pitch;}
-
-AVSC_INLINE int avs_get_row_size(const AVS_VideoFrame * p) {
-        return p->row_size; }
-
-AVSC_INLINE int avs_get_row_size_p(const AVS_VideoFrame * p, int plane) {
-        int r;
-    switch (plane) {
-    case AVS_PLANAR_U: case AVS_PLANAR_V:
-                if (p->pitchUV) return p->row_size>>1;
-                else            return 0;
-    case AVS_PLANAR_U_ALIGNED: case AVS_PLANAR_V_ALIGNED:
-                if (p->pitchUV) {
-                        r = ((p->row_size+AVS_FRAME_ALIGN-1)&(~(AVS_FRAME_ALIGN-1)) )>>1; // Aligned rowsize
-                        if (r < p->pitchUV)
-                                return r;
-                        return p->row_size>>1;
-                } else return 0;
-    case AVS_PLANAR_Y_ALIGNED:
-                r = (p->row_size+AVS_FRAME_ALIGN-1)&(~(AVS_FRAME_ALIGN-1)); // Aligned rowsize
-                if (r <= p->pitch)
-                        return r;
-                return p->row_size;
-    }
-    return p->row_size;
-}
-
-AVSC_INLINE int avs_get_height(const AVS_VideoFrame * p) {
-        return p->height;}
-
-AVSC_INLINE int avs_get_height_p(const AVS_VideoFrame * p, int plane) {
-        switch (plane) {
-                case AVS_PLANAR_U: case AVS_PLANAR_V:
-                        if (p->pitchUV) return p->height>>1;
-                        return 0;
-        }
-        return p->height;}
-
-AVSC_INLINE const unsigned char* avs_get_read_ptr(const AVS_VideoFrame * p) {
-        return p->vfb->data + p->offset;}
-
-AVSC_INLINE const unsigned char* avs_get_read_ptr_p(const AVS_VideoFrame * p, int plane)
-{
-        switch (plane) {
-                case AVS_PLANAR_U: return p->vfb->data + p->offsetU;
-                case AVS_PLANAR_V: return p->vfb->data + p->offsetV;
-                default:           return p->vfb->data + p->offset;}
-}
-
-AVSC_INLINE int avs_is_writable(const AVS_VideoFrame * p) {
-        return (p->refcount == 1 && p->vfb->refcount == 1);}
-
-AVSC_INLINE unsigned char* avs_get_write_ptr(const AVS_VideoFrame * p)
-{
-        if (avs_is_writable(p)) {
-                ++p->vfb->sequence_number;
-                return p->vfb->data + p->offset;
-        } else
-                return 0;
-}
-
-AVSC_INLINE unsigned char* avs_get_write_ptr_p(const AVS_VideoFrame * p, int plane)
-{
-        if (plane==AVS_PLANAR_Y && avs_is_writable(p)) {
-                ++p->vfb->sequence_number;
-                return p->vfb->data + p->offset;
-        } else if (plane==AVS_PLANAR_Y) {
-                return 0;
-        } else {
-                switch (plane) {
-                        case AVS_PLANAR_U: return p->vfb->data + p->offsetU;
-                        case AVS_PLANAR_V: return p->vfb->data + p->offsetV;
-                        default:       return p->vfb->data + p->offset;
-                }
-        }
-}
-
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(void, avs_release_video_frame)(AVS_VideoFrame *);
-// makes a shallow copy of a video frame
-AVSC_API(AVS_VideoFrame *, avs_copy_video_frame)(AVS_VideoFrame *);
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-#ifndef AVSC_NO_DECLSPEC
-AVSC_INLINE void avs_release_frame(AVS_VideoFrame * f)
-  {avs_release_video_frame(f);}
-AVSC_INLINE AVS_VideoFrame * avs_copy_frame(AVS_VideoFrame * f)
-  {return avs_copy_video_frame(f);}
-#endif
-
-/////////////////////////////////////////////////////////////////////
-//
-// AVS_Value
-//
-
-// Treat AVS_Value as a fat pointer.  That is use avs_copy_value
-// and avs_release_value appropiaty as you would if AVS_Value was
-// a pointer.
-
-// To maintain source code compatibility with future versions of the
-// avisynth_c API don't use the AVS_Value directly.  Use the helper
-// functions below.
-
-// AVS_Value is layed out identicly to AVSValue
-typedef struct AVS_Value AVS_Value;
-struct AVS_Value {
-  short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong
-               // for some function e'rror
-  short array_size;
-  union {
-    void * clip; // do not use directly, use avs_take_clip
-    char boolean;
-    int integer;
-    INT64 integer64; // match addition of __int64 to avxplugin.h
-    float floating_pt;
-    const char * string;
-    const AVS_Value * array;
-  } d;
-};
-
-// AVS_Value should be initilized with avs_void.
-// Should also set to avs_void after the value is released
-// with avs_copy_value.  Consider it the equalvent of setting
-// a pointer to NULL
-static const AVS_Value avs_void = {'v'};
-
-AVSC_API(void, avs_copy_value)(AVS_Value * dest, AVS_Value src);
-AVSC_API(void, avs_release_value)(AVS_Value);
-
-AVSC_INLINE int avs_defined(AVS_Value v) { return v.type != 'v'; }
-AVSC_INLINE int avs_is_clip(AVS_Value v) { return v.type == 'c'; }
-AVSC_INLINE int avs_is_bool(AVS_Value v) { return v.type == 'b'; }
-AVSC_INLINE int avs_is_int(AVS_Value v) { return v.type == 'i'; }
-AVSC_INLINE int avs_is_float(AVS_Value v) { return v.type == 'f' || v.type == 'i'; }
-AVSC_INLINE int avs_is_string(AVS_Value v) { return v.type == 's'; }
-AVSC_INLINE int avs_is_array(AVS_Value v) { return v.type == 'a'; }
-AVSC_INLINE int avs_is_error(AVS_Value v) { return v.type == 'e'; }
-
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(AVS_Clip *, avs_take_clip)(AVS_Value, AVS_ScriptEnvironment *);
-AVSC_API(void, avs_set_to_clip)(AVS_Value *, AVS_Clip *);
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-AVSC_INLINE int avs_as_bool(AVS_Value v)
-        { return v.d.boolean; }
-AVSC_INLINE int avs_as_int(AVS_Value v)
-        { return v.d.integer; }
-AVSC_INLINE const char * avs_as_string(AVS_Value v)
-        { return avs_is_error(v) || avs_is_string(v) ? v.d.string : 0; }
-AVSC_INLINE double avs_as_float(AVS_Value v)
-        { return avs_is_int(v) ? v.d.integer : v.d.floating_pt; }
-AVSC_INLINE const char * avs_as_error(AVS_Value v)
-        { return avs_is_error(v) ? v.d.string : 0; }
-AVSC_INLINE const AVS_Value * avs_as_array(AVS_Value v)
-        { return v.d.array; }
-AVSC_INLINE int avs_array_size(AVS_Value v)
-        { return avs_is_array(v) ? v.array_size : 1; }
-AVSC_INLINE AVS_Value avs_array_elt(AVS_Value v, int index)
-        { return avs_is_array(v) ? v.d.array[index] : v; }
-
-// only use these functions on am AVS_Value that does not already have
-// an active value.  Remember, treat AVS_Value as a fat pointer.
-AVSC_INLINE AVS_Value avs_new_value_bool(int v0)
-        { AVS_Value v = {0}; v.type = 'b'; v.d.boolean = v0 == 0 ? 0 : 1; return v; }
-AVSC_INLINE AVS_Value avs_new_value_int(int v0)
-        { AVS_Value v = {0}; v.type = 'i'; v.d.integer = v0; return v; }
-AVSC_INLINE AVS_Value avs_new_value_string(const char * v0)
-        { AVS_Value v = {0}; v.type = 's'; v.d.string = v0; return v; }
-AVSC_INLINE AVS_Value avs_new_value_float(float v0)
-        { AVS_Value v = {0}; v.type = 'f'; v.d.floating_pt = v0; return v;}
-AVSC_INLINE AVS_Value avs_new_value_error(const char * v0)
-        { AVS_Value v = {0}; v.type = 'e'; v.d.string = v0; return v; }
-#ifndef AVSC_NO_DECLSPEC
-AVSC_INLINE AVS_Value avs_new_value_clip(AVS_Clip * v0)
-        { AVS_Value v = {0}; avs_set_to_clip(&v, v0); return v; }
-#endif
-AVSC_INLINE AVS_Value avs_new_value_array(AVS_Value * v0, int size)
-        { AVS_Value v = {0}; v.type = 'a'; v.d.array = v0; v.array_size = size; return v; }
-
-/////////////////////////////////////////////////////////////////////
-//
-// AVS_Clip
-//
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(void, avs_release_clip)(AVS_Clip *);
-AVSC_API(AVS_Clip *, avs_copy_clip)(AVS_Clip *);
-
-AVSC_API(const char *, avs_clip_get_error)(AVS_Clip *); // return 0 if no error
-
-AVSC_API(const AVS_VideoInfo *, avs_get_video_info)(AVS_Clip *);
-
-AVSC_API(int, avs_get_version)(AVS_Clip *);
-
-AVSC_API(AVS_VideoFrame *, avs_get_frame)(AVS_Clip *, int n);
-// The returned video frame must be released with avs_release_video_frame
-
-AVSC_API(int, avs_get_parity)(AVS_Clip *, int n);
-// return field parity if field_based, else parity of first field in frame
-
-AVSC_API(int, avs_get_audio)(AVS_Clip *, void * buf,
-                                  INT64 start, INT64 count);
-// start and count are in samples
-
-AVSC_API(int, avs_set_cache_hints)(AVS_Clip *,
-                                        int cachehints, size_t frame_range);
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-// This is the callback type used by avs_add_function
-typedef AVS_Value (AVSC_CC * AVS_ApplyFunc)
-                        (AVS_ScriptEnvironment *, AVS_Value args, void * user_data);
-
-typedef struct AVS_FilterInfo AVS_FilterInfo;
-struct AVS_FilterInfo
-{
-  // these members should not be modified outside of the AVS_ApplyFunc callback
-  AVS_Clip * child;
-  AVS_VideoInfo vi;
-  AVS_ScriptEnvironment * env;
-  AVS_VideoFrame * (AVSC_CC * get_frame)(AVS_FilterInfo *, int n);
-  int (AVSC_CC * get_parity)(AVS_FilterInfo *, int n);
-  int (AVSC_CC * get_audio)(AVS_FilterInfo *, void * buf,
-                                  INT64 start, INT64 count);
-  int (AVSC_CC * set_cache_hints)(AVS_FilterInfo *, int cachehints,
-                                        int frame_range);
-  void (AVSC_CC * free_filter)(AVS_FilterInfo *);
-
-  // Should be set when ever there is an error to report.
-  // It is cleared before any of the above methods are called
-  const char * error;
-  // this is to store whatever and may be modified at will
-  void * user_data;
-};
-
-// Create a new filter
-// fi is set to point to the AVS_FilterInfo so that you can
-//   modify it once it is initilized.
-// store_child should generally be set to true.  If it is not
-//    set than ALL methods (the function pointers) must be defined
-// If it is set than you do not need to worry about freeing the child
-//    clip.
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(AVS_Clip *, avs_new_c_filter)(AVS_ScriptEnvironment * e,
-                                      AVS_FilterInfo * * fi,
-                                      AVS_Value child, int store_child);
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// AVS_ScriptEnvironment
-//
-
-// For GetCPUFlags.  These are backwards-compatible with those in VirtualDub.
-enum {
-                                /* slowest CPU to support extension */
-  AVS_CPU_FORCE        = 0x01,   // N/A
-  AVS_CPU_FPU          = 0x02,   // 386/486DX
-  AVS_CPU_MMX          = 0x04,   // P55C, K6, PII
-  AVS_CPU_INTEGER_SSE  = 0x08,   // PIII, Athlon
-  AVS_CPU_SSE          = 0x10,   // PIII, Athlon XP/MP
-  AVS_CPU_SSE2         = 0x20,   // PIV, Hammer
-  AVS_CPU_3DNOW        = 0x40,   // K6-2
-  AVS_CPU_3DNOW_EXT    = 0x80,   // Athlon
-  AVS_CPU_X86_64       = 0xA0,   // Hammer (note: equiv. to 3DNow + SSE2,
-                                 // which only Hammer will have anyway)
-};
-
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(const char *, avs_get_error)(AVS_ScriptEnvironment *); // return 0 if no error
-
-AVSC_API(long, avs_get_cpu_flags)(AVS_ScriptEnvironment *);
-AVSC_API(int, avs_check_version)(AVS_ScriptEnvironment *, int version);
-
-AVSC_API(char *, avs_save_string)(AVS_ScriptEnvironment *, const char* s, int length);
-AVSC_API(char *, avs_sprintf)(AVS_ScriptEnvironment *, const char * fmt, ...);
-
-AVSC_API(char *, avs_vsprintf)(AVS_ScriptEnvironment *, const char * fmt, va_list val);
- // note: val is really a va_list; I hope everyone typedefs va_list to a pointer
-
-AVSC_API(int, avs_add_function)(AVS_ScriptEnvironment *,
-                                     const char * name, const char * params,
-                                     AVS_ApplyFunc apply, void * user_data);
-
-AVSC_API(int, avs_function_exists)(AVS_ScriptEnvironment *, const char * name);
-
-AVSC_API(AVS_Value, avs_invoke)(AVS_ScriptEnvironment *, const char * name,
-                               AVS_Value args, const char** arg_names);
-// The returned value must be be released with avs_release_value
-
-AVSC_API(AVS_Value, avs_get_var)(AVS_ScriptEnvironment *, const char* name);
-// The returned value must be be released with avs_release_value
-
-AVSC_API(int, avs_set_var)(AVS_ScriptEnvironment *, const char* name, AVS_Value val);
-
-AVSC_API(int, avs_set_global_var)(AVS_ScriptEnvironment *, const char* name, const AVS_Value val);
-
-//void avs_push_context(AVS_ScriptEnvironment *, int level=0);
-//void avs_pop_context(AVS_ScriptEnvironment *);
-
-AVSC_API(AVS_VideoFrame *, avs_new_video_frame_a)(AVS_ScriptEnvironment *,
-                                          const AVS_VideoInfo * vi, int align);
-// align should be at least 16
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-#ifndef AVSC_NO_DECLSPEC
-AVSC_INLINE
-AVS_VideoFrame * avs_new_video_frame(AVS_ScriptEnvironment * env,
-                                     const AVS_VideoInfo * vi)
-  {return avs_new_video_frame_a(env,vi,AVS_FRAME_ALIGN);}
-
-AVSC_INLINE
-AVS_VideoFrame * avs_new_frame(AVS_ScriptEnvironment * env,
-                               const AVS_VideoInfo * vi)
-  {return avs_new_video_frame_a(env,vi,AVS_FRAME_ALIGN);}
-#endif
-
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(int, avs_make_writable)(AVS_ScriptEnvironment *, AVS_VideoFrame * * pvf);
-
-AVSC_API(void, avs_bit_blt)(AVS_ScriptEnvironment *, unsigned char* dstp, int dst_pitch, const unsigned char* srcp, int src_pitch, int row_size, int height);
-
-typedef void (AVSC_CC *AVS_ShutdownFunc)(void* user_data, AVS_ScriptEnvironment * env);
-AVSC_API(void, avs_at_exit)(AVS_ScriptEnvironment *, AVS_ShutdownFunc function, void * user_data);
-
-AVSC_API(AVS_VideoFrame *, avs_subframe)(AVS_ScriptEnvironment *, AVS_VideoFrame * src, int rel_offset, int new_pitch, int new_row_size, int new_height);
-// The returned video frame must be be released
-
-AVSC_API(int, avs_set_memory_max)(AVS_ScriptEnvironment *, int mem);
-
-AVSC_API(int, avs_set_working_dir)(AVS_ScriptEnvironment *, const char * newdir);
-
-// avisynth.dll exports this; it's a way to use it as a library, without
-// writing an AVS script or without going through AVIFile.
-AVSC_API(AVS_ScriptEnvironment *, avs_create_script_environment)(int version);
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-// this symbol is the entry point for the plugin and must
-// be defined
-AVSC_EXPORT
-const char * AVSC_CC avisynth_c_plugin_init(AVS_ScriptEnvironment* env);
-
-
-#if defined __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-AVSC_API(void, avs_delete_script_environment)(AVS_ScriptEnvironment *);
-
-
-AVSC_API(AVS_VideoFrame *, avs_subframe_planar)(AVS_ScriptEnvironment *, AVS_VideoFrame * src, int rel_offset, int new_pitch, int new_row_size, int new_height, int rel_offsetU, int rel_offsetV, int new_pitchUV);
-// The returned video frame must be be released
-#if defined __cplusplus
-}
-#endif // __cplusplus
-
-#endif //__AVXSYNTH_C__
--- a/compat/avisynth/windowsPorts/basicDataTypeConversions.h
+++ b/compat/avisynth/windowsPorts/basicDataTypeConversions.h
@@ -1,85 +0,0 @@
-#ifndef __DATA_TYPE_CONVERSIONS_H__
-#define __DATA_TYPE_CONVERSIONS_H__
-
-#include <stdint.h>
-#include <wchar.h>
-
-#ifdef __cplusplus
-namespace avxsynth {
-#endif // __cplusplus
-
-typedef int64_t __int64;
-typedef int32_t __int32;
-#ifdef __cplusplus
-typedef bool BOOL;
-#else
-typedef uint32_t BOOL;
-#endif // __cplusplus
-typedef void* HMODULE;
-typedef void* LPVOID;
-typedef void* PVOID;
-typedef PVOID HANDLE;
-typedef HANDLE HWND;
-typedef HANDLE HINSTANCE;
-typedef void* HDC;
-typedef void* HBITMAP;
-typedef void* HICON;
-typedef void* HFONT;
-typedef void* HGDIOBJ;
-typedef void* HBRUSH;
-typedef void* HMMIO;
-typedef void* HACMSTREAM;
-typedef void* HACMDRIVER;
-typedef void* HIC;
-typedef void* HACMOBJ;
-typedef HACMSTREAM* LPHACMSTREAM;
-typedef void* HACMDRIVERID;
-typedef void* LPHACMDRIVER;
-typedef unsigned char BYTE;
-typedef BYTE* LPBYTE;
-typedef char TCHAR;
-typedef TCHAR* LPTSTR;
-typedef const TCHAR* LPCTSTR;
-typedef char* LPSTR;
-typedef LPSTR LPOLESTR;
-typedef const char* LPCSTR;
-typedef LPCSTR LPCOLESTR;
-typedef wchar_t WCHAR;
-typedef unsigned short WORD;
-typedef unsigned int UINT;
-typedef UINT MMRESULT;
-typedef uint32_t DWORD;
-typedef DWORD COLORREF;
-typedef DWORD FOURCC;
-typedef DWORD HRESULT;
-typedef DWORD* LPDWORD;
-typedef DWORD* DWORD_PTR;
-typedef int32_t LONG;
-typedef int32_t* LONG_PTR;
-typedef LONG_PTR LRESULT;
-typedef uint32_t ULONG;
-typedef uint32_t* ULONG_PTR;
-//typedef __int64_t intptr_t;
-typedef uint64_t _fsize_t;
-
-
-//
-// Structures
-//
-
-typedef struct _GUID {
-  DWORD Data1;
-  WORD  Data2;
-  WORD  Data3;
-  BYTE  Data4[8];
-} GUID;
-
-typedef GUID REFIID;
-typedef GUID CLSID;
-typedef CLSID* LPCLSID;
-typedef GUID IID;
-
-#ifdef __cplusplus
-}; // namespace avxsynth
-#endif // __cplusplus
-#endif //  __DATA_TYPE_CONVERSIONS_H__
--- a/compat/avisynth/windowsPorts/windows2linux.h
+++ b/compat/avisynth/windowsPorts/windows2linux.h
@@ -1,77 +0,0 @@
-#ifndef __WINDOWS2LINUX_H__
-#define __WINDOWS2LINUX_H__
-
-/*
- * LINUX SPECIFIC DEFINITIONS
-*/
-//
-// Data types conversions
-//
-#include <stdlib.h>
-#include <string.h>
-#include "basicDataTypeConversions.h"
-
-#ifdef __cplusplus
-namespace avxsynth {
-#endif // __cplusplus
-//
-// purposefully define the following MSFT definitions
-// to mean nothing (as they do not mean anything on Linux)
-//
-#define __stdcall
-#define __cdecl
-#define noreturn
-#define __declspec(x)
-#define STDAPI       extern "C" HRESULT
-#define STDMETHODIMP HRESULT __stdcall
-#define STDMETHODIMP_(x) x __stdcall
-
-#define STDMETHOD(x)    virtual HRESULT x
-#define STDMETHOD_(a, x) virtual a x
-
-#ifndef TRUE
-#define TRUE  true
-#endif
-
-#ifndef FALSE
-#define FALSE false
-#endif
-
-#define S_OK                (0x00000000)
-#define S_FALSE             (0x00000001)
-#define E_NOINTERFACE       (0X80004002)
-#define E_POINTER           (0x80004003)
-#define E_FAIL              (0x80004005)
-#define E_OUTOFMEMORY       (0x8007000E)
-
-#define INVALID_HANDLE_VALUE    ((HANDLE)((LONG_PTR)-1))
-#define FAILED(hr)              ((hr) & 0x80000000)
-#define SUCCEEDED(hr)           (!FAILED(hr))
-
-
-//
-// Functions
-//
-#define MAKEDWORD(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
-#define MAKEWORD(a,b) (((a) << 8) | (b))
-
-#define lstrlen                             strlen
-#define lstrcpy                             strcpy
-#define lstrcmpi                            strcasecmp
-#define _stricmp                            strcasecmp
-#define InterlockedIncrement(x)             __sync_fetch_and_add((x), 1)
-#define InterlockedDecrement(x)             __sync_fetch_and_sub((x), 1)
-// Windows uses (new, old) ordering but GCC has (old, new)
-#define InterlockedCompareExchange(x,y,z)   __sync_val_compare_and_swap(x,z,y)
-
-#define UInt32x32To64(a, b)                 ( (uint64_t) ( ((uint64_t)((uint32_t)(a))) * ((uint32_t)(b))  ) )
-#define Int64ShrlMod32(a, b)                ( (uint64_t) ( (uint64_t)(a) >> (b) ) )
-#define Int32x32To64(a, b)                  ((__int64)(((__int64)((long)(a))) * ((long)(b))))
-
-#define MulDiv(nNumber, nNumerator, nDenominator)   (int32_t) (((int64_t) (nNumber) * (int64_t) (nNumerator) + (int64_t) ((nDenominator)/2)) / (int64_t) (nDenominator))
-
-#ifdef __cplusplus
-}; // namespace avxsynth
-#endif // __cplusplus
-
-#endif //  __WINDOWS2LINUX_H__
--- a/compat/cuda/dynlink_loader.h
+++ b/compat/cuda/dynlink_loader.h
@@ -1,33 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AV_COMPAT_CUDA_DYNLINK_LOADER_H
-#define AV_COMPAT_CUDA_DYNLINK_LOADER_H
-
-#include "libavutil/log.h"
-#include "compat/w32dlfcn.h"
-
-#define FFNV_LOAD_FUNC(path) dlopen((path), RTLD_LAZY)
-#define FFNV_SYM_FUNC(lib, sym) dlsym((lib), (sym))
-#define FFNV_FREE_FUNC(lib) dlclose(lib)
-#define FFNV_LOG_FUNC(logctx, msg, ...) av_log(logctx, AV_LOG_ERROR, msg,  __VA_ARGS__)
-#define FFNV_DEBUG_LOG_FUNC(logctx, msg, ...) av_log(logctx, AV_LOG_DEBUG, msg,  __VA_ARGS__)
-
-#include <ffnvcodec/dynlink_loader.h>
-
-#endif
--- a/compat/cuda/ptx2c.sh
+++ b/compat/cuda/ptx2c.sh
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-set -e
-
-OUT="$1"
-IN="$2"
-NAME="$(basename "$IN" | sed 's/\..*//')"
-
-printf "const char %s_ptx[] = \\" "$NAME" > "$OUT"
-while IFS= read -r LINE
-do
-    printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed -e 's/\r//g' -e 's/["\\]/\\&/g')" >> "$OUT"
-done < "$IN"
-printf ";\n" >> "$OUT"
-
-exit 0
--- a/compat/dispatch_semaphore/semaphore.h
+++ b/compat/dispatch_semaphore/semaphore.h
@@ -1,42 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_DISPATCH_SEMAPHORE_SEMAPHORE_H
-#define COMPAT_DISPATCH_SEMAPHORE_SEMAPHORE_H
-
-#include <dispatch/dispatch.h>
-#include <errno.h>
-
-#define sem_t dispatch_semaphore_t
-#define sem_post(psem)              dispatch_semaphore_signal(*psem)
-#define sem_wait(psem)              dispatch_semaphore_wait(*psem, DISPATCH_TIME_FOREVER)
-#define sem_timedwait(psem, val)    dispatch_semaphore_wait(*psem, dispatch_walltime(val, 0))
-#define sem_destroy(psem)           dispatch_release(*psem)
-
-static inline int compat_sem_init(dispatch_semaphore_t *psem,
-                                  int unused, int val)
-{
-    int ret = !!(*psem = dispatch_semaphore_create(val)) - 1;
-    if (ret < 0)
-        errno = ENOMEM;
-    return ret;
-}
-
-#define sem_init compat_sem_init
-
-#endif /* COMPAT_DISPATCH_SEMAPHORE_SEMAPHORE_H */
--- a/compat/djgpp/math.c
+++ b/compat/djgpp/math.c
@@ -1,47 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <math.h>
-
-#define FUN(name, type, op) \
-type name(type x, type y) \
-{ \
-    if (fpclassify(x) == FP_NAN) return y; \
-    if (fpclassify(y) == FP_NAN) return x; \
-    return x op y ? x : y; \
-}
-
-FUN(fmin, double, <)
-FUN(fmax, double, >)
-FUN(fminf, float, <)
-FUN(fmaxf, float, >)
-
-long double fmodl(long double x, long double y)
-{
-    return fmod(x, y);
-}
-
-long double scalbnl(long double x, int exp)
-{
-    return scalbn(x, exp);
-}
-
-long double copysignl(long double x, long double y)
-{
-    return copysign(x, y);
-}
--- a/compat/djgpp/math.h
+++ b/compat/djgpp/math.h
@@ -1,25 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-double fmin(double, double);
-double fmax(double, double);
-float fminf(float, float);
-float fmaxf(float, float);
-long double fmodl(long double, long double);
-long double scalbnl(long double, int);
-long double copysignl(long double, long double);
--- a/compat/float/float.h
+++ b/compat/float/float.h
@@ -1,35 +0,0 @@
-/*
- * Work around broken floating point limits on some systems.
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include_next <float.h>
-
-#ifdef FLT_MAX
-#undef  FLT_MAX
-#define FLT_MAX 3.40282346638528859812e+38F
-
-#undef  FLT_MIN
-#define FLT_MIN 1.17549435082228750797e-38F
-
-#undef  DBL_MAX
-#define DBL_MAX ((double)1.79769313486231570815e+308L)
-
-#undef  DBL_MIN
-#define DBL_MIN ((double)2.22507385850720138309e-308L)
-#endif
--- a/compat/float/limits.h
+++ b/compat/float/limits.h
@@ -1,22 +0,0 @@
-/*
- * Work around broken floating point limits on some systems.
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include_next <limits.h>
-#include <float.h>
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -1,84 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * This file was copied from the following newsgroup posting:
- *
- * Newsgroups: mod.std.unix
- * Subject: public domain AT&T getopt source
- * Date: 3 Nov 85 19:34:15 GMT
- *
- * Here's something you've all been waiting for:  the AT&T public domain
- * source for getopt(3).  It is the code which was given out at the 1985
- * UNIFORUM conference in Dallas.  I obtained it by electronic mail
- * directly from AT&T.  The people there assure me that it is indeed
- * in the public domain.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-static int opterr = 1;
-static int optind = 1;
-static int optopt;
-static char *optarg;
-
-static int getopt(int argc, char *argv[], char *opts)
-{
-    static int sp = 1;
-    int c;
-    char *cp;
-
-    if (sp == 1) {
-        if (optind >= argc ||
-            argv[optind][0] != '-' || argv[optind][1] == '\0')
-            return EOF;
-        else if (!strcmp(argv[optind], "--")) {
-            optind++;
-            return EOF;
-        }
-    }
-    optopt = c = argv[optind][sp];
-    if (c == ':' || !(cp = strchr(opts, c))) {
-        fprintf(stderr, ": illegal option -- %c\n", c);
-        if (argv[optind][++sp] == '\0') {
-            optind++;
-            sp = 1;
-        }
-        return '?';
-    }
-    if (*++cp == ':') {
-        if (argv[optind][sp+1] != '\0')
-            optarg = &argv[optind++][sp+1];
-        else if(++optind >= argc) {
-            fprintf(stderr, ": option requires an argument -- %c\n", c);
-            sp = 1;
-            return '?';
-        } else
-            optarg = argv[optind++];
-        sp = 1;
-    } else {
-        if (argv[optind][++sp] == '\0') {
-            sp = 1;
-            optind++;
-        }
-        optarg = NULL;
-    }
-
-    return c;
-}
--- a/compat/msvcrt/snprintf.c
+++ b/compat/msvcrt/snprintf.c
@@ -1,71 +0,0 @@
-/*
- * C99-compatible snprintf() and vsnprintf() implementations
- * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <string.h>
-
-#include "compat/va_copy.h"
-#include "libavutil/error.h"
-
-#if defined(__MINGW32__)
-#define EOVERFLOW EFBIG
-#endif
-
-int avpriv_snprintf(char *s, size_t n, const char *fmt, ...)
-{
-    va_list ap;
-    int ret;
-
-    va_start(ap, fmt);
-    ret = avpriv_vsnprintf(s, n, fmt, ap);
-    va_end(ap);
-
-    return ret;
-}
-
-int avpriv_vsnprintf(char *s, size_t n, const char *fmt,
-                     va_list ap)
-{
-    int ret;
-    va_list ap_copy;
-
-    if (n == 0)
-        return _vscprintf(fmt, ap);
-    else if (n > INT_MAX)
-        return AVERROR(EOVERFLOW);
-
-    /* we use n - 1 here because if the buffer is not big enough, the MS
-     * runtime libraries don't add a terminating zero at the end. MSDN
-     * recommends to provide _snprintf/_vsnprintf() a buffer size that
-     * is one less than the actual buffer, and zero it before calling
-     * _snprintf/_vsnprintf() to workaround this problem.
-     * See http://msdn.microsoft.com/en-us/library/1kt27hek(v=vs.80).aspx */
-    memset(s, 0, n);
-    va_copy(ap_copy, ap);
-    ret = _vsnprintf(s, n - 1, fmt, ap_copy);
-    va_end(ap_copy);
-    if (ret == -1)
-        ret = _vscprintf(fmt, ap);
-
-    return ret;
-}
--- a/compat/msvcrt/snprintf.h
+++ b/compat/msvcrt/snprintf.h
@@ -1,38 +0,0 @@
-/*
- * C99-compatible snprintf() and vsnprintf() implementations
- * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_MSVCRT_SNPRINTF_H
-#define COMPAT_MSVCRT_SNPRINTF_H
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int avpriv_snprintf(char *s, size_t n, const char *fmt, ...);
-int avpriv_vsnprintf(char *s, size_t n, const char *fmt, va_list ap);
-
-#undef snprintf
-#undef _snprintf
-#undef vsnprintf
-#define snprintf avpriv_snprintf
-#define _snprintf avpriv_snprintf
-#define vsnprintf avpriv_vsnprintf
-
-#endif /* COMPAT_MSVCRT_SNPRINTF_H */
--- a/compat/os2threads.h
+++ b/compat/os2threads.h
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2011-2017 KO Myung-Hun <komh@chollian.net>
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * os2threads to pthreads wrapper
- */
-
-#ifndef COMPAT_OS2THREADS_H
-#define COMPAT_OS2THREADS_H
-
-#define INCL_DOS
-#include <os2.h>
-
-#undef __STRICT_ANSI__          /* for _beginthread() */
-#include <stdlib.h>
-
-#include <sys/builtin.h>
-#include <sys/fmutex.h>
-
-#include "libavutil/attributes.h"
-
-typedef struct {
-    TID tid;
-    void *(*start_routine)(void *);
-    void *arg;
-    void *result;
-} pthread_t;
-
-typedef void pthread_attr_t;
-
-typedef _fmutex pthread_mutex_t;
-typedef void pthread_mutexattr_t;
-
-#define PTHREAD_MUTEX_INITIALIZER _FMUTEX_INITIALIZER
-
-typedef struct {
-    HEV event_sem;
-    HEV ack_sem;
-    volatile unsigned  wait_count;
-} pthread_cond_t;
-
-typedef void pthread_condattr_t;
-
-typedef struct {
-    volatile int done;
-    _fmutex mtx;
-} pthread_once_t;
-
-#define PTHREAD_ONCE_INIT {0, _FMUTEX_INITIALIZER}
-
-static void thread_entry(void *arg)
-{
-    pthread_t *thread = arg;
-
-    thread->result = thread->start_routine(thread->arg);
-}
-
-static av_always_inline int pthread_create(pthread_t *thread,
-                                           const pthread_attr_t *attr,
-                                           void *(*start_routine)(void*),
-                                           void *arg)
-{
-    thread->start_routine = start_routine;
-    thread->arg = arg;
-    thread->result = NULL;
-
-    thread->tid = _beginthread(thread_entry, NULL, 1024 * 1024, thread);
-
-    return 0;
-}
-
-static av_always_inline int pthread_join(pthread_t thread, void **value_ptr)
-{
-    DosWaitThread(&thread.tid, DCWW_WAIT);
-
-    if (value_ptr)
-        *value_ptr = thread.result;
-
-    return 0;
-}
-
-static av_always_inline int pthread_mutex_init(pthread_mutex_t *mutex,
-                                               const pthread_mutexattr_t *attr)
-{
-    _fmutex_create(mutex, 0);
-
-    return 0;
-}
-
-static av_always_inline int pthread_mutex_destroy(pthread_mutex_t *mutex)
-{
-    _fmutex_close(mutex);
-
-    return 0;
-}
-
-static av_always_inline int pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-    _fmutex_request(mutex, 0);
-
-    return 0;
-}
-
-static av_always_inline int pthread_mutex_unlock(pthread_mutex_t *mutex)
-{
-    _fmutex_release(mutex);
-
-    return 0;
-}
-
-static av_always_inline int pthread_cond_init(pthread_cond_t *cond,
-                                              const pthread_condattr_t *attr)
-{
-    DosCreateEventSem(NULL, &cond->event_sem, DCE_POSTONE, FALSE);
-    DosCreateEventSem(NULL, &cond->ack_sem, DCE_POSTONE, FALSE);
-
-    cond->wait_count = 0;
-
-    return 0;
-}
-
-static av_always_inline int pthread_cond_destroy(pthread_cond_t *cond)
-{
-    DosCloseEventSem(cond->event_sem);
-    DosCloseEventSem(cond->ack_sem);
-
-    return 0;
-}
-
-static av_always_inline int pthread_cond_signal(pthread_cond_t *cond)
-{
-    if (!__atomic_cmpxchg32(&cond->wait_count, 0, 0)) {
-        DosPostEventSem(cond->event_sem);
-        DosWaitEventSem(cond->ack_sem, SEM_INDEFINITE_WAIT);
-    }
-
-    return 0;
-}
-
-static av_always_inline int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-    while (!__atomic_cmpxchg32(&cond->wait_count, 0, 0))
-        pthread_cond_signal(cond);
-
-    return 0;
-}
-
-static av_always_inline int pthread_cond_wait(pthread_cond_t *cond,
-                                              pthread_mutex_t *mutex)
-{
-    __atomic_increment(&cond->wait_count);
-
-    pthread_mutex_unlock(mutex);
-
-    DosWaitEventSem(cond->event_sem, SEM_INDEFINITE_WAIT);
-
-    __atomic_decrement(&cond->wait_count);
-
-    DosPostEventSem(cond->ack_sem);
-
-    pthread_mutex_lock(mutex);
-
-    return 0;
-}
-
-static av_always_inline int pthread_once(pthread_once_t *once_control,
-                                         void (*init_routine)(void))
-{
-    if (!once_control->done)
-    {
-        _fmutex_request(&once_control->mtx, 0);
-
-        if (!once_control->done)
-        {
-            init_routine();
-
-            once_control->done = 1;
-        }
-
-        _fmutex_release(&once_control->mtx);
-    }
-
-    return 0;
-}
-#endif /* COMPAT_OS2THREADS_H */
--- a/compat/solaris/make_sunver.pl
+++ b/compat/solaris/make_sunver.pl
@@ -1,352 +0,0 @@
-#!/usr/bin/env perl
-
-# make_sunver.pl
-#
-#   Copyright (C) 2010, 2011, 2012, 2013
-#   Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.GPLv3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-# This script takes at least two arguments, a GNU style version script and
-# a list of object and archive files, and generates a corresponding Sun
-# style version script as follows:
-#
-# Each glob pattern, C++ mangled pattern or literal in the input script is
-# matched against all global symbols in the input objects, emitting those
-# that matched (or nothing if no match was found).
-# A comment with the original pattern and its type is left in the output
-# file to make it easy to understand the matches.
-#
-# It uses elfdump when present (native), GNU readelf otherwise.
-# It depends on the GNU version of c++filt, since it must understand the
-# GNU mangling style.
-
-use FileHandle;
-use IPC::Open2;
-
-# Enforce C locale.
-$ENV{'LC_ALL'} = "C";
-$ENV{'LANG'} = "C";
-
-# Input version script, GNU style.
-my $symvers = shift;
-
-##########
-# Get all the symbols from the library, match them, and add them to a hash.
-
-my %sym_hash = ();
-
-# List of objects and archives to process.
-my @OBJECTS = ();
-
-# List of shared objects to omit from processing.
-my @SHAREDOBJS = ();
-
-# Filter out those input archives that have corresponding shared objects to
-# avoid adding all symbols matched in the archive to the output map.
-foreach $file (@ARGV) {
-    if (($so = $file) =~ s/\.a$/.so/ && -e $so) {
-    printf STDERR "omitted $file -> $so\n";
-    push (@SHAREDOBJS, $so);
-    } else {
-    push (@OBJECTS, $file);
-    }
-}
-
-# We need to detect and ignore hidden symbols.  Solaris nm can only detect
-# this in the harder to parse default output format, and GNU nm not at all,
-# so use elfdump -s in the native case and GNU readelf -s otherwise.
-# GNU objdump -t cannot be used since it produces a variable number of
-# columns.
-
-# The path to elfdump.
-my $elfdump = "/usr/ccs/bin/elfdump";
-
-if (-f $elfdump) {
-    open ELFDUMP,$elfdump.' -s '.(join ' ',@OBJECTS).'|' or die $!;
-    my $skip_arsym = 0;
-
-    while (<ELFDUMP>) {
-    chomp;
-
-    # Ignore empty lines.
-    if (/^$/) {
-        # End of archive symbol table, stop skipping.
-        $skip_arsym = 0 if $skip_arsym;
-        next;
-    }
-
-    # Keep skipping until end of archive symbol table.
-    next if ($skip_arsym);
-
-    # Ignore object name header for individual objects and archives.
-    next if (/:$/);
-
-    # Ignore table header lines.
-    next if (/^Symbol Table Section:/);
-    next if (/index.*value.*size/);
-
-    # Start of archive symbol table: start skipping.
-    if (/^Symbol Table: \(archive/) {
-        $skip_arsym = 1;
-        next;
-    }
-
-    # Split table.
-    (undef, undef, undef, undef, $bind, $oth, undef, $shndx, $name) = split;
-
-    # Error out for unknown input.
-    die "unknown input line:\n$_" unless defined($bind);
-
-    # Ignore local symbols.
-    next if ($bind eq "LOCL");
-    # Ignore hidden symbols.
-    next if ($oth eq "H");
-    # Ignore undefined symbols.
-    next if ($shndx eq "UNDEF");
-    # Error out for unhandled cases.
-    if ($bind !~ /^(GLOB|WEAK)/ or $oth ne "D") {
-        die "unhandled symbol:\n$_";
-    }
-
-    # Remember symbol.
-    $sym_hash{$name}++;
-    }
-    close ELFDUMP or die "$elfdump error";
-} else {
-    open READELF, 'readelf -s -W '.(join ' ',@OBJECTS).'|' or die $!;
-    # Process each symbol.
-    while (<READELF>) {
-    chomp;
-
-    # Ignore empty lines.
-    next if (/^$/);
-
-    # Ignore object name header.
-    next if (/^File: .*$/);
-
-    # Ignore table header lines.
-    next if (/^Symbol table.*contains.*:/);
-    next if (/Num:.*Value.*Size/);
-
-    # Split table.
-    (undef, undef, undef, undef, $bind, $vis, $ndx, $name) = split;
-
-    # Error out for unknown input.
-    die "unknown input line:\n$_" unless defined($bind);
-
-    # Ignore local symbols.
-    next if ($bind eq "LOCAL");
-    # Ignore hidden symbols.
-    next if ($vis eq "HIDDEN");
-    # Ignore undefined symbols.
-    next if ($ndx eq "UND");
-    # Error out for unhandled cases.
-    if ($bind !~ /^(GLOBAL|WEAK)/ or $vis ne "DEFAULT") {
-        die "unhandled symbol:\n$_";
-    }
-
-    # Remember symbol.
-    $sym_hash{$name}++;
-    }
-    close READELF or die "readelf error";
-}
-
-##########
-# The various types of glob patterns.
-#
-# A glob pattern that is to be applied to the demangled name: 'cxx'.
-# A glob patterns that applies directly to the name in the .o files: 'glob'.
-# This pattern is ignored; used for local variables (usually just '*'): 'ign'.
-
-# The type of the current pattern.
-my $glob = 'glob';
-
-# We're currently inside `extern "C++"', which Sun ld doesn't understand.
-my $in_extern = 0;
-
-# The c++filt command to use.  This *must* be GNU c++filt; the Sun Studio
-# c++filt doesn't handle the GNU mangling style.
-my $cxxfilt = $ENV{'CXXFILT'} || "c++filt";
-
-# The current version name.
-my $current_version = "";
-
-# Was there any attempt to match a symbol to this version?
-my $matches_attempted;
-
-# The number of versions which matched this symbol.
-my $matched_symbols;
-
-open F,$symvers or die $!;
-
-# Print information about generating this file
-print "# This file was generated by make_sunver.pl.  DO NOT EDIT!\n";
-print "# It was generated by:\n";
-printf "# %s %s %s\n", $0, $symvers, (join ' ',@ARGV);
-printf "# Omitted archives with corresponding shared libraries: %s\n",
-    (join ' ', @SHAREDOBJS) if $#SHAREDOBJS >= 0;
-print "#\n\n";
-
-print "\$mapfile_version 2\n";
-
-while (<F>) {
-    # Lines of the form '};'
-    if (/^([ \t]*)(\}[ \t]*;[ \t]*)$/) {
-    $glob = 'glob';
-    if ($in_extern) {
-        $in_extern--;
-        print "$1##$2\n";
-    } else {
-        print;
-    }
-    next;
-    }
-
-    # Lines of the form '} SOME_VERSION_NAME_1.0;'
-    if (/^[ \t]*\}[ \tA-Z0-9_.a-z]+;[ \t]*$/) {
-    $glob = 'glob';
-    # We tried to match symbols agains this version, but none matched.
-    # Emit dummy hidden symbol to avoid marking this version WEAK.
-    if ($matches_attempted && $matched_symbols == 0) {
-        print "  hidden:\n";
-        print "    .force_WEAK_off_$current_version = DATA S0x0 V0x0;\n";
-    }
-    print; next;
-    }
-
-    # Comment and blank lines
-    if (/^[ \t]*\#/) { print; next; }
-    if (/^[ \t]*$/) { print; next; }
-
-    # Lines of the form '{'
-    if (/^([ \t]*){$/) {
-    if ($in_extern) {
-        print "$1##{\n";
-    } else {
-        print;
-    }
-    next;
-    }
-
-    # Lines of the form 'SOME_VERSION_NAME_1.1 {'
-    if (/^([A-Z0-9_.]+)[ \t]+{$/) {
-    # Record version name.
-    $current_version = $1;
-    # Reset match attempts, #matched symbols for this version.
-    $matches_attempted = 0;
-    $matched_symbols = 0;
-    print "SYMBOL_VERSION $1 {\n";
-    next;
-    }
-
-    # Ignore 'global:'
-    if (/^[ \t]*global:$/) { print; next; }
-
-    # After 'local:', globs should be ignored, they won't be exported.
-    if (/^[ \t]*local:$/) {
-    $glob = 'ign';
-    print;
-    next;
-    }
-
-    # After 'extern "C++"', globs are C++ patterns
-    if (/^([ \t]*)(extern \"C\+\+\"[ \t]*)$/) {
-    $in_extern++;
-    $glob = 'cxx';
-    # Need to comment, Sun ld cannot handle this.
-    print "$1##$2\n"; next;
-    }
-
-    # Chomp newline now we're done with passing through the input file.
-    chomp;
-
-    # Catch globs.  Note that '{}' is not allowed in globs by this script,
-    # so only '*' and '[]' are available.
-    if (/^([ \t]*)([^ \t;{}#]+);?[ \t]*$/) {
-    my $ws = $1;
-    my $ptn = $2;
-    # Turn the glob into a regex by replacing '*' with '.*', '?' with '.'.
-    # Keep $ptn so we can still print the original form.
-    ($pattern = $ptn) =~ s/\*/\.\*/g;
-    $pattern =~ s/\?/\./g;
-
-    if ($glob eq 'ign') {
-        # We're in a local: * section; just continue.
-        print "$_\n";
-        next;
-    }
-
-    # Print the glob commented for human readers.
-    print "$ws##$ptn ($glob)\n";
-    # We tried to match a symbol to this version.
-    $matches_attempted++;
-
-    if ($glob eq 'glob') {
-        my %ptn_syms = ();
-
-        # Match ptn against symbols in %sym_hash.
-        foreach my $sym (keys %sym_hash) {
-        # Maybe it matches one of the patterns based on the symbol in
-        # the .o file.
-        $ptn_syms{$sym}++ if ($sym =~ /^$pattern$/);
-        }
-
-        foreach my $sym (sort keys(%ptn_syms)) {
-        $matched_symbols++;
-        print "$ws$sym;\n";
-        }
-    } elsif ($glob eq 'cxx') {
-        my %dem_syms = ();
-
-        # Verify that we're actually using GNU c++filt.  Other versions
-        # most likely cannot handle GNU style symbol mangling.
-        my $cxxout = `$cxxfilt --version 2>&1`;
-        $cxxout =~ m/GNU/ or die "$0 requires GNU c++filt to function";
-
-        # Talk to c++filt through a pair of file descriptors.
-        # Need to start a fresh instance per pattern, otherwise the
-        # process grows to 500+ MB.
-        my $pid = open2(*FILTIN, *FILTOUT, $cxxfilt) or die $!;
-
-        # Match ptn against symbols in %sym_hash.
-        foreach my $sym (keys %sym_hash) {
-        # No?  Well, maybe its demangled form matches one of those
-        # patterns.
-        printf FILTOUT "%s\n",$sym;
-        my $dem = <FILTIN>;
-        chomp $dem;
-        $dem_syms{$sym}++ if ($dem =~ /^$pattern$/);
-        }
-
-        close FILTOUT or die "c++filt error";
-        close FILTIN or die "c++filt error";
-        # Need to wait for the c++filt process to avoid lots of zombies.
-        waitpid $pid, 0;
-
-        foreach my $sym (sort keys(%dem_syms)) {
-        $matched_symbols++;
-        print "$ws$sym;\n";
-        }
-    } else {
-        # No?  Well, then ignore it.
-    }
-    next;
-    }
-    # Important sanity check.  This script can't handle lots of formats
-    # that GNU ld can, so be sure to error out if one is seen!
-    die "strange line `$_'";
-}
-close F;
--- a/compat/strtod.c
+++ b/compat/strtod.c
@@ -1,93 +0,0 @@
-/*
- * C99-compatible strtod() implementation
- * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <limits.h>
-#include <stdlib.h>
-
-#include "libavutil/avstring.h"
-#include "libavutil/mathematics.h"
-
-static const char *check_nan_suffix(const char *s)
-{
-    const char *start = s;
-
-    if (*s++ != '(')
-        return start;
-
-    while ((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
-           (*s >= '0' && *s <= '9') ||  *s == '_')
-        s++;
-
-    return *s == ')' ? s + 1 : start;
-}
-
-#undef strtod
-double strtod(const char *, char **);
-
-double avpriv_strtod(const char *nptr, char **endptr)
-{
-    const char *end;
-    double res;
-
-    /* Skip leading spaces */
-    while (av_isspace(*nptr))
-        nptr++;
-
-    if (!av_strncasecmp(nptr, "infinity", 8)) {
-        end = nptr + 8;
-        res = INFINITY;
-    } else if (!av_strncasecmp(nptr, "inf", 3)) {
-        end = nptr + 3;
-        res = INFINITY;
-    } else if (!av_strncasecmp(nptr, "+infinity", 9)) {
-        end = nptr + 9;
-        res = INFINITY;
-    } else if (!av_strncasecmp(nptr, "+inf", 4)) {
-        end = nptr + 4;
-        res = INFINITY;
-    } else if (!av_strncasecmp(nptr, "-infinity", 9)) {
-        end = nptr + 9;
-        res = -INFINITY;
-    } else if (!av_strncasecmp(nptr, "-inf", 4)) {
-        end = nptr + 4;
-        res = -INFINITY;
-    } else if (!av_strncasecmp(nptr, "nan", 3)) {
-        end = check_nan_suffix(nptr + 3);
-        res = NAN;
-    } else if (!av_strncasecmp(nptr, "+nan", 4) ||
-               !av_strncasecmp(nptr, "-nan", 4)) {
-        end = check_nan_suffix(nptr + 4);
-        res = NAN;
-    } else if (!av_strncasecmp(nptr, "0x", 2) ||
-               !av_strncasecmp(nptr, "-0x", 3) ||
-               !av_strncasecmp(nptr, "+0x", 3)) {
-        /* FIXME this doesn't handle exponents, non-integers (float/double)
-         * and numbers too large for long long */
-        res = strtoll(nptr, (char **)&end, 16);
-    } else {
-        res = strtod(nptr, (char **)&end);
-    }
-
-    if (endptr)
-        *endptr = (char *)end;
-
-    return res;
-}
--- a/compat/va_copy.h
+++ b/compat/va_copy.h
@@ -1,34 +0,0 @@
-/*
- * MSVC Compatible va_copy macro
- * Copyright (c) 2012 Derek Buitenhuis
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_VA_COPY_H
-#define COMPAT_VA_COPY_H
-
-#include <stdarg.h>
-
-#if !defined(va_copy) && defined(_MSC_VER)
-#define va_copy(dst, src) ((dst) = (src))
-#endif
-#if !defined(va_copy) && defined(__GNUC__) && __GNUC__ < 3
-#define va_copy(dst, src) __va_copy(dst, src)
-#endif
-
-#endif /* COMPAT_VA_COPY_H */
--- a/compat/w32dlfcn.h
+++ b/compat/w32dlfcn.h
@@ -1,94 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_W32DLFCN_H
-#define COMPAT_W32DLFCN_H
-
-#ifdef _WIN32
-#include <windows.h>
-#include "config.h"
-#if (_WIN32_WINNT < 0x0602) || HAVE_WINRT
-#include "libavutil/wchar_filename.h"
-#endif
-/**
- * Safe function used to open dynamic libs. This attempts to improve program security
- * by removing the current directory from the dll search path. Only dll's found in the
- * executable or system directory are allowed to be loaded.
- * @param name  The dynamic lib name.
- * @return A handle to the opened lib.
- */
-static inline HMODULE win32_dlopen(const char *name)
-{
-#if _WIN32_WINNT < 0x0602
-    // Need to check if KB2533623 is available
-    if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) {
-        HMODULE module = NULL;
-        wchar_t *path = NULL, *name_w = NULL;
-        DWORD pathlen;
-        if (utf8towchar(name, &name_w))
-            goto exit;
-        path = (wchar_t *)av_mallocz_array(MAX_PATH, sizeof(wchar_t));
-        // Try local directory first
-        pathlen = GetModuleFileNameW(NULL, path, MAX_PATH);
-        pathlen = wcsrchr(path, '\\') - path;
-        if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH)
-            goto exit;
-        path[pathlen] = '\\';
-        wcscpy(path + pathlen + 1, name_w);
-        module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-        if (module == NULL) {
-            // Next try System32 directory
-            pathlen = GetSystemDirectoryW(path, MAX_PATH);
-            if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH)
-                goto exit;
-            path[pathlen] = '\\';
-            wcscpy(path + pathlen + 1, name_w);
-            module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-        }
-exit:
-        av_free(path);
-        av_free(name_w);
-        return module;
-    }
-#endif
-#ifndef LOAD_LIBRARY_SEARCH_APPLICATION_DIR
-#   define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 0x00000200
-#endif
-#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
-#   define LOAD_LIBRARY_SEARCH_SYSTEM32        0x00000800
-#endif
-#if HAVE_WINRT
-    wchar_t *name_w = NULL;
-    int ret;
-    if (utf8towchar(name, &name_w))
-        return NULL;
-    ret = LoadPackagedLibrary(name_w, 0);
-    av_free(name_w);
-    return ret;
-#else
-    return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32);
-#endif
-}
-#define dlopen(name, flags) win32_dlopen(name)
-#define dlclose FreeLibrary
-#define dlsym GetProcAddress
-#else
-#include <dlfcn.h>
-#endif
-
-#endif /* COMPAT_W32DLFCN_H */
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2010-2011 x264 project
- *
- * Authors: Steven Walters <kemuri9@gmail.com>
- *          Pegasys Inc. <http://www.pegasys-inc.com>
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * w32threads to pthreads wrapper
- */
-
-#ifndef COMPAT_W32PTHREADS_H
-#define COMPAT_W32PTHREADS_H
-
-/* Build up a pthread-like API using underlying Windows API. Have only static
- * methods so as to not conflict with a potentially linked in pthread-win32
- * library.
- * As most functions here are used without checking return values,
- * only implement return values as necessary. */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <process.h>
-
-#include "libavutil/attributes.h"
-#include "libavutil/common.h"
-#include "libavutil/internal.h"
-#include "libavutil/mem.h"
-
-typedef struct pthread_t {
-    void *handle;
-    void *(*func)(void* arg);
-    void *arg;
-    void *ret;
-} pthread_t;
-
-/* use light weight mutex/condition variable API for Windows Vista and later */
-typedef SRWLOCK pthread_mutex_t;
-typedef CONDITION_VARIABLE pthread_cond_t;
-
-#define PTHREAD_MUTEX_INITIALIZER SRWLOCK_INIT
-#define PTHREAD_COND_INITIALIZER CONDITION_VARIABLE_INIT
-
-#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)
-#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)
-
-static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg)
-{
-    pthread_t *h = (pthread_t*)arg;
-    h->ret = h->func(h->arg);
-    return 0;
-}
-
-static av_unused int pthread_create(pthread_t *thread, const void *unused_attr,
-                                    void *(*start_routine)(void*), void *arg)
-{
-    thread->func   = start_routine;
-    thread->arg    = arg;
-#if HAVE_WINRT
-    thread->handle = (void*)CreateThread(NULL, 0, win32thread_worker, thread,
-                                           0, NULL);
-#else
-    thread->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, thread,
-                                           0, NULL);
-#endif
-    return !thread->handle;
-}
-
-static av_unused int pthread_join(pthread_t thread, void **value_ptr)
-{
-    DWORD ret = WaitForSingleObject(thread.handle, INFINITE);
-    if (ret != WAIT_OBJECT_0) {
-        if (ret == WAIT_ABANDONED)
-            return EINVAL;
-        else
-            return EDEADLK;
-    }
-    if (value_ptr)
-        *value_ptr = thread.ret;
-    CloseHandle(thread.handle);
-    return 0;
-}
-
-static inline int pthread_mutex_init(pthread_mutex_t *m, void* attr)
-{
-    InitializeSRWLock(m);
-    return 0;
-}
-static inline int pthread_mutex_destroy(pthread_mutex_t *m)
-{
-    /* Unlocked SWR locks use no resources */
-    return 0;
-}
-static inline int pthread_mutex_lock(pthread_mutex_t *m)
-{
-    AcquireSRWLockExclusive(m);
-    return 0;
-}
-static inline int pthread_mutex_unlock(pthread_mutex_t *m)
-{
-    ReleaseSRWLockExclusive(m);
-    return 0;
-}
-
-typedef INIT_ONCE pthread_once_t;
-#define PTHREAD_ONCE_INIT INIT_ONCE_STATIC_INIT
-
-static av_unused int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
-{
-    BOOL pending = FALSE;
-    InitOnceBeginInitialize(once_control, 0, &pending, NULL);
-    if (pending)
-        init_routine();
-    InitOnceComplete(once_control, 0, NULL);
-    return 0;
-}
-
-static inline int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
-{
-    InitializeConditionVariable(cond);
-    return 0;
-}
-
-/* native condition variables do not destroy */
-static inline int pthread_cond_destroy(pthread_cond_t *cond)
-{
-    return 0;
-}
-
-static inline int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-    WakeAllConditionVariable(cond);
-    return 0;
-}
-
-static inline int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-    SleepConditionVariableSRW(cond, mutex, INFINITE, 0);
-    return 0;
-}
-
-static inline int pthread_cond_signal(pthread_cond_t *cond)
-{
-    WakeConditionVariable(cond);
-    return 0;
-}
-
-#endif /* COMPAT_W32PTHREADS_H */
--- a/compat/windows/makedef
+++ b/compat/windows/makedef
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2013, Derek Buitenhuis
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-# mktemp isn't POSIX, so supply an implementation
-mktemp() {
-    echo "${2%%XXX*}.${HOSTNAME}.${UID}.$$"
-}
-
-if [ $# -lt 2 ]; then
-    echo "Usage: makedef <version_script> <objects>" >&2
-    exit 0
-fi
-
-vscript=$1
-shift
-
-if [ ! -f "$vscript" ]; then
-    echo "Version script does not exist" >&2
-    exit 1
-fi
-
-for object in "$@"; do
-    if [ ! -f "$object" ]; then
-        echo "Object does not exist: ${object}" >&2
-        exit 1
-    fi
-done
-
-# Create a lib temporarily to dump symbols from.
-# It's just much easier to do it this way
-libname=$(mktemp -u "library").lib
-
-trap 'rm -f -- $libname' EXIT
-
-if [ -n "$AR" ]; then
-    $AR rcs ${libname} $@ >/dev/null
-else
-    lib.exe -out:${libname} $@ >/dev/null
-fi
-if [ $? != 0 ]; then
-    echo "Could not create temporary library." >&2
-    exit 1
-fi
-
-IFS='
-'
-
-prefix="$EXTERN_PREFIX"
-
-started=0
-regex="none"
-
-for line in $(cat ${vscript} | tr '\t' ' '); do
-    # We only care about global symbols
-    echo "${line}" | grep -q '^ \+global:'
-    if [ $? = 0 ]; then
-        started=1
-        line=$(echo "${line}" | sed -e 's/^ \{1,\}global: *//')
-    else
-        echo "${line}" | grep -q '^ \+local:'
-        if [ $? = 0 ]; then
-            started=0
-        fi
-    fi
-
-    if [ ${started} = 0 ]; then
-        continue
-    fi
-
-    # Handle multiple symbols on one line
-    IFS=';'
-
-    # Work around stupid expansion to filenames
-    line=$(echo "${line}" | sed -e 's/\*/.\\+/g')
-    for exp in ${line}; do
-        # Remove leading and trailing whitespace
-        exp=$(echo "${exp}" | sed -e 's/^ *//' -e 's/ *$//')
-
-        if [ "${regex}" = "none" ]; then
-            regex="${exp}"
-        else
-            regex="${regex};${exp}"
-        fi
-    done
-
-    IFS='
-'
-done
-
-if [ -n "$NM" ]; then
-    # Use eval, since NM="nm -g"
-    dump=$(eval "$NM --defined-only -g ${libname}" |
-              grep -v : |
-              grep -v ^$ |
-              cut -d' ' -f3 |
-              sed -e "s/^${prefix}//")
-else
-    dump=$(dumpbin.exe -linkermember:1 ${libname} |
-              sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
-              tail -n +2 |
-              cut -d' ' -f3)
-fi
-
-rm ${libname}
-
-IFS=';'
-list=""
-for exp in ${regex}; do
-    list="${list}"'
-'$(echo "${dump}" |
-          grep "^${exp}" |
-          sed -e 's/^/    /')
-done
-
-echo "EXPORTS"
-echo "${list}" | sort | uniq | tail -n +2
--- a/compat/windows/mslink
+++ b/compat/windows/mslink
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
-if [ -x "$LINK_EXE_PATH" ]; then
-    "$LINK_EXE_PATH" $@
-else
-    link.exe $@
-fi
-exit $?
--- a/7740
+++ b/7740
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,9 +0,0 @@
-/*.1
-/*.3
-/*.html
-/*.pod
-/config.texi
-/avoptions_codec.texi
-/avoptions_format.texi
-/fate.txt
-/print_options
--- a/doc/APIchanges
+++ b/doc/APIchanges
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,154 +1,53 @@
-LIBRARIES-$(CONFIG_AVUTIL)     += libavutil
-LIBRARIES-$(CONFIG_SWSCALE)    += libswscale
-LIBRARIES-$(CONFIG_SWRESAMPLE) += libswresample
-LIBRARIES-$(CONFIG_AVCODEC)    += libavcodec
-LIBRARIES-$(CONFIG_AVFORMAT)   += libavformat
-LIBRARIES-$(CONFIG_AVDEVICE)   += libavdevice
-LIBRARIES-$(CONFIG_AVFILTER)   += libavfilter
-
-COMPONENTS-$(CONFIG_AVUTIL)     += ffmpeg-utils
-COMPONENTS-$(CONFIG_SWSCALE)    += ffmpeg-scaler
-COMPONENTS-$(CONFIG_SWRESAMPLE) += ffmpeg-resampler
-COMPONENTS-$(CONFIG_AVCODEC)    += ffmpeg-codecs ffmpeg-bitstream-filters
-COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpeg-formats ffmpeg-protocols
-COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
-COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
-
-MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
-MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
-MANPAGES    = $(MANPAGES1) $(MANPAGES3)
-PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
-HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
+MANPAGES    = $(PROGS-yes:%=doc/%.1)
+PODPAGES    = $(PROGS-yes:%=doc/%.pod)
+HTMLPAGES   = $(PROGS-yes:%=doc/%.html)                                 \
              doc/developer.html                                        \
              doc/faq.html                                              \
              doc/fate.html                                             \
              doc/general.html                                          \
              doc/git-howto.html                                        \
-              doc/mailing-list-faq.html                                 \
-              doc/nut.html                                              \
+              doc/libavfilter.html                                      \
              doc/platform.html                                         \

-TXTPAGES    = doc/fate.txt                                              \
+DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)

+all-$(CONFIG_DOC): documentation

-DOCS-$(CONFIG_HTMLPAGES) += $(HTMLPAGES)
-DOCS-$(CONFIG_PODPAGES)  += $(PODPAGES)
-DOCS-$(CONFIG_MANPAGES)  += $(MANPAGES)
-DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
-DOCS = $(DOCS-yes)
-
-all-$(CONFIG_DOC): doc
-
-doc: documentation
-
-apidoc: doc/doxy/html
 documentation: $(DOCS)

-TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $(SRC_PATH) $< $@ >$(@:%=%.d)
-
-doc/%.txt: TAG = TXT
-doc/%.txt: doc/%.texi
-	$(Q)$(TEXIDEP)
-	$(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
-
-GENTEXI  = format codec
-GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
-
-$(GENTEXI): TAG = GENTEXI
-$(GENTEXI): doc/avoptions_%.texi: doc/print_options$(HOSTEXESUF)
-	$(M)doc/print_options $* > $@
+TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)

 doc/%.html: TAG = HTML
-doc/%-all.html: TAG = HTML
-
-ifdef HAVE_MAKEINFO_HTML
-doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI)
+doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init
 	$(Q)$(TEXIDEP)
-	$(M)makeinfo --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
-
-doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI)
-	$(Q)$(TEXIDEP)
-	$(M)makeinfo --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $<
-else
-doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
-	$(Q)$(TEXIDEP)
-	$(M)texi2html -I doc -monolithic --D=config-not-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
-
-doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
-	$(Q)$(TEXIDEP)
-	$(M)texi2html -I doc -monolithic --D=config-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
-endif
+	$(M)texi2html -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<

 doc/%.pod: TAG = POD
-doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
+doc/%.pod: doc/%.texi
 	$(Q)$(TEXIDEP)
-	$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-not-all=yes -Idoc $< $@
+	$(M)$(SRC_PATH)/doc/texi2pod.pl $< $@

-doc/%-all.pod: TAG = POD
-doc/%-all.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
-	$(Q)$(TEXIDEP)
-	$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
+doc/%.1: TAG = MAN
+doc/%.1: doc/%.pod
+	$(M)pod2man --section=1 --center=" " --release=" " $< > $@

-doc/%.1 doc/%.3: TAG = MAN
-doc/%.1: doc/%.pod $(GENTEXI)
-	$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
-doc/%.3: doc/%.pod $(GENTEXI)
-	$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
+$(DOCS): | doc
+OBJDIRS += doc

-$(DOCS) doc/doxy/html: | doc/
-
-DOXY_INPUT      = $(INSTHEADERS)
-DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak
-
-doc/doxy/html: TAG = DOXY
-doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
-	$(M)OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); ./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
-
-install-doc: install-html install-man
-
-install-html:
-
-install-man:
-
-ifdef CONFIG_HTMLPAGES
-install-progs-$(CONFIG_DOC): install-html
-
-install-html: $(HTMLPAGES)
-	$(Q)mkdir -p "$(DOCDIR)"
-	$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
-endif
-
-ifdef CONFIG_MANPAGES
 install-progs-$(CONFIG_DOC): install-man

 install-man: $(MANPAGES)
 	$(Q)mkdir -p "$(MANDIR)/man1"
-	$(INSTALL) -m 644 $(MANPAGES1) "$(MANDIR)/man1"
-	$(Q)mkdir -p "$(MANDIR)/man3"
-	$(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
-endif
+	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"

-uninstall: uninstall-doc
-
-uninstall-doc: uninstall-html uninstall-man
-
-uninstall-html:
-	$(RM) -r "$(DOCDIR)"
+uninstall: uninstall-man

 uninstall-man:
-	$(RM) $(addprefix "$(MANDIR)/man1/",$(AVPROGS-yes:%=%.1) $(AVPROGS-yes:%=%-all.1) $(COMPONENTS-yes:%=%.1))
-	$(RM) $(addprefix "$(MANDIR)/man3/",$(LIBRARIES-yes:%=%.3))
+	$(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))

-clean:: docclean
-
-distclean:: docclean
-	$(RM) doc/config.texi
-
-docclean::
-	$(RM) $(CLEANSUFFIXES:%=doc/%)
-	$(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 doc/*.3 doc/avoptions_*.texi
-	$(RM) -r doc/doxy/html
+clean::
+	$(RM) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%)

 -include $(wildcard $(DOCS:%=%.d))

-.PHONY: apidoc doc documentation
+.PHONY: documentation
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -0,0 +1,17 @@
+Release Notes
+=============
+
+* 0.9 "Harmony"  December, 2011
+
+
+General notes
+-------------
+
+See the Changelog file for a list of significant changes. Note, there
+are many more new features and bugfixes than whats listed there.
+
+Bugreports against FFmpeg git master or the most recent FFmpeg release are
+accepted. If you are experiencing issues with any formally released version of
+FFmpeg, please try git master to check if the issue still exists. If it does,
+make your report against the development code following the usual bug reporting
+guidelines.
--- a/doc/authors.texi
+++ b/doc/authors.texi
@@ -1,11 +0,0 @@
-@chapter Authors
-
-The FFmpeg developers.
-
-For details about the authorship, see the Git history of the project
-(git://source.ffmpeg.org/ffmpeg), e.g. by typing the command
-@command{git log} in the FFmpeg source directory, or browsing the
-online repository at @url{http://source.ffmpeg.org}.
-
-Maintainers for the specific components are listed in the file
-@file{MAINTAINERS} in the source code tree.
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -0,0 +1,167 @@
+All the numerical options, if not specified otherwise, accept in input
+a string representing a number, which may contain one of the
+International System number postfixes, for example 'K', 'M', 'G'.
+If 'i' is appended after the postfix, powers of 2 are used instead of
+powers of 10. The 'B' postfix multiplies the value for 8, and can be
+appended after another postfix or used alone. This allows using for
+example 'KB', 'MiB', 'G' and 'B' as postfix.
+
+Options which do not take arguments are boolean options, and set the
+corresponding value to true. They can be set to false by prefixing
+with "no" the option name, for example using "-nofoo" in the
+command line will set to false the boolean option with name "foo".
+
+@section Stream specifiers
+Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
+are used to precisely specify which stream(s) does a given option belong to.
+
+A stream specifier is a string generally appended to the option name and
+separated from it by a colon. E.g. @code{-codec:a:1 ac3} option contains
+@code{a:1} stream specifer, which matches the second audio stream. Therefore it
+would select the ac3 codec for the second audio stream.
+
+A stream specifier can match several stream, the option is then applied to all
+of them. E.g. the stream specifier in @code{-b:a 128k} matches all audio
+streams.
+
+An empty stream specifier matches all streams, for example @code{-codec copy}
+or @code{-codec: copy} would copy all the streams without reencoding.
+
+Possible forms of stream specifiers are:
+@table @option
+@item @var{stream_index}
+Matches the stream with this index. E.g. @code{-threads:1 4} would set the
+thread count for the second stream to 4.
+@item @var{stream_type}[:@var{stream_index}]
+@var{stream_type} is one of: 'v' for video, 'a' for audio, 's' for subtitle,
+'d' for data and 't' for attachments. If @var{stream_index} is given, then
+matches stream number @var{stream_index} of this type. Otherwise matches all
+streams of this type.
+@item p:@var{program_id}[:@var{stream_index}]
+If @var{stream_index} is given, then matches stream number @var{stream_index} in
+program with id @var{program_id}. Otherwise matches all streams in this program.
+@end table
+@section Generic options
+
+These options are shared amongst the av* tools.
+
+@table @option
+
+@item -L
+Show license.
+
+@item -h, -?, -help, --help
+Show help.
+
+@item -version
+Show version.
+
+@item -formats
+Show available formats.
+
+The fields preceding the format names have the following meanings:
+@table @samp
+@item D
+Decoding available
+@item E
+Encoding available
+@end table
+
+@item -codecs
+Show available codecs.
+
+The fields preceding the codec names have the following meanings:
+@table @samp
+@item D
+Decoding available
+@item E
+Encoding available
+@item V/A/S
+Video/audio/subtitle codec
+@item S
+Codec supports slices
+@item D
+Codec supports direct rendering
+@item T
+Codec can handle input truncated at random locations instead of only at frame boundaries
+@end table
+
+@item -bsfs
+Show available bitstream filters.
+
+@item -protocols
+Show available protocols.
+
+@item -filters
+Show available libavfilter filters.
+
+@item -pix_fmts
+Show available pixel formats.
+
+@item -sample_fmts
+Show available sample formats.
+
+@item -loglevel @var{loglevel} | -v @var{loglevel}
+Set the logging level used by the library.
+@var{loglevel} is a number or a string containing one of the following values:
+@table @samp
+@item quiet
+@item panic
+@item fatal
+@item error
+@item warning
+@item info
+@item verbose
+@item debug
+@end table
+
+By default the program logs to stderr, if coloring is supported by the
+terminal, colors are used to mark errors and warnings. Log coloring
+can be disabled setting the environment variable
+@env{FFMPEG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
+the environment variable @env{FFMPEG_FORCE_COLOR}.
+The use of the environment variable @env{NO_COLOR} is deprecated and
+will be dropped in a following FFmpeg version.
+
+@item -report
+Dump full command line and console output to a file named
+@code{@var{program}-@var{YYYYMMDD}-@var{HHMMSS}.log} in the current
+directory.
+This file can be useful for bug reports.
+It also implies @code{-loglevel verbose}.
+
+Note: setting the environment variable @code{FFREPORT} to any value has the
+same effect.
+
+@end table
+
+@section AVOptions
+
+These options are provided directly by the libavformat, libavdevice and
+libavcodec libraries. To see the list of available AVOptions, use the
+@option{-help} option. They are separated into two categories:
+@table @option
+@item generic
+These options can be set for any container, codec or device. Generic options
+are listed under AVFormatContext options for containers/devices and under
+AVCodecContext options for codecs.
+@item private
+These options are specific to the given container, device or codec. Private
+options are listed under their corresponding containers/devices/codecs.
+@end table
+
+For example to write an ID3v2.3 header instead of a default ID3v2.4 to
+an MP3 file, use the @option{id3v2_version} private option of the MP3
+muxer:
+@example
+ffmpeg -i input.flac -id3v2_version 3 out.mp3
+@end example
+
+All codec AVOptions are obviously per-stream, so the chapter on stream
+specifiers applies to them
+
+Note @option{-nooption} syntax cannot be used for boolean AVOptions,
+use @option{-option 0}/@option{-option 1}.
+
+Note2 old undocumented way of specifying per-stream AVOptions by prepending
+v/a/s to the options name is now obsolete and will be removed soon.
--- a/doc/avutil.txt
+++ b/doc/avutil.txt
@@ -0,0 +1,36 @@
+AVUtil
+======
+libavutil is a small lightweight library of generally useful functions.
+It is not a library for code needed by both libavcodec and libavformat.
+
+
+Overview:
+=========
+adler32.c               adler32 checksum
+aes.c                   AES encryption and decryption
+fifo.c                  resizeable first in first out buffer
+intfloat_readwrite.c    portable reading and writing of floating point values
+log.c                   "printf" with context and level
+md5.c                   MD5 Message-Digest Algorithm
+rational.c              code to perform exact calculations with rational numbers
+tree.c                  generic AVL tree
+crc.c                   generic CRC checksumming code
+integer.c               128bit integer math
+lls.c
+mathematics.c           greatest common divisor, integer sqrt, integer log2, ...
+mem.c                   memory allocation routines with guaranteed alignment
+
+Headers:
+bswap.h                 big/little/native-endian conversion code
+x86_cpu.h               a few useful macros for unifying x86-64 and x86-32 code
+avutil.h
+common.h
+intreadwrite.h          reading and writing of unaligned big/little/native-endian integers
+
+
+Goals:
+======
+* Modular (few interdependencies and the possibility of disabling individual parts during ./configure)
+* Small (source and object)
+* Efficient (low CPU and memory usage)
+* Useful (avoid useless features almost no one needs)
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -13,399 +13,17 @@ bitstream filter using the option @code{--disable-bsf=BSF}.
 The option @code{-bsfs} of the ff* tools will display the list of
 all the supported bitstream filters included in your build.

-The ff* tools have a -bsf option applied per stream, taking a
-comma-separated list of filters, whose parameters follow the filter
-name after a '='.
-
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v filter1[=opt1=str1:opt2=str2][,filter2] OUTPUT
-@end example
-
-Below is a description of the currently available bitstream filters,
-with their parameters, if any.
+Below is a description of the currently available bitstream filters.

@section aac_adtstoasc

-Convert MPEG-2/4 AAC ADTS to an MPEG-4 Audio Specific Configuration
-bitstream.
-
-This filter creates an MPEG-4 AudioSpecificConfig from an MPEG-2/4
-ADTS header and removes the ADTS header.
-
-This filter is required for example when copying an AAC stream from a
-raw ADTS AAC or an MPEG-TS container to MP4A-LATM, to an FLV file, or
-to MOV/MP4 files and related formats such as 3GP or M4A. Please note
-that it is auto-inserted for MP4A-LATM and MOV/MP4 and related formats.
-
-@section av1_metadata
-
-Modify metadata embedded in an AV1 stream.
-
-@table @option
-@item td
-Insert or remove temporal delimiter OBUs in all temporal units of the
-stream.
-
-@table @samp
-@item insert
-Insert a TD at the beginning of every TU which does not already have one.
-@item remove
-Remove the TD from the beginning of every TU which has one.
-@end table
-
-@item color_primaries
-@item transfer_characteristics
-@item matrix_coefficients
-Set the color description fields in the stream (see AV1 section 6.4.2).
-
-@item color_range
-Set the color range in the stream (see AV1 section 6.4.2; note that
-this cannot be set for streams using BT.709 primaries, sRGB transfer
-characteristic and identity (RGB) matrix coefficients).
-@table @samp
-@item tv
-Limited range.
-@item pc
-Full range.
-@end table
-
-@item chroma_sample_position
-Set the chroma sample location in the stream (see AV1 section 6.4.2).
-This can only be set for 4:2:0 streams.
-
-@table @samp
-@item vertical
-Left position (matching the default in MPEG-2 and H.264).
-@item colocated
-Top-left position.
-@end table
-
-@item tick_rate
-Set the tick rate (@emph{num_units_in_display_tick / time_scale}) in
-the timing info in the sequence header.
-@item num_ticks_per_picture
-Set the number of ticks in each picture, to indicate that the stream
-has a fixed framerate.  Ignored if @option{tick_rate} is not also set.
-
-@item delete_padding
-Deletes Padding OBUs.
-
-@end table
-
@section chomp

-Remove zero padding at the end of a packet.
-
-@section dca_core
-
-Extract the core from a DCA/DTS stream, dropping extensions such as
-DTS-HD.
-
-@section dump_extra
-
-Add extradata to the beginning of the filtered packets except when
-said packets already exactly begin with the extradata that is intended
-to be added.
-
-@table @option
-@item freq
-The additional argument specifies which packets should be filtered.
-It accepts the values:
-@table @samp
-@item k
-@item keyframe
-add extradata to all key packets
-
-@item e
-@item all
-add extradata to all packets
-@end table
-@end table
-
-If not specified it is assumed @samp{k}.
-
-For example the following @command{ffmpeg} command forces a global
-header (thus disabling individual packet headers) in the H.264 packets
-generated by the @code{libx264} encoder, but corrects them by adding
-the header stored in extradata to the key packets:
-@example
-ffmpeg -i INPUT -map 0 -flags:v +global_header -c:v libx264 -bsf:v dump_extra out.ts
-@end example
-
-@section eac3_core
-
-Extract the core from a E-AC-3 stream, dropping extra channels.
-
-@section extract_extradata
-
-Extract the in-band extradata.
-
-Certain codecs allow the long-term headers (e.g. MPEG-2 sequence headers,
-or H.264/HEVC (VPS/)SPS/PPS) to be transmitted either "in-band" (i.e. as a part
-of the bitstream containing the coded frames) or "out of band" (e.g. on the
-container level). This latter form is called "extradata" in FFmpeg terminology.
-
-This bitstream filter detects the in-band headers and makes them available as
-extradata.
-
-@table @option
-@item remove
-When this option is enabled, the long-term headers are removed from the
-bitstream after extraction.
-@end table
-
-@section filter_units
-
-Remove units with types in or not in a given set from the stream.
-
-@table @option
-@item pass_types
-List of unit types or ranges of unit types to pass through while removing
-all others.  This is specified as a '|'-separated list of unit type values
-or ranges of values with '-'.
-
-@item remove_types
-Identical to @option{pass_types}, except the units in the given set
-removed and all others passed through.
-@end table
-
-Extradata is unchanged by this transformation, but note that if the stream
-contains inline parameter sets then the output may be unusable if they are
-removed.
-
-For example, to remove all non-VCL NAL units from an H.264 stream:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=pass_types=1-5' OUTPUT
-@end example
-
-To remove all AUDs, SEI and filler from an H.265 stream:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=35|38-40' OUTPUT
-@end example
-
-@section hapqa_extract
-
-Extract Rgb or Alpha part of an HAPQA file, without recompression, in order to create an HAPQ or an HAPAlphaOnly file.
-
-@table @option
-@item texture
-Specifies the texture to keep.
-
-@table @option
-@item color
-@item alpha
-@end table
-
-@end table
-
-Convert HAPQA to HAPQ
-@example
-ffmpeg -i hapqa_inputfile.mov -c copy -bsf:v hapqa_extract=texture=color -tag:v HapY -metadata:s:v:0 encoder="HAPQ" hapq_file.mov
-@end example
-
-Convert HAPQA to HAPAlphaOnly
-@example
-ffmpeg -i hapqa_inputfile.mov -c copy -bsf:v hapqa_extract=texture=alpha -tag:v HapA -metadata:s:v:0 encoder="HAPAlpha Only" hapalphaonly_file.mov
-@end example
-
-@section h264_metadata
-
-Modify metadata embedded in an H.264 stream.
-
-@table @option
-@item aud
-Insert or remove AUD NAL units in all access units of the stream.
-
-@table @samp
-@item insert
-@item remove
-@end table
-
-@item sample_aspect_ratio
-Set the sample aspect ratio of the stream in the VUI parameters.
-
-@item video_format
-@item video_full_range_flag
-Set the video format in the stream (see H.264 section E.2.1 and
-table E-2).
-
-@item colour_primaries
-@item transfer_characteristics
-@item matrix_coefficients
-Set the colour description in the stream (see H.264 section E.2.1
-and tables E-3, E-4 and E-5).
-
-@item chroma_sample_loc_type
-Set the chroma sample location in the stream (see H.264 section
-E.2.1 and figure E-1).
-
-@item tick_rate
-Set the tick rate (num_units_in_tick / time_scale) in the VUI
-parameters.  This is the smallest time unit representable in the
-stream, and in many cases represents the field rate of the stream
-(double the frame rate).
-@item fixed_frame_rate_flag
-Set whether the stream has fixed framerate - typically this indicates
-that the framerate is exactly half the tick rate, but the exact
-meaning is dependent on interlacing and the picture structure (see
-H.264 section E.2.1 and table E-6).
-
-@item crop_left
-@item crop_right
-@item crop_top
-@item crop_bottom
-Set the frame cropping offsets in the SPS.  These values will replace
-the current ones if the stream is already cropped.
-
-These fields are set in pixels.  Note that some sizes may not be
-representable if the chroma is subsampled or the stream is interlaced
-(see H.264 section 7.4.2.1.1).
-
-@item sei_user_data
-Insert a string as SEI unregistered user data.  The argument must
-be of the form @emph{UUID+string}, where the UUID is as hex digits
-possibly separated by hyphens, and the string can be anything.
-
-For example, @samp{086f3693-b7b3-4f2c-9653-21492feee5b8+hello} will
-insert the string ``hello'' associated with the given UUID.
-
-@item delete_filler
-Deletes both filler NAL units and filler SEI messages.
-
-@item level
-Set the level in the SPS.  Refer to H.264 section A.3 and tables A-1
-to A-5.
-
-The argument must be the name of a level (for example, @samp{4.2}), a
-level_idc value (for example, @samp{42}), or the special name @samp{auto}
-indicating that the filter should attempt to guess the level from the
-input stream properties.
-
-@end table
+@section dump_extradata

@section h264_mp4toannexb

-Convert an H.264 bitstream from length prefixed mode to start code
-prefixed mode (as defined in the Annex B of the ITU-T H.264
-specification).
-
-This is required by some streaming formats, typically the MPEG-2
-transport stream format (muxer @code{mpegts}).
-
-For example to remux an MP4 file containing an H.264 stream to mpegts
-format with @command{ffmpeg}, you can use the command:
-
-@example
-ffmpeg -i INPUT.mp4 -codec copy -bsf:v h264_mp4toannexb OUTPUT.ts
-@end example
-
-Please note that this filter is auto-inserted for MPEG-TS (muxer
-@code{mpegts}) and raw H.264 (muxer @code{h264}) output formats.
-
-@section h264_redundant_pps
-
-This applies a specific fixup to some Blu-ray streams which contain
-redundant PPSs modifying irrelevant parameters of the stream which
-confuse other transformations which require correct extradata.
-
-A new single global PPS is created, and all of the redundant PPSs
-within the stream are removed.
-
-@section hevc_metadata
-
-Modify metadata embedded in an HEVC stream.
-
-@table @option
-@item aud
-Insert or remove AUD NAL units in all access units of the stream.
-
-@table @samp
-@item insert
-@item remove
-@end table
-
-@item sample_aspect_ratio
-Set the sample aspect ratio in the stream in the VUI parameters.
-
-@item video_format
-@item video_full_range_flag
-Set the video format in the stream (see H.265 section E.3.1 and
-table E.2).
-
-@item colour_primaries
-@item transfer_characteristics
-@item matrix_coefficients
-Set the colour description in the stream (see H.265 section E.3.1
-and tables E.3, E.4 and E.5).
-
-@item chroma_sample_loc_type
-Set the chroma sample location in the stream (see H.265 section
-E.3.1 and figure E.1).
-
-@item tick_rate
-Set the tick rate in the VPS and VUI parameters (num_units_in_tick /
-time_scale).  Combined with @option{num_ticks_poc_diff_one}, this can
-set a constant framerate in the stream.  Note that it is likely to be
-overridden by container parameters when the stream is in a container.
-
-@item num_ticks_poc_diff_one
-Set poc_proportional_to_timing_flag in VPS and VUI and use this value
-to set num_ticks_poc_diff_one_minus1 (see H.265 sections 7.4.3.1 and
-E.3.1).  Ignored if @option{tick_rate} is not also set.
-
-@item crop_left
-@item crop_right
-@item crop_top
-@item crop_bottom
-Set the conformance window cropping offsets in the SPS.  These values
-will replace the current ones if the stream is already cropped.
-
-These fields are set in pixels.  Note that some sizes may not be
-representable if the chroma is subsampled (H.265 section 7.4.3.2.1).
-
-@item level
-Set the level in the VPS and SPS.  See H.265 section A.4 and tables
-A.6 and A.7.
-
-The argument must be the name of a level (for example, @samp{5.1}), a
-@emph{general_level_idc} value (for example, @samp{153} for level 5.1),
-or the special name @samp{auto} indicating that the filter should
-attempt to guess the level from the input stream properties.
-
-@end table
-
-@section hevc_mp4toannexb
-
-Convert an HEVC/H.265 bitstream from length prefixed mode to start code
-prefixed mode (as defined in the Annex B of the ITU-T H.265
-specification).
-
-This is required by some streaming formats, typically the MPEG-2
-transport stream format (muxer @code{mpegts}).
-
-For example to remux an MP4 file containing an HEVC stream to mpegts
-format with @command{ffmpeg}, you can use the command:
-
-@example
-ffmpeg -i INPUT.mp4 -codec copy -bsf:v hevc_mp4toannexb OUTPUT.ts
-@end example
-
-Please note that this filter is auto-inserted for MPEG-TS (muxer
-@code{mpegts}) and raw HEVC/H.265 (muxer @code{h265} or
-@code{hevc}) output formats.
-
-@section imxdump
-
-Modifies the bitstream to fit in MOV and to be usable by the Final Cut
-Pro decoder. This filter only applies to the mpeg2video codec, and is
-likely not needed for Final Cut Pro 7 and newer with the appropriate
-@option{-tag:v}.
-
-For example, to remux 30 MB/sec NTSC IMX to MOV:
-
-@example
-ffmpeg -i input.mxf -c copy -bsf:v imxdump -tag:v mx3n output.mov
-@end example
+@section imx_dump_header

@section mjpeg2jpeg

@@ -439,259 +57,21 @@ stream (carrying the AVI1 header ID and lacking a DHT segment) to
 produce fully qualified JPEG images.

@example
-ffmpeg -i mjpeg-movie.avi -c:v copy -bsf:v mjpeg2jpeg frame_%d.jpg
+ffmpeg -i mjpeg-movie.avi -c:v copy -vbsf mjpeg2jpeg frame_%d.jpg
 exiftran -i -9 frame*.jpg
 ffmpeg -i frame_%d.jpg -c:v copy rotated.avi
@end example

-@section mjpegadump
+@section mjpega_dump_header

-Add an MJPEG A header to the bitstream, to enable decoding by
-Quicktime.
+@section movsub

-@anchor{mov2textsub}
-@section mov2textsub
+@section mp3_header_compress

-Extract a representable text file from MOV subtitles, stripping the
-metadata header from each subtitle packet.
-
-See also the @ref{text2movsub} filter.
-
-@section mp3decomp
-
-Decompress non-standard compressed MP3 audio headers.
-
-@section mpeg2_metadata
-
-Modify metadata embedded in an MPEG-2 stream.
-
-@table @option
-@item display_aspect_ratio
-Set the display aspect ratio in the stream.
-
-The following fixed values are supported:
-@table @option
-@item 4/3
-@item 16/9
-@item 221/100
-@end table
-Any other value will result in square pixels being signalled instead
-(see H.262 section 6.3.3 and table 6-3).
-
-@item frame_rate
-Set the frame rate in the stream.  This is constructed from a table
-of known values combined with a small multiplier and divisor - if
-the supplied value is not exactly representable, the nearest
-representable value will be used instead (see H.262 section 6.3.3
-and table 6-4).
-
-@item video_format
-Set the video format in the stream (see H.262 section 6.3.6 and
-table 6-6).
-
-@item colour_primaries
-@item transfer_characteristics
-@item matrix_coefficients
-Set the colour description in the stream (see H.262 section 6.3.6
-and tables 6-7, 6-8 and 6-9).
-
-@end table
-
-@section mpeg4_unpack_bframes
-
-Unpack DivX-style packed B-frames.
-
-DivX-style packed B-frames are not valid MPEG-4 and were only a
-workaround for the broken Video for Windows subsystem.
-They use more space, can cause minor AV sync issues, require more
-CPU power to decode (unless the player has some decoded picture queue
-to compensate the 2,0,2,0 frame per packet style) and cause
-trouble if copied into a standard container like mp4 or mpeg-ps/ts,
-because MPEG-4 decoders may not be able to decode them, since they are
-not valid MPEG-4.
-
-For example to fix an AVI file containing an MPEG-4 stream with
-DivX-style packed B-frames using @command{ffmpeg}, you can use the command:
-
-@example
-ffmpeg -i INPUT.avi -codec copy -bsf:v mpeg4_unpack_bframes OUTPUT.avi
-@end example
+@section mp3_header_decompress

@section noise

-Damages the contents of packets or simply drops them without damaging the
-container. Can be used for fuzzing or testing error resilience/concealment.
-
-Parameters:
-@table @option
-@item amount
-A numeral string, whose value is related to how often output bytes will
-be modified. Therefore, values below or equal to 0 are forbidden, and
-the lower the more frequent bytes will be modified, with 1 meaning
-every byte is modified.
-@item dropamount
-A numeral string, whose value is related to how often packets will be dropped.
-Therefore, values below or equal to 0 are forbidden, and the lower the more
-frequent packets will be dropped, with 1 meaning every packet is dropped.
-@end table
-
-The following example applies the modification to every byte but does not drop
-any packets.
-@example
-ffmpeg -i INPUT -c copy -bsf noise[=1] output.mkv
-@end example
-
-@section null
-This bitstream filter passes the packets through unchanged.
-
-@section prores_metadata
-
-Modify color property metadata embedded in prores stream.
-
-@table @option
-@item color_primaries
-Set the color primaries.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same color primaries property (default).
-
-@item unknown
-@item bt709
-@item bt470bg
-BT601 625
-
-@item smpte170m
-BT601 525
-
-@item bt2020
-@item smpte431
-DCI P3
-
-@item smpte432
-P3 D65
-
-@end table
-
-@item transfer_characteristics
-Set the color transfer.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same transfer characteristics property (default).
-
-@item unknown
-@item bt709
-BT 601, BT 709, BT 2020
-@end table
-
-
-@item matrix_coefficients
-Set the matrix coefficient.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same transfer characteristics property (default).
-
-@item unknown
-@item bt709
-@item smpte170m
-BT 601
-
-@item bt2020nc
-@end table
-@end table
-
-Set Rec709 colorspace for each frame of the file
-@example
-ffmpeg -i INPUT -c copy -bsf:v prores_metadata=color_primaries=bt709:color_trc=bt709:colorspace=bt709 output.mov
-@end example
-
-@section remove_extra
-
-Remove extradata from packets.
-
-It accepts the following parameter:
-@table @option
-@item freq
-Set which frame types to remove extradata from.
-
-@table @samp
-@item k
-Remove extradata from non-keyframes only.
-
-@item keyframe
-Remove extradata from keyframes only.
-
-@item e, all
-Remove extradata from all frames.
-
-@end table
-@end table
-
-@anchor{text2movsub}
-@section text2movsub
-
-Convert text subtitles to MOV subtitles (as used by the @code{mov_text}
-codec) with metadata headers.
-
-See also the @ref{mov2textsub} filter.
-
-@section trace_headers
-
-Log trace output containing all syntax elements in the coded stream
-headers (everything above the level of individual coded blocks).
-This can be useful for debugging low-level stream issues.
-
-Supports AV1, H.264, H.265, (M)JPEG, MPEG-2 and VP9, but depending
-on the build only a subset of these may be available.
-
-@section truehd_core
-
-Extract the core from a TrueHD stream, dropping ATMOS data.
-
-@section vp9_metadata
-
-Modify metadata embedded in a VP9 stream.
-
-@table @option
-@item color_space
-Set the color space value in the frame header.
-@table @samp
-@item unknown
-@item bt601
-@item bt709
-@item smpte170
-@item smpte240
-@item bt2020
-@item rgb
-@end table
-
-@item color_range
-Set the color range value in the frame header.  Note that this cannot
-be set in RGB streams.
-@table @samp
-@item tv
-@item pc
-@end table
-@end table
-
-@section vp9_superframe
-
-Merge VP9 invisible (alt-ref) frames back into VP9 superframes. This
-fixes merging of split/segmented VP9 streams where the alt-ref frame
-was split from its visible counterpart.
-
-@section vp9_superframe_split
-
-Split VP9 superframes into single frames.
-
-@section vp9_raw_reorder
-
-Given a VP9 stream with correct timestamps but possibly out of order,
-insert additional show-existing-frame packets to correct the ordering.
+@section remove_extradata

@c man end BITSTREAM FILTERS
--- a/doc/bootstrap.min.css
+++ b/doc/bootstrap.min.css
--- a/doc/build_system.txt
+++ b/doc/build_system.txt
@@ -7,58 +7,44 @@ V
    Disable the default terse mode, the full command issued by make and its
    output will be shown on the screen.

-DBG
-    Preprocess x86 external assembler files to a .dbg.asm file in the object
-    directory, which then gets compiled. Helps in developing those assembler
-    files.
-
 DESTDIR
    Destination directory for the install targets, useful to prepare packages
    or install FFmpeg in cross-environments.

-GEN
-    Set to ‘1’ to generate the missing or mismatched references.
-
 Makefile targets:

 all
    Default target, builds all the libraries and the executables.

 fate
-    Run the fate test suite, note that you must have installed it.
+    Run the fate test suite, note you must have installed it

 fate-list
-    List all fate/regression test targets.
+    Will list all fate/regression test targets

 install
    Install headers, libraries and programs.

-examples
-    Build all examples located in doc/examples.
+libavformat/output-example
+    Build the libavformat basic example.

-checkheaders
-    Check headers dependencies.
+libavcodec/api-example
+    Build the libavcodec basic example.

-alltools
-    Build all tools in tools directory.
-
-config
-    Reconfigure the project with the current configuration.
-
-tools/target_dec_<decoder>_fuzzer
-    Build fuzzer to fuzz the specified decoder.
+libswscale/swscale-test
+    Build the swscale self-test (useful also as example).


 Useful standard make commands:
 make -t <target>
-    Touch all files that otherwise would be built, this is useful to reduce
-    unneeded rebuilding when changing headers, but note that you must force rebuilds
+    Touch all files that otherwise would be build, this is useful to reduce
+    unneeded rebuilding when changing headers, but note you must force rebuilds
    of files that actually need it by hand then.

 make -j<num>
-    Rebuild with multiple jobs at the same time. Faster on multi processor systems.
+    rebuild with multiple jobs at the same time. Faster on multi processor systems

 make -k
-    Continue build in case of errors, this is useful for the regression tests
-    sometimes but note that it will still not run all reg tests.
+    continue build in case of errors, this is useful for the regression tests
+    sometimes but note it will still not run all reg tests.

--- a/doc/codecs.texi
+++ b/doc/codecs.texi
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -14,7 +14,7 @@ You can disable all the decoders with the configure option
 with the options @code{--enable-decoder=@var{DECODER}} /
@code{--disable-decoder=@var{DECODER}}.

-The option @code{-decoders} of the ff* tools will display the list of
+The option @code{-codecs} of the ff* tools will display the list of
 enabled decoders.

@c man end DECODERS
@@ -47,306 +47,4 @@ top-field-first is assumed

@end table

-@section libdav1d
-
-dav1d AV1 decoder.
-
-libdav1d allows libavcodec to decode the AOMedia Video 1 (AV1) codec.
-Requires the presence of the libdav1d headers and library during configuration.
-You need to explicitly configure the build with @code{--enable-libdav1d}.
-
-@subsection Options
-
-The following option is supported by the libdav1d wrapper.
-
-@table @option
-
-@item framethreads
-Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
-
-@item tilethreads
-Set amount of tile threads to use during decoding. The default value is 0 (autodetect).
-
-@item filmgrain
-Apply film grain to the decoded video if present in the bitstream. The default value
-is true.
-
-@end table
-
-@section libdavs2
-
-AVS2-P2/IEEE1857.4 video decoder wrapper.
-
-This decoder allows libavcodec to decode AVS2 streams with davs2 library.
-
@c man end VIDEO DECODERS
-
-@chapter Audio Decoders
-@c man begin AUDIO DECODERS
-
-A description of some of the currently available audio decoders
-follows.
-
-@section ac3
-
-AC-3 audio decoder.
-
-This decoder implements part of ATSC A/52:2010 and ETSI TS 102 366, as well as
-the undocumented RealAudio 3 (a.k.a. dnet).
-
-@subsection AC-3 Decoder Options
-
-@table @option
-
-@item -drc_scale @var{value}
-Dynamic Range Scale Factor. The factor to apply to dynamic range values
-from the AC-3 stream. This factor is applied exponentially.
-There are 3 notable scale factor ranges:
-@table @option
-@item drc_scale == 0
-DRC disabled. Produces full range audio.
-@item 0 < drc_scale <= 1
-DRC enabled.  Applies a fraction of the stream DRC value.
-Audio reproduction is between full range and full compression.
-@item drc_scale > 1
-DRC enabled. Applies drc_scale asymmetrically.
-Loud sounds are fully compressed.  Soft sounds are enhanced.
-@end table
-
-@end table
-
-@section flac
-
-FLAC audio decoder.
-
-This decoder aims to implement the complete FLAC specification from Xiph.
-
-@subsection FLAC Decoder options
-
-@table @option
-
-@item -use_buggy_lpc
-The lavc FLAC encoder used to produce buggy streams with high lpc values
-(like the default value). This option makes it possible to decode such streams
-correctly by using lavc's old buggy lpc logic for decoding.
-
-@end table
-
-@section ffwavesynth
-
-Internal wave synthesizer.
-
-This decoder generates wave patterns according to predefined sequences. Its
-use is purely internal and the format of the data it accepts is not publicly
-documented.
-
-@section libcelt
-
-libcelt decoder wrapper.
-
-libcelt allows libavcodec to decode the Xiph CELT ultra-low delay audio codec.
-Requires the presence of the libcelt headers and library during configuration.
-You need to explicitly configure the build with @code{--enable-libcelt}.
-
-@section libgsm
-
-libgsm decoder wrapper.
-
-libgsm allows libavcodec to decode the GSM full rate audio codec. Requires
-the presence of the libgsm headers and library during configuration. You need
-to explicitly configure the build with @code{--enable-libgsm}.
-
-This decoder supports both the ordinary GSM and the Microsoft variant.
-
-@section libilbc
-
-libilbc decoder wrapper.
-
-libilbc allows libavcodec to decode the Internet Low Bitrate Codec (iLBC)
-audio codec. Requires the presence of the libilbc headers and library during
-configuration. You need to explicitly configure the build with
-@code{--enable-libilbc}.
-
-@subsection Options
-
-The following option is supported by the libilbc wrapper.
-
-@table @option
-@item enhance
-
-Enable the enhancement of the decoded audio when set to 1. The default
-value is 0 (disabled).
-
-@end table
-
-@section libopencore-amrnb
-
-libopencore-amrnb decoder wrapper.
-
-libopencore-amrnb allows libavcodec to decode the Adaptive Multi-Rate
-Narrowband audio codec. Using it requires the presence of the
-libopencore-amrnb headers and library during configuration. You need to
-explicitly configure the build with @code{--enable-libopencore-amrnb}.
-
-An FFmpeg native decoder for AMR-NB exists, so users can decode AMR-NB
-without this library.
-
-@section libopencore-amrwb
-
-libopencore-amrwb decoder wrapper.
-
-libopencore-amrwb allows libavcodec to decode the Adaptive Multi-Rate
-Wideband audio codec. Using it requires the presence of the
-libopencore-amrwb headers and library during configuration. You need to
-explicitly configure the build with @code{--enable-libopencore-amrwb}.
-
-An FFmpeg native decoder for AMR-WB exists, so users can decode AMR-WB
-without this library.
-
-@section libopus
-
-libopus decoder wrapper.
-
-libopus allows libavcodec to decode the Opus Interactive Audio Codec.
-Requires the presence of the libopus headers and library during
-configuration. You need to explicitly configure the build with
-@code{--enable-libopus}.
-
-An FFmpeg native decoder for Opus exists, so users can decode Opus
-without this library.
-
-@c man end AUDIO DECODERS
-
-@chapter Subtitles Decoders
-@c man begin SUBTILES DECODERS
-
-@section libaribb24
-
-ARIB STD-B24 caption decoder.
-
-Implements profiles A and C of the ARIB STD-B24 standard.
-
-@subsection libaribb24 Decoder Options
-
-@table @option
-
-@item -aribb24-base-path @var{path}
-Sets the base path for the libaribb24 library. This is utilized for reading of
-configuration files (for custom unicode conversions), and for dumping of
-non-text symbols as images under that location.
-
-Unset by default.
-
-@item -aribb24-skip-ruby-text @var{boolean}
-Tells the decoder wrapper to skip text blocks that contain half-height ruby
-text.
-
-Enabled by default.
-
-@end table
-
-@section dvbsub
-
-@subsection Options
-
-@table @option
-@item compute_clut
-@table @option
-@item -1
-Compute clut if no matching CLUT is in the stream.
-@item 0
-Never compute CLUT
-@item 1
-Always compute CLUT and override the one provided in the stream.
-@end table
-@item dvb_substream
-Selects the dvb substream, or all substreams if -1 which is default.
-
-@end table
-
-@section dvdsub
-
-This codec decodes the bitmap subtitles used in DVDs; the same subtitles can
-also be found in VobSub file pairs and in some Matroska files.
-
-@subsection Options
-
-@table @option
-@item palette
-Specify the global palette used by the bitmaps. When stored in VobSub, the
-palette is normally specified in the index file; in Matroska, the palette is
-stored in the codec extra-data in the same format as in VobSub. In DVDs, the
-palette is stored in the IFO file, and therefore not available when reading
-from dumped VOB files.
-
-The format for this option is a string containing 16 24-bits hexadecimal
-numbers (without 0x prefix) separated by comas, for example @code{0d00ee,
-ee450d, 101010, eaeaea, 0ce60b, ec14ed, ebff0b, 0d617a, 7b7b7b, d1d1d1,
-7b2a0e, 0d950c, 0f007b, cf0dec, cfa80c, 7c127b}.
-
-@item ifo_palette
-Specify the IFO file from which the global palette is obtained.
-(experimental)
-
-@item forced_subs_only
-Only decode subtitle entries marked as forced. Some titles have forced
-and non-forced subtitles in the same track. Setting this flag to @code{1}
-will only keep the forced subtitles. Default value is @code{0}.
-@end table
-
-@section libzvbi-teletext
-
-Libzvbi allows libavcodec to decode DVB teletext pages and DVB teletext
-subtitles. Requires the presence of the libzvbi headers and library during
-configuration. You need to explicitly configure the build with
-@code{--enable-libzvbi}.
-
-@subsection Options
-
-@table @option
-@item txt_page
-List of teletext page numbers to decode. Pages that do not match the specified
-list are dropped. You may use the special @code{*} string to match all pages,
-or @code{subtitle} to match all subtitle pages.
-Default value is *.
-@item txt_chop_top
-Discards the top teletext line. Default value is 1.
-@item txt_format
-Specifies the format of the decoded subtitles.
-@table @option
-@item bitmap
-The default format, you should use this for teletext pages, because certain
-graphics and colors cannot be expressed in simple text or even ASS.
-@item text
-Simple text based output without formatting.
-@item ass
-Formatted ASS output, subtitle pages and teletext pages are returned in
-different styles, subtitle pages are stripped down to text, but an effort is
-made to keep the text alignment and the formatting.
-@end table
-@item txt_left
-X offset of generated bitmaps, default is 0.
-@item txt_top
-Y offset of generated bitmaps, default is 0.
-@item txt_chop_spaces
-Chops leading and trailing spaces and removes empty lines from the generated
-text. This option is useful for teletext based subtitles where empty spaces may
-be present at the start or at the end of the lines or empty lines may be
-present between the subtitle lines because of double-sized teletext characters.
-Default value is 1.
-@item txt_duration
-Sets the display duration of the decoded teletext pages or subtitles in
-milliseconds. Default value is -1 which means infinity or until the next
-subtitle event comes.
-@item txt_transparent
-Force transparent background of the generated teletext bitmaps. Default value
-is 0 which means an opaque background.
-@item txt_opacity
-Sets the opacity (0-255) of the teletext background. If
-@option{txt_transparent} is not set, it only affects characters between a start
-box and an end box, typically subtitles. Default value is 0 if
-@option{txt_transparent} is set, 255 otherwise.
-
-@end table
-
-@c man end SUBTILES DECODERS
--- a/doc/default.css
+++ b/doc/default.css
@@ -1,165 +0,0 @@
-a.summary-letter {
-    text-decoration: none;
-}
-
-a {
-    color: #2D6198;
-}
-
-a:visited {
-    color: #884488;
-}
-
-#banner {
-    background-color: white;
-    position: relative;
-    text-align: center;
-}
-
-#banner img {
-    margin-bottom: 1px;
-    margin-top: 5px;
-}
-
-#body {
-    margin-left: 1em;
-    margin-right: 1em;
-}
-
-body {
-    background-color: #313131;
-    margin: 0;
-    text-align: justify;
-}
-
-.center {
-    margin-left: auto;
-    margin-right: auto;
-    text-align: center;
-}
-
-#container {
-    background-color: white;
-    color: #202020;
-    margin-left: 1em;
-    margin-right: 1em;
-}
-
-#footer {
-    text-align: center;
-}
-
-h1 a, h2 a, h3 a, h4 a {
-    text-decoration: inherit;
-    color: inherit;
-}
-
-h1, h2, h3, h4 {
-    padding-left: 0.4em;
-    border-radius: 4px;
-    padding-bottom: 0.25em;
-    padding-top: 0.25em;
-    border: 1px solid #6A996A;
-}
-
-h1 {
-    background-color: #7BB37B;
-    color: #151515;
-    font-size: 1.2em;
-    padding-bottom: 0.3em;
-    padding-top: 0.3em;
-}
-
-h2 {
-    color: #313131;
-    font-size: 1.0em;
-    background-color: #ABE3AB;
-}
-
-h3 {
-    color: #313131;
-    font-size: 0.9em;
-    margin-bottom: -6px;
-    background-color: #BBF3BB;
-}
-
-h4 {
-    color: #313131;
-    font-size: 0.8em;
-    margin-bottom: -8px;
-    background-color: #D1FDD1;
-}
-
-img {
-    border: 0;
-}
-
-#navbar {
-    background-color: #738073;
-    border-bottom: 1px solid #5C665C;
-    border-top: 1px solid #5C665C;
-    margin-top: 12px;
-    padding: 0.3em;
-    position: relative;
-    text-align: center;
-}
-
-#navbar a, #navbar_secondary a {
-    color: white;
-    padding: 0.3em;
-    text-decoration: none;
-}
-
-#navbar a:hover, #navbar_secondary a:hover {
-    background-color: #313131;
-    color: white;
-    text-decoration: none;
-}
-
-#navbar_secondary {
-    background-color: #738073;
-    border-bottom: 1px solid #5C665C;
-    border-left: 1px solid #5C665C;
-    border-right: 1px solid #5C665C;
-    padding: 0.3em;
-    position: relative;
-    text-align: center;
-}
-
-p {
-    margin-left: 1em;
-    margin-right: 1em;
-}
-
-pre {
-    margin-left: 3em;
-    margin-right: 3em;
-    padding: 0.3em;
-    border: 1px solid #bbb;
-    background-color: #f7f7f7;
-}
-
-dl dt {
-    font-weight: bold;
-}
-
-#proj_desc {
-    font-size: 1.2em;
-}
-
-#repos {
-    margin-left: 1em;
-    margin-right: 1em;
-    border-collapse: collapse;
-    border: solid 1px #6A996A;
-}
-
-#repos th {
-    background-color: #7BB37B;
-    border: solid 1px #6A996A;
-}
-
-#repos td {
-    padding: 0.2em;
-    border: solid 1px #6A996A;
-}
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -1,313 +1,70 @@
@chapter Demuxers
@c man begin DEMUXERS

-Demuxers are configured elements in FFmpeg that can read the
+Demuxers are configured elements in FFmpeg which allow to read the
 multimedia streams from a particular type of file.

 When you configure your FFmpeg build, all the supported demuxers
 are enabled by default. You can list all available ones using the
-configure option @code{--list-demuxers}.
+configure option "--list-demuxers".

 You can disable all the demuxers using the configure option
-@code{--disable-demuxers}, and selectively enable a single demuxer with
-the option @code{--enable-demuxer=@var{DEMUXER}}, or disable it
-with the option @code{--disable-demuxer=@var{DEMUXER}}.
+"--disable-demuxers", and selectively enable a single demuxer with
+the option "--enable-demuxer=@var{DEMUXER}", or disable it
+with the option "--disable-demuxer=@var{DEMUXER}".

-The option @code{-demuxers} of the ff* tools will display the list of
-enabled demuxers. Use @code{-formats} to view a combined list of
-enabled demuxers and muxers.
+The option "-formats" of the ff* tools will display the list of
+enabled demuxers.

 The description of some of the currently available demuxers follows.

-@section aa
+@section image2

-Audible Format 2, 3, and 4 demuxer.
+Image file demuxer.

-This demuxer is used to demux Audible Format 2, 3, and 4 (.aa) files.
+This demuxer reads from a list of image files specified by a pattern.

-@section apng
+The pattern may contain the string "%d" or "%0@var{N}d", which
+specifies the position of the characters representing a sequential
+number in each filename matched by the pattern. If the form
+"%d0@var{N}d" is used, the string representing the number in each
+filename is 0-padded and @var{N} is the total number of 0-padded
+digits representing the number. The literal character '%' can be
+specified in the pattern with the string "%%".

-Animated Portable Network Graphics demuxer.
+If the pattern contains "%d" or "%0@var{N}d", the first filename of
+the file list specified by the pattern must contain a number
+inclusively contained between 0 and 4, all the following numbers must
+be sequential. This limitation may be hopefully fixed.

-This demuxer is used to demux APNG files.
-All headers, but the PNG signature, up to (but not including) the first
-fcTL chunk are transmitted as extradata.
-Frames are then split as being all the chunks between two fcTL ones, or
-between the last fcTL and IEND chunks.
+The pattern may contain a suffix which is used to automatically
+determine the format of the images contained in the files.

-@table @option
-@item -ignore_loop @var{bool}
-Ignore the loop variable in the file if set.
-@item -max_fps @var{int}
-Maximum framerate in frames per second (0 for no limit).
-@item -default_fps @var{int}
-Default framerate in frames per second when none is specified in the file
-(0 meaning as fast as possible).
-@end table
+For example the pattern "img-%03d.bmp" will match a sequence of
+filenames of the form @file{img-001.bmp}, @file{img-002.bmp}, ...,
+@file{img-010.bmp}, etc.; the pattern "i%%m%%g-%d.jpg" will match a
+sequence of filenames of the form @file{i%m%g-1.jpg},
+@file{i%m%g-2.jpg}, ..., @file{i%m%g-10.jpg}, etc.

-@section asf
+The size, the pixel format, and the format of each image must be the
+same for all the files in the sequence.

-Advanced Systems Format demuxer.
-
-This demuxer is used to demux ASF files and MMS network streams.
-
-@table @option
-@item -no_resync_search @var{bool}
-Do not try to resynchronize by looking for a certain optional start code.
-@end table
-
-@anchor{concat}
-@section concat
-
-Virtual concatenation script demuxer.
-
-This demuxer reads a list of files and other directives from a text file and
-demuxes them one after the other, as if all their packets had been muxed
-together.
-
-The timestamps in the files are adjusted so that the first file starts at 0
-and each next file starts where the previous one finishes. Note that it is
-done globally and may cause gaps if all streams do not have exactly the same
-length.
-
-All files must have the same streams (same codecs, same time base, etc.).
-
-The duration of each file is used to adjust the timestamps of the next file:
-if the duration is incorrect (because it was computed using the bit-rate or
-because the file is truncated, for example), it can cause artifacts. The
-@code{duration} directive can be used to override the duration stored in
-each file.
-
-@subsection Syntax
-
-The script is a text file in extended-ASCII, with one directive per line.
-Empty lines, leading spaces and lines starting with '#' are ignored. The
-following directive is recognized:
-
-@table @option
-
-@item @code{file @var{path}}
-Path to a file to read; special characters and spaces must be escaped with
-backslash or single quotes.
-
-All subsequent file-related directives apply to that file.
-
-@item @code{ffconcat version 1.0}
-Identify the script type and version. It also sets the @option{safe} option
-to 1 if it was -1.
-
-To make FFmpeg recognize the format automatically, this directive must
-appear exactly as is (no extra space or byte-order-mark) on the very first
-line of the script.
-
-@item @code{duration @var{dur}}
-Duration of the file. This information can be specified from the file;
-specifying it here may be more efficient or help if the information from the
-file is not available or accurate.
-
-If the duration is set for all files, then it is possible to seek in the
-whole concatenated video.
-
-@item @code{inpoint @var{timestamp}}
-In point of the file. When the demuxer opens the file it instantly seeks to the
-specified timestamp. Seeking is done so that all streams can be presented
-successfully at In point.
-
-This directive works best with intra frame codecs, because for non-intra frame
-ones you will usually get extra packets before the actual In point and the
-decoded content will most likely contain frames before In point too.
-
-For each file, packets before the file In point will have timestamps less than
-the calculated start timestamp of the file (negative in case of the first
-file), and the duration of the files (if not specified by the @code{duration}
-directive) will be reduced based on their specified In point.
-
-Because of potential packets before the specified In point, packet timestamps
-may overlap between two concatenated files.
-
-@item @code{outpoint @var{timestamp}}
-Out point of the file. When the demuxer reaches the specified decoding
-timestamp in any of the streams, it handles it as an end of file condition and
-skips the current and all the remaining packets from all streams.
-
-Out point is exclusive, which means that the demuxer will not output packets
-with a decoding timestamp greater or equal to Out point.
-
-This directive works best with intra frame codecs and formats where all streams
-are tightly interleaved. For non-intra frame codecs you will usually get
-additional packets with presentation timestamp after Out point therefore the
-decoded content will most likely contain frames after Out point too. If your
-streams are not tightly interleaved you may not get all the packets from all
-streams before Out point and you may only will be able to decode the earliest
-stream until Out point.
-
-The duration of the files (if not specified by the @code{duration}
-directive) will be reduced based on their specified Out point.
-
-@item @code{file_packet_metadata @var{key=value}}
-Metadata of the packets of the file. The specified metadata will be set for
-each file packet. You can specify this directive multiple times to add multiple
-metadata entries.
-
-@item @code{stream}
-Introduce a stream in the virtual file.
-All subsequent stream-related directives apply to the last introduced
-stream.
-Some streams properties must be set in order to allow identifying the
-matching streams in the subfiles.
-If no streams are defined in the script, the streams from the first file are
-copied.
-
-@item @code{exact_stream_id @var{id}}
-Set the id of the stream.
-If this directive is given, the string with the corresponding id in the
-subfiles will be used.
-This is especially useful for MPEG-PS (VOB) files, where the order of the
-streams is not reliable.
-
-@end table
-
-@subsection Options
-
-This demuxer accepts the following option:
-
-@table @option
-
-@item safe
-If set to 1, reject unsafe file paths. A file path is considered safe if it
-does not contain a protocol specification and is relative and all components
-only contain characters from the portable character set (letters, digits,
-period, underscore and hyphen) and have no period at the beginning of a
-component.
-
-If set to 0, any file name is accepted.
-
-The default is 1.
-
-1 is equivalent to 1 if the format was automatically
-probed and 0 otherwise.
-
-@item auto_convert
-If set to 1, try to perform automatic conversions on packet data to make the
-streams concatenable.
-The default is 1.
-
-Currently, the only conversion is adding the h264_mp4toannexb bitstream
-filter to H.264 streams in MP4 format. This is necessary in particular if
-there are resolution changes.
-
-@item segment_time_metadata
-If set to 1, every packet will contain the @var{lavf.concat.start_time} and the
-@var{lavf.concat.duration} packet metadata values which are the start_time and
-the duration of the respective file segments in the concatenated output
-expressed in microseconds. The duration metadata is only set if it is known
-based on the concat file.
-The default is 0.
-
-@end table
-
-@subsection Examples
-
-@itemize
-@item
-Use absolute filenames and include some comments:
+The following example shows how to use @command{ffmpeg} for creating a
+video from the images in the file sequence @file{img-001.jpeg},
+@file{img-002.jpeg}, ..., assuming an input frame rate of 10 frames per
+second:
@example
-# my first filename
-file /mnt/share/file-1.wav
-# my second filename including whitespace
-file '/mnt/share/file 2.wav'
-# my third filename including whitespace plus single quote
-file '/mnt/share/file 3'\''.wav'
+ffmpeg -i 'img-%03d.jpeg' -r 10 out.mkv
@end example

-@item
-Allow for input format auto-probing, use safe filenames and set the duration of
-the first file:
+Note that the pattern must not necessarily contain "%d" or
+"%0@var{N}d", for example to convert a single image file
+@file{img.jpeg} you can employ the command:
@example
-ffconcat version 1.0
-
-file file-1.wav
-duration 20.0
-
-file subdir/file-2.wav
-@end example
-@end itemize
-
-@section dash
-
-Dynamic Adaptive Streaming over HTTP demuxer.
-
-This demuxer presents all AVStreams found in the manifest.
-By setting the discard flags on AVStreams the caller can decide
-which streams to actually receive.
-Each stream mirrors the @code{id} and @code{bandwidth} properties from the
-@code{<Representation>} as metadata keys named "id" and "variant_bitrate" respectively.
-
-@section flv, live_flv
-
-Adobe Flash Video Format demuxer.
-
-This demuxer is used to demux FLV files and RTMP network streams. In case of live network streams, if you force format, you may use live_flv option instead of flv to survive timestamp discontinuities.
-
-@example
-ffmpeg -f flv -i myfile.flv ...
-ffmpeg -f live_flv -i rtmp://<any.server>/anything/key ....
+ffmpeg -i img.jpeg img.png
@end example

-
-@table @option
-@item -flv_metadata @var{bool}
-Allocate the streams according to the onMetaData array content.
-
-@item -flv_ignore_prevtag @var{bool}
-Ignore the size of previous tag value.
-
-@item -flv_full_metadata @var{bool}
-Output all context of the onMetadata.
-@end table
-
-@section gif
-
-Animated GIF demuxer.
-
-It accepts the following options:
-
-@table @option
-@item min_delay
-Set the minimum valid delay between frames in hundredths of seconds.
-Range is 0 to 6000. Default value is 2.
-
-@item max_gif_delay
-Set the maximum valid delay between frames in hundredth of seconds.
-Range is 0 to 65535. Default value is 65535 (nearly eleven minutes),
-the maximum value allowed by the specification.
-
-@item default_delay
-Set the default delay between frames in hundredths of seconds.
-Range is 0 to 6000. Default value is 10.
-
-@item ignore_loop
-GIF files can contain information to loop a certain number of times (or
-infinitely). If @option{ignore_loop} is set to 1, then the loop setting
-from the input will be ignored and looping will not occur. If set to 0,
-then looping will occur and will cycle the number of times according to
-the GIF. Default value is 1.
-@end table
-
-For example, with the overlay filter, place an infinitely looping GIF
-over another video:
-@example
-ffmpeg -i input.mp4 -ignore_loop 0 -i input.gif -filter_complex overlay=shortest=1 out.mkv
-@end example
-
-Note that in the above example the shortest option for overlay filter is
-used to end the output video at the length of the shortest input file,
-which in this case is @file{input.mp4} as the GIF in this example loops
-infinitely.
-
-@section hls
-
-HLS demuxer
+@section applehttp

 Apple HTTP Live Streaming demuxer.

@@ -318,432 +75,4 @@ the caller can decide which variant streams to actually receive.
 The total bitrate of the variant that the stream belongs to is
 available in a metadata key named "variant_bitrate".

-It accepts the following options:
-
-@table @option
-@item live_start_index
-segment index to start live streams at (negative values are from the end).
-
-@item allowed_extensions
-',' separated list of file extensions that hls is allowed to access.
-
-@item max_reload
-Maximum number of times a insufficient list is attempted to be reloaded.
-Default value is 1000.
-
-@item http_persistent
-Use persistent HTTP connections. Applicable only for HTTP streams.
-Enabled by default.
-
-@item http_multiple
-Use multiple HTTP connections for downloading HTTP segments.
-Enabled by default for HTTP/1.1 servers.
-@end table
-
-@section image2
-
-Image file demuxer.
-
-This demuxer reads from a list of image files specified by a pattern.
-The syntax and meaning of the pattern is specified by the
-option @var{pattern_type}.
-
-The pattern may contain a suffix which is used to automatically
-determine the format of the images contained in the files.
-
-The size, the pixel format, and the format of each image must be the
-same for all the files in the sequence.
-
-This demuxer accepts the following options:
-@table @option
-@item framerate
-Set the frame rate for the video stream. It defaults to 25.
-@item loop
-If set to 1, loop over the input. Default value is 0.
-@item pattern_type
-Select the pattern type used to interpret the provided filename.
-
-@var{pattern_type} accepts one of the following values.
-@table @option
-@item none
-Disable pattern matching, therefore the video will only contain the specified
-image. You should use this option if you do not want to create sequences from
-multiple images and your filenames may contain special pattern characters.
-@item sequence
-Select a sequence pattern type, used to specify a sequence of files
-indexed by sequential numbers.
-
-A sequence pattern may contain the string "%d" or "%0@var{N}d", which
-specifies the position of the characters representing a sequential
-number in each filename matched by the pattern. If the form
-"%d0@var{N}d" is used, the string representing the number in each
-filename is 0-padded and @var{N} is the total number of 0-padded
-digits representing the number. The literal character '%' can be
-specified in the pattern with the string "%%".
-
-If the sequence pattern contains "%d" or "%0@var{N}d", the first filename of
-the file list specified by the pattern must contain a number
-inclusively contained between @var{start_number} and
-@var{start_number}+@var{start_number_range}-1, and all the following
-numbers must be sequential.
-
-For example the pattern "img-%03d.bmp" will match a sequence of
-filenames of the form @file{img-001.bmp}, @file{img-002.bmp}, ...,
-@file{img-010.bmp}, etc.; the pattern "i%%m%%g-%d.jpg" will match a
-sequence of filenames of the form @file{i%m%g-1.jpg},
-@file{i%m%g-2.jpg}, ..., @file{i%m%g-10.jpg}, etc.
-
-Note that the pattern must not necessarily contain "%d" or
-"%0@var{N}d", for example to convert a single image file
-@file{img.jpeg} you can employ the command:
-@example
-ffmpeg -i img.jpeg img.png
-@end example
-
-@item glob
-Select a glob wildcard pattern type.
-
-The pattern is interpreted like a @code{glob()} pattern. This is only
-selectable if libavformat was compiled with globbing support.
-
-@item glob_sequence @emph{(deprecated, will be removed)}
-Select a mixed glob wildcard/sequence pattern.
-
-If your version of libavformat was compiled with globbing support, and
-the provided pattern contains at least one glob meta character among
-@code{%*?[]@{@}} that is preceded by an unescaped "%", the pattern is
-interpreted like a @code{glob()} pattern, otherwise it is interpreted
-like a sequence pattern.
-
-All glob special characters @code{%*?[]@{@}} must be prefixed
-with "%". To escape a literal "%" you shall use "%%".
-
-For example the pattern @code{foo-%*.jpeg} will match all the
-filenames prefixed by "foo-" and terminating with ".jpeg", and
-@code{foo-%?%?%?.jpeg} will match all the filenames prefixed with
-"foo-", followed by a sequence of three characters, and terminating
-with ".jpeg".
-
-This pattern type is deprecated in favor of @var{glob} and
-@var{sequence}.
-@end table
-
-Default value is @var{glob_sequence}.
-@item pixel_format
-Set the pixel format of the images to read. If not specified the pixel
-format is guessed from the first image file in the sequence.
-@item start_number
-Set the index of the file matched by the image file pattern to start
-to read from. Default value is 0.
-@item start_number_range
-Set the index interval range to check when looking for the first image
-file in the sequence, starting from @var{start_number}. Default value
-is 5.
-@item ts_from_file
-If set to 1, will set frame timestamp to modification time of image file. Note
-that monotonity of timestamps is not provided: images go in the same order as
-without this option. Default value is 0.
-If set to 2, will set frame timestamp to the modification time of the image file in
-nanosecond precision.
-@item video_size
-Set the video size of the images to read. If not specified the video
-size is guessed from the first image file in the sequence.
-@end table
-
-@subsection Examples
-
-@itemize
-@item
-Use @command{ffmpeg} for creating a video from the images in the file
-sequence @file{img-001.jpeg}, @file{img-002.jpeg}, ..., assuming an
-input frame rate of 10 frames per second:
-@example
-ffmpeg -framerate 10 -i 'img-%03d.jpeg' out.mkv
-@end example
-
-@item
-As above, but start by reading from a file with index 100 in the sequence:
-@example
-ffmpeg -framerate 10 -start_number 100 -i 'img-%03d.jpeg' out.mkv
-@end example
-
-@item
-Read images matching the "*.png" glob pattern , that is all the files
-terminating with the ".png" suffix:
-@example
-ffmpeg -framerate 10 -pattern_type glob -i "*.png" out.mkv
-@end example
-@end itemize
-
-@section libgme
-
-The Game Music Emu library is a collection of video game music file emulators.
-
-See @url{https://bitbucket.org/mpyne/game-music-emu/overview} for more information.
-
-It accepts the following options:
-
-@table @option
-
-@item track_index
-Set the index of which track to demux. The demuxer can only export one track.
-Track indexes start at 0. Default is to pick the first track. Number of tracks
-is exported as @var{tracks} metadata entry.
-
-@item sample_rate
-Set the sampling rate of the exported track. Range is 1000 to 999999. Default is 44100.
-
-@item max_size @emph{(bytes)}
-The demuxer buffers the entire file into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of files that can be read.
-Default is 50 MiB.
-
-@end table
-
-@section libmodplug
-
-ModPlug based module demuxer
-
-See @url{https://github.com/Konstanty/libmodplug}
-
-It will export one 2-channel 16-bit 44.1 kHz audio stream.
-Optionally, a @code{pal8} 16-color video stream can be exported with or without printed metadata.
-
-It accepts the following options:
-
-@table @option
-@item noise_reduction
-Apply a simple low-pass filter. Can be 1 (on) or 0 (off). Default is 0.
-
-@item reverb_depth
-Set amount of reverb. Range 0-100. Default is 0.
-
-@item reverb_delay
-Set delay in ms, clamped to 40-250 ms. Default is 0.
-
-@item bass_amount
-Apply bass expansion a.k.a. XBass or megabass. Range is 0 (quiet) to 100 (loud). Default is 0.
-
-@item bass_range
-Set cutoff i.e. upper-bound for bass frequencies. Range is 10-100 Hz. Default is 0.
-
-@item surround_depth
-Apply a Dolby Pro-Logic surround effect. Range is 0 (quiet) to 100 (heavy). Default is 0.
-
-@item surround_delay
-Set surround delay in ms, clamped to 5-40 ms. Default is 0.
-
-@item max_size
-The demuxer buffers the entire file into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of files that can be read. Range is 0 to 100 MiB.
-0 removes buffer size limit (not recommended). Default is 5 MiB.
-
-@item video_stream_expr
-String which is evaluated using the eval API to assign colors to the generated video stream.
-Variables which can be used are @code{x}, @code{y}, @code{w}, @code{h}, @code{t}, @code{speed},
-@code{tempo}, @code{order}, @code{pattern} and @code{row}.
-
-@item video_stream
-Generate video stream. Can be 1 (on) or 0 (off). Default is 0.
-
-@item video_stream_w
-Set video frame width in 'chars' where one char indicates 8 pixels. Range is 20-512. Default is 30.
-
-@item video_stream_h
-Set video frame height in 'chars' where one char indicates 8 pixels. Range is 20-512. Default is 30.
-
-@item video_stream_ptxt
-Print metadata on video stream. Includes @code{speed}, @code{tempo}, @code{order}, @code{pattern},
-@code{row} and @code{ts} (time in ms). Can be 1 (on) or 0 (off). Default is 1.
-
-@end table
-
-@section libopenmpt
-
-libopenmpt based module demuxer
-
-See @url{https://lib.openmpt.org/libopenmpt/} for more information.
-
-Some files have multiple subsongs (tracks) this can be set with the @option{subsong}
-option.
-
-It accepts the following options:
-
-@table @option
-@item subsong
-Set the subsong index. This can be either  'all', 'auto', or the index of the
-subsong. Subsong indexes start at 0. The default is 'auto'.
-
-The default value is to let libopenmpt choose.
-
-@item layout
-Set the channel layout. Valid values are 1, 2, and 4 channel layouts.
-The default value is STEREO.
-
-@item sample_rate
-Set the sample rate for libopenmpt to output.
-Range is from 1000 to INT_MAX. The value default is 48000.
-@end table
-
-@section mov/mp4/3gp/QuickTime
-
-QuickTime / MP4 demuxer.
-
-This demuxer accepts the following options:
-@table @option
-@item enable_drefs
-Enable loading of external tracks, disabled by default.
-Enabling this can theoretically leak information in some use cases.
-
-@item use_absolute_path
-Allows loading of external tracks via absolute paths, disabled by default.
-Enabling this poses a security risk. It should only be enabled if the source
-is known to be non malicious.
-
-@end table
-
-@section mpegts
-
-MPEG-2 transport stream demuxer.
-
-This demuxer accepts the following options:
-@table @option
-@item resync_size
-Set size limit for looking up a new synchronization. Default value is
-65536.
-
-@item skip_unknown_pmt
-Skip PMTs for programs not defined in the PAT. Default value is 0.
-
-@item fix_teletext_pts
-Override teletext packet PTS and DTS values with the timestamps calculated
-from the PCR of the first program which the teletext stream is part of and is
-not discarded. Default value is 1, set this option to 0 if you want your
-teletext packet PTS and DTS values untouched.
-
-@item ts_packetsize
-Output option carrying the raw packet size in bytes.
-Show the detected raw packet size, cannot be set by the user.
-
-@item scan_all_pmts
-Scan and combine all PMTs. The value is an integer with value from -1
-to 1 (-1 means automatic setting, 1 means enabled, 0 means
-disabled). Default value is -1.
-
-@item merge_pmt_versions
-Re-use existing streams when a PMT's version is updated and elementary
-streams move to different PIDs. Default value is 0.
-@end table
-
-@section mpjpeg
-
-MJPEG encapsulated in multi-part MIME demuxer.
-
-This demuxer allows reading of MJPEG, where each frame is represented as a part of
-multipart/x-mixed-replace stream.
-@table @option
-
-@item strict_mime_boundary
-Default implementation applies a relaxed standard to multi-part MIME boundary detection,
-to prevent regression with numerous existing endpoints not generating a proper MIME
-MJPEG stream. Turning this option on by setting it to 1 will result in a stricter check
-of the boundary value.
-@end table
-
-@section rawvideo
-
-Raw video demuxer.
-
-This demuxer allows one to read raw video data. Since there is no header
-specifying the assumed video parameters, the user must specify them
-in order to be able to decode the data correctly.
-
-This demuxer accepts the following options:
-@table @option
-
-@item framerate
-Set input video frame rate. Default value is 25.
-
-@item pixel_format
-Set the input video pixel format. Default value is @code{yuv420p}.
-
-@item video_size
-Set the input video size. This value must be specified explicitly.
-@end table
-
-For example to read a rawvideo file @file{input.raw} with
-@command{ffplay}, assuming a pixel format of @code{rgb24}, a video
-size of @code{320x240}, and a frame rate of 10 images per second, use
-the command:
-@example
-ffplay -f rawvideo -pixel_format rgb24 -video_size 320x240 -framerate 10 input.raw
-@end example
-
-@section sbg
-
-SBaGen script demuxer.
-
-This demuxer reads the script language used by SBaGen
-@url{http://uazu.net/sbagen/} to generate binaural beats sessions. A SBG
-script looks like that:
-@example
-SE
-a: 300-2.5/3 440+4.5/0
-b: 300-2.5/0 440+4.5/3
-off: -
-NOW      == a
-+0:07:00 == b
-+0:14:00 == a
-+0:21:00 == b
-+0:30:00    off
-@end example
-
-A SBG script can mix absolute and relative timestamps. If the script uses
-either only absolute timestamps (including the script start time) or only
-relative ones, then its layout is fixed, and the conversion is
-straightforward. On the other hand, if the script mixes both kind of
-timestamps, then the @var{NOW} reference for relative timestamps will be
-taken from the current time of day at the time the script is read, and the
-script layout will be frozen according to that reference. That means that if
-the script is directly played, the actual times will match the absolute
-timestamps up to the sound controller's clock accuracy, but if the user
-somehow pauses the playback or seeks, all times will be shifted accordingly.
-
-@section tedcaptions
-
-JSON captions used for @url{http://www.ted.com/, TED Talks}.
-
-TED does not provide links to the captions, but they can be guessed from the
-page. The file @file{tools/bookmarklets.html} from the FFmpeg source tree
-contains a bookmarklet to expose them.
-
-This demuxer accepts the following option:
-@table @option
-@item start_time
-Set the start time of the TED talk, in milliseconds. The default is 15000
-(15s). It is used to sync the captions with the downloadable videos, because
-they include a 15s intro.
-@end table
-
-Example: convert the captions to a format most players understand:
-@example
-ffmpeg -i http://www.ted.com/talks/subtitles/id/1/lang/en talk1-en.srt
-@end example
-
-@section vapoursynth
-
-Vapoursynth wrapper.
-
-Due to security concerns, Vapoursynth scripts will not
-be autodetected so the input format has to be forced. For ff* CLI tools,
-add @code{-f vapoursynth} before the input @code{-i yourscript.vpy}.
-
-This demuxer accepts the following option:
-@table @option
-@item max_script_size
-The demuxer buffers the entire script into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of scripts that can be read.
-Default is 1 MiB.
-@end table
-
-@c man end DEMUXERS
+@c man end INPUT DEVICES
--- a/doc/developer.texi
+++ b/doc/developer.texi
--- a/doc/devices.texi
+++ b/doc/devices.texi
@@ -1,25 +0,0 @@
-@chapter Device Options
-@c man begin DEVICE OPTIONS
-
-The libavdevice library provides the same interface as
-libavformat. Namely, an input device is considered like a demuxer, and
-an output device like a muxer, and the interface and generic device
-options are the same provided by libavformat (see the ffmpeg-formats
-manual).
-
-In addition each input or output device may support so-called private
-options, which are specific for that component.
-
-Options may be set by specifying -@var{option} @var{value} in the
-FFmpeg tools, or by setting the value explicitly in the device
-@code{AVFormatContext} options or using the @file{libavutil/opt.h} API
-for programmatic use.
-
-@c man end DEVICE OPTIONS
-
-@ifclear config-writeonly
-@include indevs.texi
-@end ifclear
-@ifclear config-readonly
-@include outdevs.texi
-@end ifclear
--- a/doc/doxy-wrapper.sh
+++ b/doc/doxy-wrapper.sh
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-OUT_DIR="${1}"
-DOXYFILE="${2}"
-DOXYGEN="${3}"
-
-shift 3
-
-if [ -e "VERSION" ]; then
-    VERSION=`cat "VERSION"`
-else
-    VERSION=`git describe`
-fi
-
-$DOXYGEN - <<EOF
-@INCLUDE        = ${DOXYFILE}
-INPUT           = $@
-HTML_TIMESTAMP  = NO
-PROJECT_NUMBER  = $VERSION
-OUTPUT_DIRECTORY = $OUT_DIR
-EOF
--- a/doc/doxy/.gitignore
+++ b/doc/doxy/.gitignore
@@ -1 +0,0 @@
-/html/
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
--- a/doc/errno.txt
+++ b/doc/errno.txt
@@ -76,7 +76,7 @@ EMFILE           POSIX     ++++++  Too many open files
 EMLINK           POSIX     ++++++  Too many links
 EMSGSIZE         POSIX     +++..+  Message too long
 EMULTIHOP        POSIX     ++4...  Multihop attempted
-ENAMETOOLONG     POSIX  -  ++++++  File name too long
+ENAMETOOLONG     POSIX  -  ++++++  Filen ame too long
 ENAVAIL                    +.....  No XENIX semaphores available
 ENEEDAUTH                  .++...  Need authenticator
 ENETDOWN         POSIX     +++..+  Network is down
--- a/doc/eval.texi
+++ b/doc/eval.texi
@@ -0,0 +1,183 @@
+@chapter Expression Evaluation
+@c man begin EXPRESSION EVALUATION
+
+When evaluating an arithmetic expression, FFmpeg uses an internal
+formula evaluator, implemented through the @file{libavutil/eval.h}
+interface.
+
+An expression may contain unary, binary operators, constants, and
+functions.
+
+Two expressions @var{expr1} and @var{expr2} can be combined to form
+another expression "@var{expr1};@var{expr2}".
+@var{expr1} and @var{expr2} are evaluated in turn, and the new
+expression evaluates to the value of @var{expr2}.
+
+The following binary operators are available: @code{+}, @code{-},
+@code{*}, @code{/}, @code{^}.
+
+The following unary operators are available: @code{+}, @code{-}.
+
+The following functions are available:
+@table @option
+@item sinh(x)
+@item cosh(x)
+@item tanh(x)
+@item sin(x)
+@item cos(x)
+@item tan(x)
+@item atan(x)
+@item asin(x)
+@item acos(x)
+@item exp(x)
+@item log(x)
+@item abs(x)
+@item squish(x)
+@item gauss(x)
+@item isnan(x)
+Return 1.0 if @var{x} is NAN, 0.0 otherwise.
+
+@item mod(x, y)
+@item max(x, y)
+@item min(x, y)
+@item eq(x, y)
+@item gte(x, y)
+@item gt(x, y)
+@item lte(x, y)
+@item lt(x, y)
+@item st(var, expr)
+Allow to store the value of the expression @var{expr} in an internal
+variable. @var{var} specifies the number of the variable where to
+store the value, and it is a value ranging from 0 to 9. The function
+returns the value stored in the internal variable.
+Note, Variables are currently not shared between expressions.
+
+@item ld(var)
+Allow to load the value of the internal variable with number
+@var{var}, which was previously stored with st(@var{var}, @var{expr}).
+The function returns the loaded value.
+
+@item while(cond, expr)
+Evaluate expression @var{expr} while the expression @var{cond} is
+non-zero, and returns the value of the last @var{expr} evaluation, or
+NAN if @var{cond} was always false.
+
+@item ceil(expr)
+Round the value of expression @var{expr} upwards to the nearest
+integer. For example, "ceil(1.5)" is "2.0".
+
+@item floor(expr)
+Round the value of expression @var{expr} downwards to the nearest
+integer. For example, "floor(-1.5)" is "-2.0".
+
+@item trunc(expr)
+Round the value of expression @var{expr} towards zero to the nearest
+integer. For example, "trunc(-1.5)" is "-1.0".
+
+@item sqrt(expr)
+Compute the square root of @var{expr}. This is equivalent to
+"(@var{expr})^.5".
+
+@item not(expr)
+Return 1.0 if @var{expr} is zero, 0.0 otherwise.
+
+@item pow(x, y)
+Compute the power of @var{x} elevated @var{y}, it is equivalent to
+"(@var{x})^(@var{y})".
+
+@item random(x)
+Return a pseudo random value between 0.0 and 1.0. @var{x} is the index of the
+internal variable which will be used to save the seed/state.
+
+@item hypot(x, y)
+This function is similar to the C function with the same name; it returns
+"sqrt(@var{x}*@var{x} + @var{y}*@var{y})", the length of the hypotenuse of a
+right triangle with sides of length @var{x} and @var{y}, or the distance of the
+point (@var{x}, @var{y}) from the origin.
+
+@item gcd(x, y)
+Return the greatest common divisor of @var{x} and @var{y}. If both @var{x} and
+@var{y} are 0 or either or both are less than zero then behavior is undefined.
+@end table
+
+The following constants are available:
+@table @option
+@item PI
+area of the unit disc, approximately 3.14
+@item E
+exp(1) (Euler's number), approximately 2.718
+@item PHI
+golden ratio (1+sqrt(5))/2, approximately 1.618
+@end table
+
+Note that:
+
+@code{*} works like AND
+
+@code{+} works like OR
+
+thus
+@example
+if A then B else C
+@end example
+is equivalent to
+@example
+A*B + not(A)*C
+@end example
+
+In your C code, you can extend the list of unary and binary functions,
+and define recognized constants, so that they are available for your
+expressions.
+
+The evaluator also recognizes the International System number
+postfixes. If 'i' is appended after the postfix, powers of 2 are used
+instead of powers of 10. The 'B' postfix multiplies the value for 8,
+and can be appended after another postfix or used alone. This allows
+using for example 'KB', 'MiB', 'G' and 'B' as postfix.
+
+Follows the list of available International System postfixes, with
+indication of the corresponding powers of 10 and of 2.
+@table @option
+@item y
+-24 / -80
+@item z
+-21 / -70
+@item a
+-18 / -60
+@item f
+-15 / -50
+@item p
+-12 / -40
+@item n
+-9 / -30
+@item u
+-6 / -20
+@item m
+-3 / -10
+@item c
+-2
+@item d
+-1
+@item h
+2
+@item k
+3 / 10
+@item K
+3 / 10
+@item M
+6 / 20
+@item G
+9 / 30
+@item T
+12 / 40
+@item P
+15 / 40
+@item E
+18 / 50
+@item Z
+21 / 60
+@item Y
+24 / 70
+@end table
+
+@c man end
--- a/doc/examples/.gitignore
+++ b/doc/examples/.gitignore
@@ -1,24 +0,0 @@
-/avio_dir_cmd
-/avio_reading
-/decode_audio
-/decode_video
-/demuxing_decoding
-/encode_audio
-/encode_video
-/extract_mvs
-/filter_audio
-/filtering_audio
-/filtering_video
-/http_multiclient
-/hw_decode
-/metadata
-/muxing
-/pc-uninstalled
-/qsvdec
-/remuxing
-/resampling_audio
-/scaling_video
-/transcode_aac
-/transcoding
-/vaapi_encode
-/vaapi_transcode
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -1,64 +1,21 @@
-EXAMPLES-$(CONFIG_AVIO_DIR_CMD_EXAMPLE)      += avio_dir_cmd
-EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE)      += avio_reading
-EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE)      += decode_audio
-EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE)      += decode_video
-EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
-EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE)      += encode_audio
-EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE)      += encode_video
-EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE)       += extract_mvs
-EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)      += filter_audio
-EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE)   += filtering_audio
-EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE)   += filtering_video
-EXAMPLES-$(CONFIG_HTTP_MULTICLIENT_EXAMPLE)  += http_multiclient
-EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE)         += hw_decode
-EXAMPLES-$(CONFIG_METADATA_EXAMPLE)          += metadata
-EXAMPLES-$(CONFIG_MUXING_EXAMPLE)            += muxing
-EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE)            += qsvdec
-EXAMPLES-$(CONFIG_REMUXING_EXAMPLE)          += remuxing
-EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE)  += resampling_audio
-EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE)     += scaling_video
-EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)     += transcode_aac
-EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE)       += transcoding
-EXAMPLES-$(CONFIG_VAAPI_ENCODE_EXAMPLE)      += vaapi_encode
-EXAMPLES-$(CONFIG_VAAPI_TRANSCODE_EXAMPLE)   += vaapi_transcode
+# use pkg-config for getting CFLAGS abd LDFLAGS
+FFMPEG_LIBS=libavdevice libavformat libavfilter libavcodec libswscale libavutil
+CFLAGS+=$(shell pkg-config  --cflags $(FFMPEG_LIBS))
+LDFLAGS+=$(shell pkg-config --libs $(FFMPEG_LIBS))

-EXAMPLES       := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF))
-EXAMPLES_G     := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))
-ALL_EXAMPLES   := $(EXAMPLES) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF))
-ALL_EXAMPLES_G := $(EXAMPLES_G) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))
-PROGS          += $(EXAMPLES)
+EXAMPLES=decoding_encoding filtering metadata muxing

-EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile
-EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README $(EXAMPLE_MAKEFILE)
+OBJS=$(addsuffix .o,$(EXAMPLES))

-$(foreach P,$(EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o))
-$(EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o
+%: %.o
+	$(CC) $< $(LDFLAGS) -o $@

-examples: $(EXAMPLES)
+%.o: %.c
+	$(CC) $< $(CFLAGS) -c -o $@

-$(EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.o): | doc/examples
-OUTDIRS += doc/examples
+.phony: all clean

-DOXY_INPUT += $(EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.c)
+all: $(OBJS) $(EXAMPLES)

-install: install-examples
-
-install-examples: $(EXAMPLES_FILES)
-	$(Q)mkdir -p "$(DATADIR)/examples"
-	$(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
-	$(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile"
-
-uninstall: uninstall-examples
-
-uninstall-examples:
-	$(RM) -r "$(DATADIR)/examples"
-
-examplesclean:
-	$(RM) $(ALL_EXAMPLES) $(ALL_EXAMPLES_G)
-	$(RM) $(CLEANSUFFIXES:%=doc/examples/%)
-
-docclean:: examplesclean
-
-include $(wildcard $(EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.d))
-
-.PHONY: examples
+clean:
+	rm -rf $(EXAMPLES) $(OBJS)
--- a/doc/examples/Makefile.example
+++ b/doc/examples/Makefile.example
@@ -1,50 +0,0 @@
-# use pkg-config for getting CFLAGS and LDLIBS
-FFMPEG_LIBS=    libavdevice                        \
-                libavformat                        \
-                libavfilter                        \
-                libavcodec                         \
-                libswresample                      \
-                libswscale                         \
-                libavutil                          \
-
-CFLAGS += -Wall -g
-CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
-LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
-
-EXAMPLES=       avio_dir_cmd                       \
-                avio_reading                       \
-                decode_audio                       \
-                decode_video                       \
-                demuxing_decoding                  \
-                encode_audio                       \
-                encode_video                       \
-                extract_mvs                        \
-                filtering_video                    \
-                filtering_audio                    \
-                http_multiclient                   \
-                hw_decode                          \
-                metadata                           \
-                muxing                             \
-                remuxing                           \
-                resampling_audio                   \
-                scaling_video                      \
-                transcode_aac                      \
-                transcoding                        \
-
-OBJS=$(addsuffix .o,$(EXAMPLES))
-
-# the following examples make explicit use of the math library
-avcodec:           LDLIBS += -lm
-encode_audio:      LDLIBS += -lm
-muxing:            LDLIBS += -lm
-resampling_audio:  LDLIBS += -lm
-
-.phony: all clean-test clean
-
-all: $(OBJS) $(EXAMPLES)
-
-clean-test:
-	$(RM) test*.pgm test.h264 test.mp2 test.sw test.mpg
-
-clean: clean-test
-	$(RM) $(EXAMPLES) $(OBJS)
--- a/doc/examples/README
+++ b/doc/examples/README
@@ -1,23 +0,0 @@
-FFmpeg examples README
----------------------
-
-Both following use cases rely on pkg-config and make, thus make sure
-that you have them installed and working on your system.
-
-
-Method 1: build the installed examples in a generic read/write user directory
-
-Copy to a read/write user directory and just use "make", it will link
-to the libraries on your system, assuming the PKG_CONFIG_PATH is
-correctly configured.
-
-Method 2: build the examples in-tree
-
-Assuming you are in the source FFmpeg checkout directory, you need to build
-FFmpeg (no need to make install in any prefix). Then just run "make examples".
-This will build the examples using the FFmpeg build system. You can clean those
-examples using "make examplesclean"
-
-If you want to try the dedicated Makefile examples (to emulate the first
-method), go into doc/examples and run a command such as
-PKG_CONFIG_PATH=pc-uninstalled make.
--- a/doc/examples/avio_dir_cmd.c
+++ b/doc/examples/avio_dir_cmd.c
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2014 Lukasz Marek
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
-
-static const char *type_string(int type)
-{
-    switch (type) {
-    case AVIO_ENTRY_DIRECTORY:
-        return "<DIR>";
-    case AVIO_ENTRY_FILE:
-        return "<FILE>";
-    case AVIO_ENTRY_BLOCK_DEVICE:
-        return "<BLOCK DEVICE>";
-    case AVIO_ENTRY_CHARACTER_DEVICE:
-        return "<CHARACTER DEVICE>";
-    case AVIO_ENTRY_NAMED_PIPE:
-        return "<PIPE>";
-    case AVIO_ENTRY_SYMBOLIC_LINK:
-        return "<LINK>";
-    case AVIO_ENTRY_SOCKET:
-        return "<SOCKET>";
-    case AVIO_ENTRY_SERVER:
-        return "<SERVER>";
-    case AVIO_ENTRY_SHARE:
-        return "<SHARE>";
-    case AVIO_ENTRY_WORKGROUP:
-        return "<WORKGROUP>";
-    case AVIO_ENTRY_UNKNOWN:
-    default:
-        break;
-    }
-    return "<UNKNOWN>";
-}
-
-static int list_op(const char *input_dir)
-{
-    AVIODirEntry *entry = NULL;
-    AVIODirContext *ctx = NULL;
-    int cnt, ret;
-    char filemode[4], uid_and_gid[20];
-
-    if ((ret = avio_open_dir(&ctx, input_dir, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot open directory: %s.\n", av_err2str(ret));
-        goto fail;
-    }
-
-    cnt = 0;
-    for (;;) {
-        if ((ret = avio_read_dir(ctx, &entry)) < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Cannot list directory: %s.\n", av_err2str(ret));
-            goto fail;
-        }
-        if (!entry)
-            break;
-        if (entry->filemode == -1) {
-            snprintf(filemode, 4, "???");
-        } else {
-            snprintf(filemode, 4, "%3"PRIo64, entry->filemode);
-        }
-        snprintf(uid_and_gid, 20, "%"PRId64"(%"PRId64")", entry->user_id, entry->group_id);
-        if (cnt == 0)
-            av_log(NULL, AV_LOG_INFO, "%-9s %12s %30s %10s %s %16s %16s %16s\n",
-                   "TYPE", "SIZE", "NAME", "UID(GID)", "UGO", "MODIFIED",
-                   "ACCESSED", "STATUS_CHANGED");
-        av_log(NULL, AV_LOG_INFO, "%-9s %12"PRId64" %30s %10s %s %16"PRId64" %16"PRId64" %16"PRId64"\n",
-               type_string(entry->type),
-               entry->size,
-               entry->name,
-               uid_and_gid,
-               filemode,
-               entry->modification_timestamp,
-               entry->access_timestamp,
-               entry->status_change_timestamp);
-        avio_free_directory_entry(&entry);
-        cnt++;
-    };
-
-  fail:
-    avio_close_dir(&ctx);
-    return ret;
-}
-
-static int del_op(const char *url)
-{
-    int ret = avpriv_io_delete(url);
-    if (ret < 0)
-        av_log(NULL, AV_LOG_ERROR, "Cannot delete '%s': %s.\n", url, av_err2str(ret));
-    return ret;
-}
-
-static int move_op(const char *src, const char *dst)
-{
-    int ret = avpriv_io_move(src, dst);
-    if (ret < 0)
-        av_log(NULL, AV_LOG_ERROR, "Cannot move '%s' into '%s': %s.\n", src, dst, av_err2str(ret));
-    return ret;
-}
-
-
-static void usage(const char *program_name)
-{
-    fprintf(stderr, "usage: %s OPERATION entry1 [entry2]\n"
-            "API example program to show how to manipulate resources "
-            "accessed through AVIOContext.\n"
-            "OPERATIONS:\n"
-            "list      list content of the directory\n"
-            "move      rename content in directory\n"
-            "del       delete content in directory\n",
-            program_name);
-}
-
-int main(int argc, char *argv[])
-{
-    const char *op = NULL;
-    int ret;
-
-    av_log_set_level(AV_LOG_DEBUG);
-
-    if (argc < 2) {
-        usage(argv[0]);
-        return 1;
-    }
-
-    avformat_network_init();
-
-    op = argv[1];
-    if (strcmp(op, "list") == 0) {
-        if (argc < 3) {
-            av_log(NULL, AV_LOG_INFO, "Missing argument for list operation.\n");
-            ret = AVERROR(EINVAL);
-        } else {
-            ret = list_op(argv[2]);
-        }
-    } else if (strcmp(op, "del") == 0) {
-        if (argc < 3) {
-            av_log(NULL, AV_LOG_INFO, "Missing argument for del operation.\n");
-            ret = AVERROR(EINVAL);
-        } else {
-            ret = del_op(argv[2]);
-        }
-    } else if (strcmp(op, "move") == 0) {
-        if (argc < 4) {
-            av_log(NULL, AV_LOG_INFO, "Missing argument for move operation.\n");
-            ret = AVERROR(EINVAL);
-        } else {
-            ret = move_op(argv[2], argv[3]);
-        }
-    } else {
-        av_log(NULL, AV_LOG_INFO, "Invalid operation %s\n", op);
-        ret = AVERROR(EINVAL);
-    }
-
-    avformat_network_deinit();
-
-    return ret < 0 ? 1 : 0;
-}
--- a/doc/examples/avio_reading.c
+++ b/doc/examples/avio_reading.c
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2014 Stefano Sabatini
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * libavformat AVIOContext API example.
- *
- * Make libavformat demuxer access media content through a custom
- * AVIOContext read callback.
- * @example avio_reading.c
- */
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
-#include <libavutil/file.h>
-
-struct buffer_data {
-    uint8_t *ptr;
-    size_t size; ///< size left in the buffer
-};
-
-static int read_packet(void *opaque, uint8_t *buf, int buf_size)
-{
-    struct buffer_data *bd = (struct buffer_data *)opaque;
-    buf_size = FFMIN(buf_size, bd->size);
-
-    if (!buf_size)
-        return AVERROR_EOF;
-    printf("ptr:%p size:%zu\n", bd->ptr, bd->size);
-
-    /* copy internal buffer data to buf */
-    memcpy(buf, bd->ptr, buf_size);
-    bd->ptr  += buf_size;
-    bd->size -= buf_size;
-
-    return buf_size;
-}
-
-int main(int argc, char *argv[])
-{
-    AVFormatContext *fmt_ctx = NULL;
-    AVIOContext *avio_ctx = NULL;
-    uint8_t *buffer = NULL, *avio_ctx_buffer = NULL;
-    size_t buffer_size, avio_ctx_buffer_size = 4096;
-    char *input_filename = NULL;
-    int ret = 0;
-    struct buffer_data bd = { 0 };
-
-    if (argc != 2) {
-        fprintf(stderr, "usage: %s input_file\n"
-                "API example program to show how to read from a custom buffer "
-                "accessed through AVIOContext.\n", argv[0]);
-        return 1;
-    }
-    input_filename = argv[1];
-
-    /* slurp file content into buffer */
-    ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL);
-    if (ret < 0)
-        goto end;
-
-    /* fill opaque structure used by the AVIOContext read callback */
-    bd.ptr  = buffer;
-    bd.size = buffer_size;
-
-    if (!(fmt_ctx = avformat_alloc_context())) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    avio_ctx_buffer = av_malloc(avio_ctx_buffer_size);
-    if (!avio_ctx_buffer) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-    avio_ctx = avio_alloc_context(avio_ctx_buffer, avio_ctx_buffer_size,
-                                  0, &bd, &read_packet, NULL, NULL);
-    if (!avio_ctx) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-    fmt_ctx->pb = avio_ctx;
-
-    ret = avformat_open_input(&fmt_ctx, NULL, NULL, NULL);
-    if (ret < 0) {
-        fprintf(stderr, "Could not open input\n");
-        goto end;
-    }
-
-    ret = avformat_find_stream_info(fmt_ctx, NULL);
-    if (ret < 0) {
-        fprintf(stderr, "Could not find stream information\n");
-        goto end;
-    }
-
-    av_dump_format(fmt_ctx, 0, input_filename, 0);
-
-end:
-    avformat_close_input(&fmt_ctx);
-
-    /* note: the internal buffer could have changed, and be != avio_ctx_buffer */
-    if (avio_ctx)
-        av_freep(&avio_ctx->buffer);
-    avio_context_free(&avio_ctx);
-
-    av_file_unmap(buffer, buffer_size);
-
-    if (ret < 0) {
-        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
-        return 1;
-    }
-
-    return 0;
-}
--- a/doc/examples/decode_audio.c
+++ b/doc/examples/decode_audio.c
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2001 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * audio decoding with libavcodec API example
- *
- * @example decode_audio.c
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libavutil/frame.h>
-#include <libavutil/mem.h>
-
-#include <libavcodec/avcodec.h>
-
-#define AUDIO_INBUF_SIZE 20480
-#define AUDIO_REFILL_THRESH 4096
-
-static void decode(AVCodecContext *dec_ctx, AVPacket *pkt, AVFrame *frame,
-                   FILE *outfile)
-{
-    int i, ch;
-    int ret, data_size;
-
-    /* send the packet with the compressed data to the decoder */
-    ret = avcodec_send_packet(dec_ctx, pkt);
-    if (ret < 0) {
-        fprintf(stderr, "Error submitting the packet to the decoder\n");
-        exit(1);
-    }
-
-    /* read all the output frames (in general there may be any number of them */
-    while (ret >= 0) {
-        ret = avcodec_receive_frame(dec_ctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-            return;
-        else if (ret < 0) {
-            fprintf(stderr, "Error during decoding\n");
-            exit(1);
-        }
-        data_size = av_get_bytes_per_sample(dec_ctx->sample_fmt);
-        if (data_size < 0) {
-            /* This should not occur, checking just for paranoia */
-            fprintf(stderr, "Failed to calculate data size\n");
-            exit(1);
-        }
-        for (i = 0; i < frame->nb_samples; i++)
-            for (ch = 0; ch < dec_ctx->channels; ch++)
-                fwrite(frame->data[ch] + data_size*i, 1, data_size, outfile);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    const char *outfilename, *filename;
-    const AVCodec *codec;
-    AVCodecContext *c= NULL;
-    AVCodecParserContext *parser = NULL;
-    int len, ret;
-    FILE *f, *outfile;
-    uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
-    uint8_t *data;
-    size_t   data_size;
-    AVPacket *pkt;
-    AVFrame *decoded_frame = NULL;
-
-    if (argc <= 2) {
-        fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]);
-        exit(0);
-    }
-    filename    = argv[1];
-    outfilename = argv[2];
-
-    pkt = av_packet_alloc();
-
-    /* find the MPEG audio decoder */
-    codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    parser = av_parser_init(codec->id);
-    if (!parser) {
-        fprintf(stderr, "Parser not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate audio codec context\n");
-        exit(1);
-    }
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "rb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-    outfile = fopen(outfilename, "wb");
-    if (!outfile) {
-        av_free(c);
-        exit(1);
-    }
-
-    /* decode until eof */
-    data      = inbuf;
-    data_size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f);
-
-    while (data_size > 0) {
-        if (!decoded_frame) {
-            if (!(decoded_frame = av_frame_alloc())) {
-                fprintf(stderr, "Could not allocate audio frame\n");
-                exit(1);
-            }
-        }
-
-        ret = av_parser_parse2(parser, c, &pkt->data, &pkt->size,
-                               data, data_size,
-                               AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0);
-        if (ret < 0) {
-            fprintf(stderr, "Error while parsing\n");
-            exit(1);
-        }
-        data      += ret;
-        data_size -= ret;
-
-        if (pkt->size)
-            decode(c, pkt, decoded_frame, outfile);
-
-        if (data_size < AUDIO_REFILL_THRESH) {
-            memmove(inbuf, data, data_size);
-            data = inbuf;
-            len = fread(data + data_size, 1,
-                        AUDIO_INBUF_SIZE - data_size, f);
-            if (len > 0)
-                data_size += len;
-        }
-    }
-
-    /* flush the decoder */
-    pkt->data = NULL;
-    pkt->size = 0;
-    decode(c, pkt, decoded_frame, outfile);
-
-    fclose(outfile);
-    fclose(f);
-
-    avcodec_free_context(&c);
-    av_parser_close(parser);
-    av_frame_free(&decoded_frame);
-    av_packet_free(&pkt);
-
-    return 0;
-}
--- a/doc/examples/decode_video.c
+++ b/doc/examples/decode_video.c
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2001 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * video decoding with libavcodec API example
- *
- * @example decode_video.c
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libavcodec/avcodec.h>
-
-#define INBUF_SIZE 4096
-
-static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,
-                     char *filename)
-{
-    FILE *f;
-    int i;
-
-    f = fopen(filename,"w");
-    fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255);
-    for (i = 0; i < ysize; i++)
-        fwrite(buf + i * wrap, 1, xsize, f);
-    fclose(f);
-}
-
-static void decode(AVCodecContext *dec_ctx, AVFrame *frame, AVPacket *pkt,
-                   const char *filename)
-{
-    char buf[1024];
-    int ret;
-
-    ret = avcodec_send_packet(dec_ctx, pkt);
-    if (ret < 0) {
-        fprintf(stderr, "Error sending a packet for decoding\n");
-        exit(1);
-    }
-
-    while (ret >= 0) {
-        ret = avcodec_receive_frame(dec_ctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-            return;
-        else if (ret < 0) {
-            fprintf(stderr, "Error during decoding\n");
-            exit(1);
-        }
-
-        printf("saving frame %3d\n", dec_ctx->frame_number);
-        fflush(stdout);
-
-        /* the picture is allocated by the decoder. no need to
-           free it */
-        snprintf(buf, sizeof(buf), "%s-%d", filename, dec_ctx->frame_number);
-        pgm_save(frame->data[0], frame->linesize[0],
-                 frame->width, frame->height, buf);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    const char *filename, *outfilename;
-    const AVCodec *codec;
-    AVCodecParserContext *parser;
-    AVCodecContext *c= NULL;
-    FILE *f;
-    AVFrame *frame;
-    uint8_t inbuf[INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
-    uint8_t *data;
-    size_t   data_size;
-    int ret;
-    AVPacket *pkt;
-
-    if (argc <= 2) {
-        fprintf(stderr, "Usage: %s <input file> <output file>\n", argv[0]);
-        exit(0);
-    }
-    filename    = argv[1];
-    outfilename = argv[2];
-
-    pkt = av_packet_alloc();
-    if (!pkt)
-        exit(1);
-
-    /* set end of buffer to 0 (this ensures that no overreading happens for damaged MPEG streams) */
-    memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-
-    /* find the MPEG-1 video decoder */
-    codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    parser = av_parser_init(codec->id);
-    if (!parser) {
-        fprintf(stderr, "parser not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate video codec context\n");
-        exit(1);
-    }
-
-    /* For some codecs, such as msmpeg4 and mpeg4, width and height
-       MUST be initialized there because this information is not
-       available in the bitstream. */
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "rb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    frame = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate video frame\n");
-        exit(1);
-    }
-
-    while (!feof(f)) {
-        /* read raw data from the input file */
-        data_size = fread(inbuf, 1, INBUF_SIZE, f);
-        if (!data_size)
-            break;
-
-        /* use the parser to split the data into frames */
-        data = inbuf;
-        while (data_size > 0) {
-            ret = av_parser_parse2(parser, c, &pkt->data, &pkt->size,
-                                   data, data_size, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0);
-            if (ret < 0) {
-                fprintf(stderr, "Error while parsing\n");
-                exit(1);
-            }
-            data      += ret;
-            data_size -= ret;
-
-            if (pkt->size)
-                decode(c, frame, pkt, outfilename);
-        }
-    }
-
-    /* flush the decoder */
-    decode(c, frame, NULL, outfilename);
-
-    fclose(f);
-
-    av_parser_close(parser);
-    avcodec_free_context(&c);
-    av_frame_free(&frame);
-    av_packet_free(&pkt);
-
-    return 0;
-}
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/decoding_encoding.c
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 2001 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * libavcodec API use example.
+ *
+ * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
+ * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
+ * format handling
+ */
+
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+#include "libavcodec/avcodec.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/samplefmt.h"
+
+#define INBUF_SIZE 4096
+#define AUDIO_INBUF_SIZE 20480
+#define AUDIO_REFILL_THRESH 4096
+
+/*
+ * Audio encoding example
+ */
+static void audio_encode_example(const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int frame_size, i, j, out_size, outbuf_size;
+    FILE *f;
+    short *samples;
+    float t, tincr;
+    uint8_t *outbuf;
+
+    printf("Audio encoding\n");
+
+    /* find the MP2 encoder */
+    codec = avcodec_find_encoder(CODEC_ID_MP2);
+    if (!codec) {
+        fprintf(stderr, "codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+
+    /* put sample parameters */
+    c->bit_rate = 64000;
+    c->sample_rate = 44100;
+    c->channels = 2;
+    c->sample_fmt = AV_SAMPLE_FMT_S16;
+
+    /* open it */
+    if (avcodec_open(c, codec) < 0) {
+        fprintf(stderr, "could not open codec\n");
+        exit(1);
+    }
+
+    /* the codec gives us the frame size, in samples */
+    frame_size = c->frame_size;
+    samples = malloc(frame_size * 2 * c->channels);
+    outbuf_size = 10000;
+    outbuf = malloc(outbuf_size);
+
+    f = fopen(filename, "wb");
+    if (!f) {
+        fprintf(stderr, "could not open %s\n", filename);
+        exit(1);
+    }
+
+    /* encode a single tone sound */
+    t = 0;
+    tincr = 2 * M_PI * 440.0 / c->sample_rate;
+    for(i=0;i<200;i++) {
+        for(j=0;j<frame_size;j++) {
+            samples[2*j] = (int)(sin(t) * 10000);
+            samples[2*j+1] = samples[2*j];
+            t += tincr;
+        }
+        /* encode the samples */
+        out_size = avcodec_encode_audio(c, outbuf, outbuf_size, samples);
+        fwrite(outbuf, 1, out_size, f);
+    }
+    fclose(f);
+    free(outbuf);
+    free(samples);
+
+    avcodec_close(c);
+    av_free(c);
+}
+
+/*
+ * Audio decoding.
+ */
+static void audio_decode_example(const char *outfilename, const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int len;
+    FILE *f, *outfile;
+    uint8_t inbuf[AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+    AVPacket avpkt;
+    AVFrame *decoded_frame = NULL;
+
+    av_init_packet(&avpkt);
+
+    printf("Audio decoding\n");
+
+    /* find the mpeg audio decoder */
+    codec = avcodec_find_decoder(CODEC_ID_MP2);
+    if (!codec) {
+        fprintf(stderr, "codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+
+    /* open it */
+    if (avcodec_open(c, codec) < 0) {
+        fprintf(stderr, "could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "rb");
+    if (!f) {
+        fprintf(stderr, "could not open %s\n", filename);
+        exit(1);
+    }
+    outfile = fopen(outfilename, "wb");
+    if (!outfile) {
+        av_free(c);
+        exit(1);
+    }
+
+    /* decode until eof */
+    avpkt.data = inbuf;
+    avpkt.size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f);
+
+    while (avpkt.size > 0) {
+        int got_frame = 0;
+
+        if (!decoded_frame) {
+            if (!(decoded_frame = avcodec_alloc_frame())) {
+                fprintf(stderr, "out of memory\n");
+                exit(1);
+            }
+        } else
+            avcodec_get_frame_defaults(decoded_frame);
+
+        len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
+        if (len < 0) {
+            fprintf(stderr, "Error while decoding\n");
+            exit(1);
+        }
+        if (got_frame) {
+            /* if a frame has been decoded, output it */
+            int data_size = av_samples_get_buffer_size(NULL, c->channels,
+                                                       decoded_frame->nb_samples,
+                                                       c->sample_fmt, 1);
+            fwrite(decoded_frame->data[0], 1, data_size, outfile);
+        }
+        avpkt.size -= len;
+        avpkt.data += len;
+        avpkt.dts =
+        avpkt.pts = AV_NOPTS_VALUE;
+        if (avpkt.size < AUDIO_REFILL_THRESH) {
+            /* Refill the input buffer, to avoid trying to decode
+             * incomplete frames. Instead of this, one could also use
+             * a parser, or use a proper container format through
+             * libavformat. */
+            memmove(inbuf, avpkt.data, avpkt.size);
+            avpkt.data = inbuf;
+            len = fread(avpkt.data + avpkt.size, 1,
+                        AUDIO_INBUF_SIZE - avpkt.size, f);
+            if (len > 0)
+                avpkt.size += len;
+        }
+    }
+
+    fclose(outfile);
+    fclose(f);
+
+    avcodec_close(c);
+    av_free(c);
+    av_free(decoded_frame);
+}
+
+/*
+ * Video encoding example
+ */
+static void video_encode_example(const char *filename, int codec_id)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int i, out_size, size, x, y, outbuf_size;
+    FILE *f;
+    AVFrame *picture;
+    uint8_t *outbuf;
+
+    printf("Video encoding\n");
+
+    /* find the mpeg1 video encoder */
+    codec = avcodec_find_encoder(codec_id);
+    if (!codec) {
+        fprintf(stderr, "codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    picture= avcodec_alloc_frame();
+
+    /* put sample parameters */
+    c->bit_rate = 400000;
+    /* resolution must be a multiple of two */
+    c->width = 352;
+    c->height = 288;
+    /* frames per second */
+    c->time_base= (AVRational){1,25};
+    c->gop_size = 10; /* emit one intra frame every ten frames */
+    c->max_b_frames=1;
+    c->pix_fmt = PIX_FMT_YUV420P;
+
+    if(codec_id == CODEC_ID_H264)
+        av_opt_set(c->priv_data, "preset", "slow", 0);
+
+    /* open it */
+    if (avcodec_open(c, codec) < 0) {
+        fprintf(stderr, "could not open codec\n");
+        exit(1);
+    }
+
+    f = fopen(filename, "wb");
+    if (!f) {
+        fprintf(stderr, "could not open %s\n", filename);
+        exit(1);
+    }
+
+    /* alloc image and output buffer */
+    outbuf_size = 100000;
+    outbuf = malloc(outbuf_size);
+
+    /* the image can be allocated by any means and av_image_alloc() is
+     * just the most convenient way if av_malloc() is to be used */
+    av_image_alloc(picture->data, picture->linesize,
+                   c->width, c->height, c->pix_fmt, 1);
+
+    /* encode 1 second of video */
+    for(i=0;i<25;i++) {
+        fflush(stdout);
+        /* prepare a dummy image */
+        /* Y */
+        for(y=0;y<c->height;y++) {
+            for(x=0;x<c->width;x++) {
+                picture->data[0][y * picture->linesize[0] + x] = x + y + i * 3;
+            }
+        }
+
+        /* Cb and Cr */
+        for(y=0;y<c->height/2;y++) {
+            for(x=0;x<c->width/2;x++) {
+                picture->data[1][y * picture->linesize[1] + x] = 128 + y + i * 2;
+                picture->data[2][y * picture->linesize[2] + x] = 64 + x + i * 5;
+            }
+        }
+
+        /* encode the image */
+        out_size = avcodec_encode_video(c, outbuf, outbuf_size, picture);
+        printf("encoding frame %3d (size=%5d)\n", i, out_size);
+        fwrite(outbuf, 1, out_size, f);
+    }
+
+    /* get the delayed frames */
+    for(; out_size; i++) {
+        fflush(stdout);
+
+        out_size = avcodec_encode_video(c, outbuf, outbuf_size, NULL);
+        printf("write frame %3d (size=%5d)\n", i, out_size);
+        fwrite(outbuf, 1, out_size, f);
+    }
+
+    /* add sequence end code to have a real mpeg file */
+    outbuf[0] = 0x00;
+    outbuf[1] = 0x00;
+    outbuf[2] = 0x01;
+    outbuf[3] = 0xb7;
+    fwrite(outbuf, 1, 4, f);
+    fclose(f);
+    free(outbuf);
+
+    avcodec_close(c);
+    av_free(c);
+    av_free(picture->data[0]);
+    av_free(picture);
+    printf("\n");
+}
+
+/*
+ * Video decoding example
+ */
+
+static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,
+                     char *filename)
+{
+    FILE *f;
+    int i;
+
+    f=fopen(filename,"w");
+    fprintf(f,"P5\n%d %d\n%d\n",xsize,ysize,255);
+    for(i=0;i<ysize;i++)
+        fwrite(buf + i * wrap,1,xsize,f);
+    fclose(f);
+}
+
+static void video_decode_example(const char *outfilename, const char *filename)
+{
+    AVCodec *codec;
+    AVCodecContext *c= NULL;
+    int frame, got_picture, len;
+    FILE *f;
+    AVFrame *picture;
+    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+    char buf[1024];
+    AVPacket avpkt;
+
+    av_init_packet(&avpkt);
+
+    /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */
+    memset(inbuf + INBUF_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+    printf("Video decoding\n");
+
+    /* find the mpeg1 video decoder */
+    codec = avcodec_find_decoder(CODEC_ID_MPEG1VIDEO);
+    if (!codec) {
+        fprintf(stderr, "codec not found\n");
+        exit(1);
+    }
+
+    c = avcodec_alloc_context3(codec);
+    picture= avcodec_alloc_frame();
+
+    if(codec->capabilities&CODEC_CAP_TRUNCATED)
+        c->flags|= CODEC_FLAG_TRUNCATED; /* we do not send complete frames */
+
+    /* For some codecs, such as msmpeg4 and mpeg4, width and height
+       MUST be initialized there because this information is not
+       available in the bitstream. */
+
+    /* open it */
+    if (avcodec_open(c, codec) < 0) {
+        fprintf(stderr, "could not open codec\n");
+        exit(1);
+    }
+
+    /* the codec gives us the frame size, in samples */
+
+    f = fopen(filename, "rb");
+    if (!f) {
+        fprintf(stderr, "could not open %s\n", filename);
+        exit(1);
+    }
+
+    frame = 0;
+    for(;;) {
+        avpkt.size = fread(inbuf, 1, INBUF_SIZE, f);
+        if (avpkt.size == 0)
+            break;
+
+        /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio)
+           and this is the only method to use them because you cannot
+           know the compressed data size before analysing it.
+
+           BUT some other codecs (msmpeg4, mpeg4) are inherently frame
+           based, so you must call them with all the data for one
+           frame exactly. You must also initialize 'width' and
+           'height' before initializing them. */
+
+        /* NOTE2: some codecs allow the raw parameters (frame size,
+           sample rate) to be changed at any frame. We handle this, so
+           you should also take care of it */
+
+        /* here, we use a stream based decoder (mpeg1video), so we
+           feed decoder and see if it could decode a frame */
+        avpkt.data = inbuf;
+        while (avpkt.size > 0) {
+            len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
+            if (len < 0) {
+                fprintf(stderr, "Error while decoding frame %d\n", frame);
+                exit(1);
+            }
+            if (got_picture) {
+                printf("saving frame %3d\n", frame);
+                fflush(stdout);
+
+                /* the picture is allocated by the decoder. no need to
+                   free it */
+                snprintf(buf, sizeof(buf), outfilename, frame);
+                pgm_save(picture->data[0], picture->linesize[0],
+                         c->width, c->height, buf);
+                frame++;
+            }
+            avpkt.size -= len;
+            avpkt.data += len;
+        }
+    }
+
+    /* some codecs, such as MPEG, transmit the I and P frame with a
+       latency of one frame. You must do the following to have a
+       chance to get the last frame of the video */
+    avpkt.data = NULL;
+    avpkt.size = 0;
+    len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
+    if (got_picture) {
+        printf("saving last frame %3d\n", frame);
+        fflush(stdout);
+
+        /* the picture is allocated by the decoder. no need to
+           free it */
+        snprintf(buf, sizeof(buf), outfilename, frame);
+        pgm_save(picture->data[0], picture->linesize[0],
+                 c->width, c->height, buf);
+        frame++;
+    }
+
+    fclose(f);
+
+    avcodec_close(c);
+    av_free(c);
+    av_free(picture);
+    printf("\n");
+}
+
+int main(int argc, char **argv)
+{
+    const char *filename;
+
+    /* must be called before using avcodec lib */
+    avcodec_init();
+
+    /* register all the codecs */
+    avcodec_register_all();
+
+    if (argc <= 1) {
+        audio_encode_example("/tmp/test.mp2");
+        audio_decode_example("/tmp/test.sw", "/tmp/test.mp2");
+
+        video_encode_example("/tmp/test.h264", CODEC_ID_H264);
+        video_encode_example("/tmp/test.mpg", CODEC_ID_MPEG1VIDEO);
+        filename = "/tmp/test.mpg";
+    } else {
+        filename = argv[1];
+    }
+
+    //    audio_decode_example("/tmp/test.sw", filename);
+    video_decode_example("/tmp/test%d.pgm", filename);
+
+    return 0;
+}
--- a/doc/examples/demuxing_decoding.c
+++ b/doc/examples/demuxing_decoding.c
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2012 Stefano Sabatini
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * Demuxing and decoding example.
- *
- * Show how to use the libavformat and libavcodec API to demux and
- * decode audio and video data.
- * @example demuxing_decoding.c
- */
-
-#include <libavutil/imgutils.h>
-#include <libavutil/samplefmt.h>
-#include <libavutil/timestamp.h>
-#include <libavformat/avformat.h>
-
-static AVFormatContext *fmt_ctx = NULL;
-static AVCodecContext *video_dec_ctx = NULL, *audio_dec_ctx;
-static int width, height;
-static enum AVPixelFormat pix_fmt;
-static AVStream *video_stream = NULL, *audio_stream = NULL;
-static const char *src_filename = NULL;
-static const char *video_dst_filename = NULL;
-static const char *audio_dst_filename = NULL;
-static FILE *video_dst_file = NULL;
-static FILE *audio_dst_file = NULL;
-
-static uint8_t *video_dst_data[4] = {NULL};
-static int      video_dst_linesize[4];
-static int video_dst_bufsize;
-
-static int video_stream_idx = -1, audio_stream_idx = -1;
-static AVFrame *frame = NULL;
-static AVPacket pkt;
-static int video_frame_count = 0;
-static int audio_frame_count = 0;
-
-/* Enable or disable frame reference counting. You are not supposed to support
- * both paths in your application but pick the one most appropriate to your
- * needs. Look for the use of refcount in this example to see what are the
- * differences of API usage between them. */
-static int refcount = 0;
-
-static int decode_packet(int *got_frame, int cached)
-{
-    int ret = 0;
-    int decoded = pkt.size;
-
-    *got_frame = 0;
-
-    if (pkt.stream_index == video_stream_idx) {
-        /* decode video frame */
-        ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt);
-        if (ret < 0) {
-            fprintf(stderr, "Error decoding video frame (%s)\n", av_err2str(ret));
-            return ret;
-        }
-
-        if (*got_frame) {
-
-            if (frame->width != width || frame->height != height ||
-                frame->format != pix_fmt) {
-                /* To handle this change, one could call av_image_alloc again and
-                 * decode the following frames into another rawvideo file. */
-                fprintf(stderr, "Error: Width, height and pixel format have to be "
-                        "constant in a rawvideo file, but the width, height or "
-                        "pixel format of the input video changed:\n"
-                        "old: width = %d, height = %d, format = %s\n"
-                        "new: width = %d, height = %d, format = %s\n",
-                        width, height, av_get_pix_fmt_name(pix_fmt),
-                        frame->width, frame->height,
-                        av_get_pix_fmt_name(frame->format));
-                return -1;
-            }
-
-            printf("video_frame%s n:%d coded_n:%d\n",
-                   cached ? "(cached)" : "",
-                   video_frame_count++, frame->coded_picture_number);
-
-            /* copy decoded frame to destination buffer:
-             * this is required since rawvideo expects non aligned data */
-            av_image_copy(video_dst_data, video_dst_linesize,
-                          (const uint8_t **)(frame->data), frame->linesize,
-                          pix_fmt, width, height);
-
-            /* write to rawvideo file */
-            fwrite(video_dst_data[0], 1, video_dst_bufsize, video_dst_file);
-        }
-    } else if (pkt.stream_index == audio_stream_idx) {
-        /* decode audio frame */
-        ret = avcodec_decode_audio4(audio_dec_ctx, frame, got_frame, &pkt);
-        if (ret < 0) {
-            fprintf(stderr, "Error decoding audio frame (%s)\n", av_err2str(ret));
-            return ret;
-        }
-        /* Some audio decoders decode only part of the packet, and have to be
-         * called again with the remainder of the packet data.
-         * Sample: fate-suite/lossless-audio/luckynight-partial.shn
-         * Also, some decoders might over-read the packet. */
-        decoded = FFMIN(ret, pkt.size);
-
-        if (*got_frame) {
-            size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample(frame->format);
-            printf("audio_frame%s n:%d nb_samples:%d pts:%s\n",
-                   cached ? "(cached)" : "",
-                   audio_frame_count++, frame->nb_samples,
-                   av_ts2timestr(frame->pts, &audio_dec_ctx->time_base));
-
-            /* Write the raw audio data samples of the first plane. This works
-             * fine for packed formats (e.g. AV_SAMPLE_FMT_S16). However,
-             * most audio decoders output planar audio, which uses a separate
-             * plane of audio samples for each channel (e.g. AV_SAMPLE_FMT_S16P).
-             * In other words, this code will write only the first audio channel
-             * in these cases.
-             * You should use libswresample or libavfilter to convert the frame
-             * to packed data. */
-            fwrite(frame->extended_data[0], 1, unpadded_linesize, audio_dst_file);
-        }
-    }
-
-    /* If we use frame reference counting, we own the data and need
-     * to de-reference it when we don't use it anymore */
-    if (*got_frame && refcount)
-        av_frame_unref(frame);
-
-    return decoded;
-}
-
-static int open_codec_context(int *stream_idx,
-                              AVCodecContext **dec_ctx, AVFormatContext *fmt_ctx, enum AVMediaType type)
-{
-    int ret, stream_index;
-    AVStream *st;
-    AVCodec *dec = NULL;
-    AVDictionary *opts = NULL;
-
-    ret = av_find_best_stream(fmt_ctx, type, -1, -1, NULL, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not find %s stream in input file '%s'\n",
-                av_get_media_type_string(type), src_filename);
-        return ret;
-    } else {
-        stream_index = ret;
-        st = fmt_ctx->streams[stream_index];
-
-        /* find decoder for the stream */
-        dec = avcodec_find_decoder(st->codecpar->codec_id);
-        if (!dec) {
-            fprintf(stderr, "Failed to find %s codec\n",
-                    av_get_media_type_string(type));
-            return AVERROR(EINVAL);
-        }
-
-        /* Allocate a codec context for the decoder */
-        *dec_ctx = avcodec_alloc_context3(dec);
-        if (!*dec_ctx) {
-            fprintf(stderr, "Failed to allocate the %s codec context\n",
-                    av_get_media_type_string(type));
-            return AVERROR(ENOMEM);
-        }
-
-        /* Copy codec parameters from input stream to output codec context */
-        if ((ret = avcodec_parameters_to_context(*dec_ctx, st->codecpar)) < 0) {
-            fprintf(stderr, "Failed to copy %s codec parameters to decoder context\n",
-                    av_get_media_type_string(type));
-            return ret;
-        }
-
-        /* Init the decoders, with or without reference counting */
-        av_dict_set(&opts, "refcounted_frames", refcount ? "1" : "0", 0);
-        if ((ret = avcodec_open2(*dec_ctx, dec, &opts)) < 0) {
-            fprintf(stderr, "Failed to open %s codec\n",
-                    av_get_media_type_string(type));
-            return ret;
-        }
-        *stream_idx = stream_index;
-    }
-
-    return 0;
-}
-
-static int get_format_from_sample_fmt(const char **fmt,
-                                      enum AVSampleFormat sample_fmt)
-{
-    int i;
-    struct sample_fmt_entry {
-        enum AVSampleFormat sample_fmt; const char *fmt_be, *fmt_le;
-    } sample_fmt_entries[] = {
-        { AV_SAMPLE_FMT_U8,  "u8",    "u8"    },
-        { AV_SAMPLE_FMT_S16, "s16be", "s16le" },
-        { AV_SAMPLE_FMT_S32, "s32be", "s32le" },
-        { AV_SAMPLE_FMT_FLT, "f32be", "f32le" },
-        { AV_SAMPLE_FMT_DBL, "f64be", "f64le" },
-    };
-    *fmt = NULL;
-
-    for (i = 0; i < FF_ARRAY_ELEMS(sample_fmt_entries); i++) {
-        struct sample_fmt_entry *entry = &sample_fmt_entries[i];
-        if (sample_fmt == entry->sample_fmt) {
-            *fmt = AV_NE(entry->fmt_be, entry->fmt_le);
-            return 0;
-        }
-    }
-
-    fprintf(stderr,
-            "sample format %s is not supported as output format\n",
-            av_get_sample_fmt_name(sample_fmt));
-    return -1;
-}
-
-int main (int argc, char **argv)
-{
-    int ret = 0, got_frame;
-
-    if (argc != 4 && argc != 5) {
-        fprintf(stderr, "usage: %s [-refcount] input_file video_output_file audio_output_file\n"
-                "API example program to show how to read frames from an input file.\n"
-                "This program reads frames from a file, decodes them, and writes decoded\n"
-                "video frames to a rawvideo file named video_output_file, and decoded\n"
-                "audio frames to a rawaudio file named audio_output_file.\n\n"
-                "If the -refcount option is specified, the program use the\n"
-                "reference counting frame system which allows keeping a copy of\n"
-                "the data for longer than one decode call.\n"
-                "\n", argv[0]);
-        exit(1);
-    }
-    if (argc == 5 && !strcmp(argv[1], "-refcount")) {
-        refcount = 1;
-        argv++;
-    }
-    src_filename = argv[1];
-    video_dst_filename = argv[2];
-    audio_dst_filename = argv[3];
-
-    /* open input file, and allocate format context */
-    if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) {
-        fprintf(stderr, "Could not open source file %s\n", src_filename);
-        exit(1);
-    }
-
-    /* retrieve stream information */
-    if (avformat_find_stream_info(fmt_ctx, NULL) < 0) {
-        fprintf(stderr, "Could not find stream information\n");
-        exit(1);
-    }
-
-    if (open_codec_context(&video_stream_idx, &video_dec_ctx, fmt_ctx, AVMEDIA_TYPE_VIDEO) >= 0) {
-        video_stream = fmt_ctx->streams[video_stream_idx];
-
-        video_dst_file = fopen(video_dst_filename, "wb");
-        if (!video_dst_file) {
-            fprintf(stderr, "Could not open destination file %s\n", video_dst_filename);
-            ret = 1;
-            goto end;
-        }
-
-        /* allocate image where the decoded image will be put */
-        width = video_dec_ctx->width;
-        height = video_dec_ctx->height;
-        pix_fmt = video_dec_ctx->pix_fmt;
-        ret = av_image_alloc(video_dst_data, video_dst_linesize,
-                             width, height, pix_fmt, 1);
-        if (ret < 0) {
-            fprintf(stderr, "Could not allocate raw video buffer\n");
-            goto end;
-        }
-        video_dst_bufsize = ret;
-    }
-
-    if (open_codec_context(&audio_stream_idx, &audio_dec_ctx, fmt_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
-        audio_stream = fmt_ctx->streams[audio_stream_idx];
-        audio_dst_file = fopen(audio_dst_filename, "wb");
-        if (!audio_dst_file) {
-            fprintf(stderr, "Could not open destination file %s\n", audio_dst_filename);
-            ret = 1;
-            goto end;
-        }
-    }
-
-    /* dump input information to stderr */
-    av_dump_format(fmt_ctx, 0, src_filename, 0);
-
-    if (!audio_stream && !video_stream) {
-        fprintf(stderr, "Could not find audio or video stream in the input, aborting\n");
-        ret = 1;
-        goto end;
-    }
-
-    frame = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate frame\n");
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    /* initialize packet, set data to NULL, let the demuxer fill it */
-    av_init_packet(&pkt);
-    pkt.data = NULL;
-    pkt.size = 0;
-
-    if (video_stream)
-        printf("Demuxing video from file '%s' into '%s'\n", src_filename, video_dst_filename);
-    if (audio_stream)
-        printf("Demuxing audio from file '%s' into '%s'\n", src_filename, audio_dst_filename);
-
-    /* read frames from the file */
-    while (av_read_frame(fmt_ctx, &pkt) >= 0) {
-        AVPacket orig_pkt = pkt;
-        do {
-            ret = decode_packet(&got_frame, 0);
-            if (ret < 0)
-                break;
-            pkt.data += ret;
-            pkt.size -= ret;
-        } while (pkt.size > 0);
-        av_packet_unref(&orig_pkt);
-    }
-
-    /* flush cached frames */
-    pkt.data = NULL;
-    pkt.size = 0;
-    do {
-        decode_packet(&got_frame, 1);
-    } while (got_frame);
-
-    printf("Demuxing succeeded.\n");
-
-    if (video_stream) {
-        printf("Play the output video file with the command:\n"
-               "ffplay -f rawvideo -pix_fmt %s -video_size %dx%d %s\n",
-               av_get_pix_fmt_name(pix_fmt), width, height,
-               video_dst_filename);
-    }
-
-    if (audio_stream) {
-        enum AVSampleFormat sfmt = audio_dec_ctx->sample_fmt;
-        int n_channels = audio_dec_ctx->channels;
-        const char *fmt;
-
-        if (av_sample_fmt_is_planar(sfmt)) {
-            const char *packed = av_get_sample_fmt_name(sfmt);
-            printf("Warning: the sample format the decoder produced is planar "
-                   "(%s). This example will output the first channel only.\n",
-                   packed ? packed : "?");
-            sfmt = av_get_packed_sample_fmt(sfmt);
-            n_channels = 1;
-        }
-
-        if ((ret = get_format_from_sample_fmt(&fmt, sfmt)) < 0)
-            goto end;
-
-        printf("Play the output audio file with the command:\n"
-               "ffplay -f %s -ac %d -ar %d %s\n",
-               fmt, n_channels, audio_dec_ctx->sample_rate,
-               audio_dst_filename);
-    }
-
-end:
-    avcodec_free_context(&video_dec_ctx);
-    avcodec_free_context(&audio_dec_ctx);
-    avformat_close_input(&fmt_ctx);
-    if (video_dst_file)
-        fclose(video_dst_file);
-    if (audio_dst_file)
-        fclose(audio_dst_file);
-    av_frame_free(&frame);
-    av_free(video_dst_data[0]);
-
-    return ret < 0;
-}
--- a/doc/examples/encode_audio.c
+++ b/doc/examples/encode_audio.c
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2001 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * audio encoding with libavcodec API example.
- *
- * @example encode_audio.c
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libavcodec/avcodec.h>
-
-#include <libavutil/channel_layout.h>
-#include <libavutil/common.h>
-#include <libavutil/frame.h>
-#include <libavutil/samplefmt.h>
-
-/* check that a given sample format is supported by the encoder */
-static int check_sample_fmt(const AVCodec *codec, enum AVSampleFormat sample_fmt)
-{
-    const enum AVSampleFormat *p = codec->sample_fmts;
-
-    while (*p != AV_SAMPLE_FMT_NONE) {
-        if (*p == sample_fmt)
-            return 1;
-        p++;
-    }
-    return 0;
-}
-
-/* just pick the highest supported samplerate */
-static int select_sample_rate(const AVCodec *codec)
-{
-    const int *p;
-    int best_samplerate = 0;
-
-    if (!codec->supported_samplerates)
-        return 44100;
-
-    p = codec->supported_samplerates;
-    while (*p) {
-        if (!best_samplerate || abs(44100 - *p) < abs(44100 - best_samplerate))
-            best_samplerate = *p;
-        p++;
-    }
-    return best_samplerate;
-}
-
-/* select layout with the highest channel count */
-static int select_channel_layout(const AVCodec *codec)
-{
-    const uint64_t *p;
-    uint64_t best_ch_layout = 0;
-    int best_nb_channels   = 0;
-
-    if (!codec->channel_layouts)
-        return AV_CH_LAYOUT_STEREO;
-
-    p = codec->channel_layouts;
-    while (*p) {
-        int nb_channels = av_get_channel_layout_nb_channels(*p);
-
-        if (nb_channels > best_nb_channels) {
-            best_ch_layout    = *p;
-            best_nb_channels = nb_channels;
-        }
-        p++;
-    }
-    return best_ch_layout;
-}
-
-static void encode(AVCodecContext *ctx, AVFrame *frame, AVPacket *pkt,
-                   FILE *output)
-{
-    int ret;
-
-    /* send the frame for encoding */
-    ret = avcodec_send_frame(ctx, frame);
-    if (ret < 0) {
-        fprintf(stderr, "Error sending the frame to the encoder\n");
-        exit(1);
-    }
-
-    /* read all the available output packets (in general there may be any
-     * number of them */
-    while (ret >= 0) {
-        ret = avcodec_receive_packet(ctx, pkt);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-            return;
-        else if (ret < 0) {
-            fprintf(stderr, "Error encoding audio frame\n");
-            exit(1);
-        }
-
-        fwrite(pkt->data, 1, pkt->size, output);
-        av_packet_unref(pkt);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    const char *filename;
-    const AVCodec *codec;
-    AVCodecContext *c= NULL;
-    AVFrame *frame;
-    AVPacket *pkt;
-    int i, j, k, ret;
-    FILE *f;
-    uint16_t *samples;
-    float t, tincr;
-
-    if (argc <= 1) {
-        fprintf(stderr, "Usage: %s <output file>\n", argv[0]);
-        return 0;
-    }
-    filename = argv[1];
-
-    /* find the MP2 encoder */
-    codec = avcodec_find_encoder(AV_CODEC_ID_MP2);
-    if (!codec) {
-        fprintf(stderr, "Codec not found\n");
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate audio codec context\n");
-        exit(1);
-    }
-
-    /* put sample parameters */
-    c->bit_rate = 64000;
-
-    /* check that the encoder supports s16 pcm input */
-    c->sample_fmt = AV_SAMPLE_FMT_S16;
-    if (!check_sample_fmt(codec, c->sample_fmt)) {
-        fprintf(stderr, "Encoder does not support sample format %s",
-                av_get_sample_fmt_name(c->sample_fmt));
-        exit(1);
-    }
-
-    /* select other audio parameters supported by the encoder */
-    c->sample_rate    = select_sample_rate(codec);
-    c->channel_layout = select_channel_layout(codec);
-    c->channels       = av_get_channel_layout_nb_channels(c->channel_layout);
-
-    /* open it */
-    if (avcodec_open2(c, codec, NULL) < 0) {
-        fprintf(stderr, "Could not open codec\n");
-        exit(1);
-    }
-
-    f = fopen(filename, "wb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    /* packet for holding encoded output */
-    pkt = av_packet_alloc();
-    if (!pkt) {
-        fprintf(stderr, "could not allocate the packet\n");
-        exit(1);
-    }
-
-    /* frame containing input raw audio */
-    frame = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate audio frame\n");
-        exit(1);
-    }
-
-    frame->nb_samples     = c->frame_size;
-    frame->format         = c->sample_fmt;
-    frame->channel_layout = c->channel_layout;
-
-    /* allocate the data buffers */
-    ret = av_frame_get_buffer(frame, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not allocate audio data buffers\n");
-        exit(1);
-    }
-
-    /* encode a single tone sound */
-    t = 0;
-    tincr = 2 * M_PI * 440.0 / c->sample_rate;
-    for (i = 0; i < 200; i++) {
-        /* make sure the frame is writable -- makes a copy if the encoder
-         * kept a reference internally */
-        ret = av_frame_make_writable(frame);
-        if (ret < 0)
-            exit(1);
-        samples = (uint16_t*)frame->data[0];
-
-        for (j = 0; j < c->frame_size; j++) {
-            samples[2*j] = (int)(sin(t) * 10000);
-
-            for (k = 1; k < c->channels; k++)
-                samples[2*j + k] = samples[2*j];
-            t += tincr;
-        }
-        encode(c, frame, pkt, f);
-    }
-
-    /* flush the encoder */
-    encode(c, NULL, pkt, f);
-
-    fclose(f);
-
-    av_frame_free(&frame);
-    av_packet_free(&pkt);
-    avcodec_free_context(&c);
-
-    return 0;
-}
--- a/doc/examples/encode_video.c
+++ b/doc/examples/encode_video.c
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2001 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * video encoding with libavcodec API example
- *
- * @example encode_video.c
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libavcodec/avcodec.h>
-
-#include <libavutil/opt.h>
-#include <libavutil/imgutils.h>
-
-static void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt,
-                   FILE *outfile)
-{
-    int ret;
-
-    /* send the frame to the encoder */
-    if (frame)
-        printf("Send frame %3"PRId64"\n", frame->pts);
-
-    ret = avcodec_send_frame(enc_ctx, frame);
-    if (ret < 0) {
-        fprintf(stderr, "Error sending a frame for encoding\n");
-        exit(1);
-    }
-
-    while (ret >= 0) {
-        ret = avcodec_receive_packet(enc_ctx, pkt);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-            return;
-        else if (ret < 0) {
-            fprintf(stderr, "Error during encoding\n");
-            exit(1);
-        }
-
-        printf("Write packet %3"PRId64" (size=%5d)\n", pkt->pts, pkt->size);
-        fwrite(pkt->data, 1, pkt->size, outfile);
-        av_packet_unref(pkt);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    const char *filename, *codec_name;
-    const AVCodec *codec;
-    AVCodecContext *c= NULL;
-    int i, ret, x, y;
-    FILE *f;
-    AVFrame *frame;
-    AVPacket *pkt;
-    uint8_t endcode[] = { 0, 0, 1, 0xb7 };
-
-    if (argc <= 2) {
-        fprintf(stderr, "Usage: %s <output file> <codec name>\n", argv[0]);
-        exit(0);
-    }
-    filename = argv[1];
-    codec_name = argv[2];
-
-    /* find the mpeg1video encoder */
-    codec = avcodec_find_encoder_by_name(codec_name);
-    if (!codec) {
-        fprintf(stderr, "Codec '%s' not found\n", codec_name);
-        exit(1);
-    }
-
-    c = avcodec_alloc_context3(codec);
-    if (!c) {
-        fprintf(stderr, "Could not allocate video codec context\n");
-        exit(1);
-    }
-
-    pkt = av_packet_alloc();
-    if (!pkt)
-        exit(1);
-
-    /* put sample parameters */
-    c->bit_rate = 400000;
-    /* resolution must be a multiple of two */
-    c->width = 352;
-    c->height = 288;
-    /* frames per second */
-    c->time_base = (AVRational){1, 25};
-    c->framerate = (AVRational){25, 1};
-
-    /* emit one intra frame every ten frames
-     * check frame pict_type before passing frame
-     * to encoder, if frame->pict_type is AV_PICTURE_TYPE_I
-     * then gop_size is ignored and the output of encoder
-     * will always be I frame irrespective to gop_size
-     */
-    c->gop_size = 10;
-    c->max_b_frames = 1;
-    c->pix_fmt = AV_PIX_FMT_YUV420P;
-
-    if (codec->id == AV_CODEC_ID_H264)
-        av_opt_set(c->priv_data, "preset", "slow", 0);
-
-    /* open it */
-    ret = avcodec_open2(c, codec, NULL);
-    if (ret < 0) {
-        fprintf(stderr, "Could not open codec: %s\n", av_err2str(ret));
-        exit(1);
-    }
-
-    f = fopen(filename, "wb");
-    if (!f) {
-        fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
-    }
-
-    frame = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate video frame\n");
-        exit(1);
-    }
-    frame->format = c->pix_fmt;
-    frame->width  = c->width;
-    frame->height = c->height;
-
-    ret = av_frame_get_buffer(frame, 32);
-    if (ret < 0) {
-        fprintf(stderr, "Could not allocate the video frame data\n");
-        exit(1);
-    }
-
-    /* encode 1 second of video */
-    for (i = 0; i < 25; i++) {
-        fflush(stdout);
-
-        /* make sure the frame data is writable */
-        ret = av_frame_make_writable(frame);
-        if (ret < 0)
-            exit(1);
-
-        /* prepare a dummy image */
-        /* Y */
-        for (y = 0; y < c->height; y++) {
-            for (x = 0; x < c->width; x++) {
-                frame->data[0][y * frame->linesize[0] + x] = x + y + i * 3;
-            }
-        }
-
-        /* Cb and Cr */
-        for (y = 0; y < c->height/2; y++) {
-            for (x = 0; x < c->width/2; x++) {
-                frame->data[1][y * frame->linesize[1] + x] = 128 + y + i * 2;
-                frame->data[2][y * frame->linesize[2] + x] = 64 + x + i * 5;
-            }
-        }
-
-        frame->pts = i;
-
-        /* encode the image */
-        encode(c, frame, pkt, f);
-    }
-
-    /* flush the encoder */
-    encode(c, NULL, pkt, f);
-
-    /* add sequence end code to have a real MPEG file */
-    fwrite(endcode, 1, sizeof(endcode), f);
-    fclose(f);
-
-    avcodec_free_context(&c);
-    av_frame_free(&frame);
-    av_packet_free(&pkt);
-
-    return 0;
-}
--- a/doc/examples/extract_mvs.c
+++ b/doc/examples/extract_mvs.c
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2012 Stefano Sabatini
- * Copyright (c) 2014 Clément Bœsch
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <libavutil/motion_vector.h>
-#include <libavformat/avformat.h>
-
-static AVFormatContext *fmt_ctx = NULL;
-static AVCodecContext *video_dec_ctx = NULL;
-static AVStream *video_stream = NULL;
-static const char *src_filename = NULL;
-
-static int video_stream_idx = -1;
-static AVFrame *frame = NULL;
-static int video_frame_count = 0;
-
-static int decode_packet(const AVPacket *pkt)
-{
-    int ret = avcodec_send_packet(video_dec_ctx, pkt);
-    if (ret < 0) {
-        fprintf(stderr, "Error while sending a packet to the decoder: %s\n", av_err2str(ret));
-        return ret;
-    }
-
-    while (ret >= 0)  {
-        ret = avcodec_receive_frame(video_dec_ctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-            break;
-        } else if (ret < 0) {
-            fprintf(stderr, "Error while receiving a frame from the decoder: %s\n", av_err2str(ret));
-            return ret;
-        }
-
-        if (ret >= 0) {
-            int i;
-            AVFrameSideData *sd;
-
-            video_frame_count++;
-            sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS);
-            if (sd) {
-                const AVMotionVector *mvs = (const AVMotionVector *)sd->data;
-                for (i = 0; i < sd->size / sizeof(*mvs); i++) {
-                    const AVMotionVector *mv = &mvs[i];
-                    printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64"\n",
-                        video_frame_count, mv->source,
-                        mv->w, mv->h, mv->src_x, mv->src_y,
-                        mv->dst_x, mv->dst_y, mv->flags);
-                }
-            }
-            av_frame_unref(frame);
-        }
-    }
-
-    return 0;
-}
-
-static int open_codec_context(AVFormatContext *fmt_ctx, enum AVMediaType type)
-{
-    int ret;
-    AVStream *st;
-    AVCodecContext *dec_ctx = NULL;
-    AVCodec *dec = NULL;
-    AVDictionary *opts = NULL;
-
-    ret = av_find_best_stream(fmt_ctx, type, -1, -1, &dec, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Could not find %s stream in input file '%s'\n",
-                av_get_media_type_string(type), src_filename);
-        return ret;
-    } else {
-        int stream_idx = ret;
-        st = fmt_ctx->streams[stream_idx];
-
-        dec_ctx = avcodec_alloc_context3(dec);
-        if (!dec_ctx) {
-            fprintf(stderr, "Failed to allocate codec\n");
-            return AVERROR(EINVAL);
-        }
-
-        ret = avcodec_parameters_to_context(dec_ctx, st->codecpar);
-        if (ret < 0) {
-            fprintf(stderr, "Failed to copy codec parameters to codec context\n");
-            return ret;
-        }
-
-        /* Init the video decoder */
-        av_dict_set(&opts, "flags2", "+export_mvs", 0);
-        if ((ret = avcodec_open2(dec_ctx, dec, &opts)) < 0) {
-            fprintf(stderr, "Failed to open %s codec\n",
-                    av_get_media_type_string(type));
-            return ret;
-        }
-
-        video_stream_idx = stream_idx;
-        video_stream = fmt_ctx->streams[video_stream_idx];
-        video_dec_ctx = dec_ctx;
-    }
-
-    return 0;
-}
-
-int main(int argc, char **argv)
-{
-    int ret = 0;
-    AVPacket pkt = { 0 };
-
-    if (argc != 2) {
-        fprintf(stderr, "Usage: %s <video>\n", argv[0]);
-        exit(1);
-    }
-    src_filename = argv[1];
-
-    if (avformat_open_input(&fmt_ctx, src_filename, NULL, NULL) < 0) {
-        fprintf(stderr, "Could not open source file %s\n", src_filename);
-        exit(1);
-    }
-
-    if (avformat_find_stream_info(fmt_ctx, NULL) < 0) {
-        fprintf(stderr, "Could not find stream information\n");
-        exit(1);
-    }
-
-    open_codec_context(fmt_ctx, AVMEDIA_TYPE_VIDEO);
-
-    av_dump_format(fmt_ctx, 0, src_filename, 0);
-
-    if (!video_stream) {
-        fprintf(stderr, "Could not find video stream in the input, aborting\n");
-        ret = 1;
-        goto end;
-    }
-
-    frame = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Could not allocate frame\n");
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    printf("framenum,source,blockw,blockh,srcx,srcy,dstx,dsty,flags\n");
-
-    /* read frames from the file */
-    while (av_read_frame(fmt_ctx, &pkt) >= 0) {
-        if (pkt.stream_index == video_stream_idx)
-            ret = decode_packet(&pkt);
-        av_packet_unref(&pkt);
-        if (ret < 0)
-            break;
-    }
-
-    /* flush cached frames */
-    decode_packet(NULL);
-
-end:
-    avcodec_free_context(&video_dec_ctx);
-    avformat_close_input(&fmt_ctx);
-    av_frame_free(&frame);
-    return ret < 0;
-}
--- a/doc/examples/filter_audio.c
+++ b/doc/examples/filter_audio.c
@@ -1,363 +0,0 @@
-/*
- * copyright (c) 2013 Andrew Kelley
- *
- * This file is part of FFmpeg.
- *
- * 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.
- *
- * 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 FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * libavfilter API usage example.
- *
- * @example filter_audio.c
- * This example will generate a sine wave audio,
- * pass it through a simple filter chain, and then compute the MD5 checksum of
- * the output data.
- *
- * The filter chain it uses is:
- * (input) -> abuffer -> volume -> aformat -> abuffersink -> (output)
- *
- * abuffer: This provides the endpoint where you can feed the decoded samples.
- * volume: In this example we hardcode it to 0.90.
- * aformat: This converts the samples to the samplefreq, channel layout,
- *          and sample format required by the audio device.
- * abuffersink: This provides the endpoint where you can read the samples after
- *              they have passed through the filter chain.
- */
-
-#include <inttypes.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "libavutil/channel_layout.h"
-#include "libavutil/md5.h"
-#include "libavutil/mem.h"
-#include "libavutil/opt.h"
-#include "libavutil/samplefmt.h"
-
-#include "libavfilter/avfilter.h"
-#include "libavfilter/buffersink.h"
-#include "libavfilter/buffersrc.h"
-
-#define INPUT_SAMPLERATE     48000
-#define INPUT_FORMAT         AV_SAMPLE_FMT_FLTP
-#define INPUT_CHANNEL_LAYOUT AV_CH_LAYOUT_5POINT0
-
-#define VOLUME_VAL 0.90
-
-static int init_filter_graph(AVFilterGraph **graph, AVFilterContext **src,
-                             AVFilterContext **sink)
-{
-    AVFilterGraph *filter_graph;
-    AVFilterContext *abuffer_ctx;
-    const AVFilter  *abuffer;
-    AVFilterContext *volume_ctx;
-    const AVFilter  *volume;
-    AVFilterContext *aformat_ctx;
-    const AVFilter  *aformat;
-    AVFilterContext *abuffersink_ctx;
-    const AVFilter  *abuffersink;
-
-    AVDictionary *options_dict = NULL;
-    uint8_t options_str[1024];
-    uint8_t ch_layout[64];
-
-    int err;
-
-    /* Create a new filtergraph, which will contain all the filters. */
-    filter_graph = avfilter_graph_alloc();
-    if (!filter_graph) {
-        fprintf(stderr, "Unable to create filter graph.\n");
-        return AVERROR(ENOMEM);
-    }
-
-    /* Create the abuffer filter;
-     * it will be used for feeding the data into the graph. */
-    abuffer = avfilter_get_by_name("abuffer");
-    if (!abuffer) {
-        fprintf(stderr, "Could not find the abuffer filter.\n");
-        return AVERROR_FILTER_NOT_FOUND;
-    }
-
-    abuffer_ctx = avfilter_graph_alloc_filter(filter_graph, abuffer, "src");
-    if (!abuffer_ctx) {
-        fprintf(stderr, "Could not allocate the abuffer instance.\n");
-        return AVERROR(ENOMEM);
-    }
-
-    /* Set the filter options through the AVOptions API. */
-    av_get_channel_layout_string(ch_layout, sizeof(ch_layout), 0, INPUT_CHANNEL_LAYOUT);
-    av_opt_set    (abuffer_ctx, "channel_layout", ch_layout,                            AV_OPT_SEARCH_CHILDREN);
-    av_opt_set    (abuffer_ctx, "sample_fmt",     av_get_sample_fmt_name(INPUT_FORMAT), AV_OPT_SEARCH_CHILDREN);
-    av_opt_set_q  (abuffer_ctx, "time_base",      (AVRational){ 1, INPUT_SAMPLERATE },  AV_OPT_SEARCH_CHILDREN);
-    av_opt_set_int(abuffer_ctx, "sample_rate",    INPUT_SAMPLERATE,                     AV_OPT_SEARCH_CHILDREN);
-
-    /* Now initialize the filter; we pass NULL options, since we have already
-     * set all the options above. */
-    err = avfilter_init_str(abuffer_ctx, NULL);
-    if (err < 0) {
-        fprintf(stderr, "Could not initialize the abuffer filter.\n");
-        return err;
-    }
-
-    /* Create volume filter. */
-    volume = avfilter_get_by_name("volume");
-    if (!volume) {
-        fprintf(stderr, "Could not find the volume filter.\n");
-        return AVERROR_FILTER_NOT_FOUND;
-    }
-
-    volume_ctx = avfilter_graph_alloc_filter(filter_graph, volume, "volume");
-    if (!volume_ctx) {
-        fprintf(stderr, "Could not allocate the volume instance.\n");
-        return AVERROR(ENOMEM);
-    }
-
-    /* A different way of passing the options is as key/value pairs in a
-     * dictionary. */
-    av_dict_set(&options_dict, "volume", AV_STRINGIFY(VOLUME_VAL), 0);
-    err = avfilter_init_dict(volume_ctx, &options_dict);
-    av_dict_free(&options_dict);
-    if (err < 0) {
-        fprintf(stderr, "Could not initialize the volume filter.\n");
-        return err;
-    }
-
-    /* Create the aformat filter;
-     * it ensures that the output is of the format we want. */
-    aformat = avfilter_get_by_name("aformat");
-    if (!aformat) {
-        fprintf(stderr, "Could not find the aformat filter.\n");
-        return AVERROR_FILTER_NOT_FOUND;
-    }
-
-    aformat_ctx = avfilter_graph_alloc_filter(filter_graph, aformat, "aformat");
-    if (!aformat_ctx) {
-        fprintf(stderr, "Could not allocate the aformat instance.\n");
-        return AVERROR(ENOMEM);
-    }
-
-    /* A third way of passing the options is in a string of the form
-     * key1=value1:key2=value2.... */
-    snprintf(options_str, sizeof(options_str),
-             "sample_fmts=%s:sample_rates=%d:channel_layouts=0x%"PRIx64,
-             av_get_sample_fmt_name(AV_SAMPLE_FMT_S16), 44100,
-             (uint64_t)AV_CH_LAYOUT_STEREO);
-    err = avfilter_init_str(aformat_ctx, options_str);
-    if (err < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Could not initialize the aformat filter.\n");
-        return err;
-    }
-
-    /* Finally create the abuffersink filter;
-     * it will be used to get the filtered data out of the graph. */
-    abuffersink = avfilter_get_by_name("abuffersink");
-    if (!abuffersink) {
-        fprintf(stderr, "Could not find the abuffersink filter.\n");
-        return AVERROR_FILTER_NOT_FOUND;
-    }
-
-    abuffersink_ctx = avfilter_graph_alloc_filter(filter_graph, abuffersink, "sink");
-    if (!abuffersink_ctx) {
-        fprintf(stderr, "Could not allocate the abuffersink instance.\n");
-        return AVERROR(ENOMEM);
-    }
-
-    /* This filter takes no options. */
-    err = avfilter_init_str(abuffersink_ctx, NULL);
-    if (err < 0) {
-        fprintf(stderr, "Could not initialize the abuffersink instance.\n");
-        return err;
-    }
-
-    /* Connect the filters;
-     * in this simple case the filters just form a linear chain. */
-    err = avfilter_link(abuffer_ctx, 0, volume_ctx, 0);
-    if (err >= 0)
-        err = avfilter_link(volume_ctx, 0, aformat_ctx, 0);
-    if (err >= 0)
-        err = avfilter_link(aformat_ctx, 0, abuffersink_ctx, 0);
-    if (err < 0) {
-        fprintf(stderr, "Error connecting filters\n");
-        return err;
-    }
-
-    /* Configure the graph. */
-    err = avfilter_graph_config(filter_graph, NULL);
-    if (err < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Error configuring the filter graph\n");
-        return err;
-    }
-
-    *graph = filter_graph;
-    *src   = abuffer_ctx;
-    *sink  = abuffersink_ctx;
-
-    return 0;
-}
-
-/* Do something useful with the filtered data: this simple
- * example just prints the MD5 checksum of each plane to stdout. */
-static int process_output(struct AVMD5 *md5, AVFrame *frame)
-{
-    int planar     = av_sample_fmt_is_planar(frame->format);
-    int channels   = av_get_channel_layout_nb_channels(frame->channel_layout);
-    int planes     = planar ? channels : 1;
-    int bps        = av_get_bytes_per_sample(frame->format);
-    int plane_size = bps * frame->nb_samples * (planar ? 1 : channels);
-    int i, j;
-
-    for (i = 0; i < planes; i++) {
-        uint8_t checksum[16];
-
-        av_md5_init(md5);
-        av_md5_sum(checksum, frame->extended_data[i], plane_size);
-
-        fprintf(stdout, "plane %d: 0x", i);
-        for (j = 0; j < sizeof(checksum); j++)
-            fprintf(stdout, "%02X", checksum[j]);
-        fprintf(stdout, "\n");
-    }
-    fprintf(stdout, "\n");
-
-    return 0;
-}
-
-/* Construct a frame of audio data to be filtered;
- * this simple example just synthesizes a sine wave. */
-static int get_input(AVFrame *frame, int frame_num)
-{
-    int err, i, j;
-
-#define FRAME_SIZE 1024
-
-    /* Set up the frame properties and allocate the buffer for the data. */
-    frame->sample_rate    = INPUT_SAMPLERATE;
-    frame->format         = INPUT_FORMAT;
-    frame->channel_layout = INPUT_CHANNEL_LAYOUT;
-    frame->nb_samples     = FRAME_SIZE;
-    frame->pts            = frame_num * FRAME_SIZE;
-
-    err = av_frame_get_buffer(frame, 0);
-    if (err < 0)
-        return err;
-
-    /* Fill the data for each channel. */
-    for (i = 0; i < 5; i++) {
-        float *data = (float*)frame->extended_data[i];
-
-        for (j = 0; j < frame->nb_samples; j++)
-            data[j] = sin(2 * M_PI * (frame_num + j) * (i + 1) / FRAME_SIZE);
-    }
-
-    return 0;
-}
-
-int main(int argc, char *argv[])
-{
-    struct AVMD5 *md5;
-    AVFilterGraph *graph;
-    AVFilterContext *src, *sink;
-    AVFrame *frame;
-    uint8_t errstr[1024];
-    float duration;
-    int err, nb_frames, i;
-
-    if (argc < 2) {
-        fprintf(stderr, "Usage: %s <duration>\n", argv[0]);
-        return 1;
-    }
-
-    duration  = atof(argv[1]);
-    nb_frames = duration * INPUT_SAMPLERATE / FRAME_SIZE;
-    if (nb_frames <= 0) {
-        fprintf(stderr, "Invalid duration: %s\n", argv[1]);
-        return 1;
-    }
-
-    /* Allocate the frame we will be using to store the data. */
-    frame  = av_frame_alloc();
-    if (!frame) {
-        fprintf(stderr, "Error allocating the frame\n");
-        return 1;
-    }
-
-    md5 = av_md5_alloc();
-    if (!md5) {
-        fprintf(stderr, "Error allocating the MD5 context\n");
-        return 1;
-    }
-
-    /* Set up the filtergraph. */
-    err = init_filter_graph(&graph, &src, &sink);
-    if (err < 0) {
-        fprintf(stderr, "Unable to init filter graph:");
-        goto fail;
-    }
-
-    /* the main filtering loop */
-    for (i = 0; i < nb_frames; i++) {
-        /* get an input frame to be filtered */
-        err = get_input(frame, i);
-        if (err < 0) {
-            fprintf(stderr, "Error generating input frame:");
-            goto fail;
-        }
-
-        /* Send the frame to the input of the filtergraph. */
-        err = av_buffersrc_add_frame(src, frame);
-        if (err < 0) {
-            av_frame_unref(frame);
-            fprintf(stderr, "Error submitting the frame to the filtergraph:");
-            goto fail;
-        }
-
-        /* Get all the filtered output that is available. */
-        while ((err = av_buffersink_get_frame(sink, frame)) >= 0) {
-            /* now do something with our filtered frame */
-            err = process_output(md5, frame);
-            if (err < 0) {
-                fprintf(stderr, "Error processing the filtered frame:");
-                goto fail;
-            }
-            av_frame_unref(frame);
-        }
-
-        if (err == AVERROR(EAGAIN)) {
-            /* Need to feed more frames in. */
-            continue;
-        } else if (err == AVERROR_EOF) {
-            /* Nothing more to do, finish. */
-            break;
-        } else if (err < 0) {
-            /* An error occurred. */
-            fprintf(stderr, "Error filtering the data:");
-            goto fail;
-        }
-    }
-
-    avfilter_graph_free(&graph);
-    av_frame_free(&frame);
-    av_freep(&md5);
-
-    return 0;
-
-fail:
-    av_strerror(err, errstr, sizeof(errstr));
-    fprintf(stderr, "%s\n", errstr);
-    return 1;
-}
--- a/doc/examples/filtering.c
+++ b/doc/examples/filtering.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2010 Nicolas George
+ * Copyright (c) 2011 Stefano Sabatini
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * @file
+ * API example for decoding and filtering
+ */
+
+#define _XOPEN_SOURCE 600 /* for usleep */
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavfilter/vsrc_buffer.h>
+
+const char *filter_descr = "scale=78:24";
+
+static AVFormatContext *fmt_ctx;
+static AVCodecContext *dec_ctx;
+AVFilterContext *buffersink_ctx;
+AVFilterContext *buffersrc_ctx;
+AVFilterGraph *filter_graph;
+static int video_stream_index = -1;
+static int64_t last_pts = AV_NOPTS_VALUE;
+
+static int open_input_file(const char *filename)
+{
+    int ret, i;
+    AVCodec *dec;
+
+    if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n");
+        return ret;
+    }
+
+    if ((ret = av_find_stream_info(fmt_ctx)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot find stream information\n");
+        return ret;
+    }
+
+    /* select the video stream */
+    ret = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &dec, 0);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot find a video stream in the input file\n");
+        return ret;
+    }
+    video_stream_index = ret;
+    dec_ctx = fmt_ctx->streams[video_stream_index]->codec;
+
+    /* init the video decoder */
+    if ((ret = avcodec_open(dec_ctx, dec)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot open video decoder\n");
+        return ret;
+    }
+
+    return 0;
+}
+
+static int init_filters(const char *filters_descr)
+{
+    char args[512];
+    int ret;
+    AVFilter *buffersrc  = avfilter_get_by_name("buffer");
+    AVFilter *buffersink = avfilter_get_by_name("buffersink");
+    AVFilterInOut *outputs = avfilter_inout_alloc();
+    AVFilterInOut *inputs  = avfilter_inout_alloc();
+    enum PixelFormat pix_fmts[] = { PIX_FMT_GRAY8, PIX_FMT_NONE };
+    filter_graph = avfilter_graph_alloc();
+
+    /* buffer video source: the decoded frames from the decoder will be inserted here. */
+    snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d",
+             dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
+             dec_ctx->time_base.num, dec_ctx->time_base.den,
+             dec_ctx->sample_aspect_ratio.num, dec_ctx->sample_aspect_ratio.den);
+    ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in",
+                                       args, NULL, filter_graph);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot create buffer source\n");
+        return ret;
+    }
+
+    /* buffer video sink: to terminate the filter chain. */
+    ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
+                                       NULL, pix_fmts, filter_graph);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n");
+        return ret;
+    }
+
+    /* Endpoints for the filter graph. */
+    outputs->name       = av_strdup("in");
+    outputs->filter_ctx = buffersrc_ctx;
+    outputs->pad_idx    = 0;
+    outputs->next       = NULL;
+
+    inputs->name       = av_strdup("out");
+    inputs->filter_ctx = buffersink_ctx;
+    inputs->pad_idx    = 0;
+    inputs->next       = NULL;
+
+    if ((ret = avfilter_graph_parse(filter_graph, filter_descr,
+                                    &inputs, &outputs, NULL)) < 0)
+        return ret;
+
+    if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
+        return ret;
+}
+
+static void display_picref(AVFilterBufferRef *picref, AVRational time_base)
+{
+    int x, y;
+    uint8_t *p0, *p;
+    int64_t delay;
+
+    if (picref->pts != AV_NOPTS_VALUE) {
+        if (last_pts != AV_NOPTS_VALUE) {
+            /* sleep roughly the right amount of time;
+             * usleep is in microseconds, just like AV_TIME_BASE. */
+            delay = av_rescale_q(picref->pts - last_pts,
+                                 time_base, AV_TIME_BASE_Q);
+            if (delay > 0 && delay < 1000000)
+                usleep(delay);
+        }
+        last_pts = picref->pts;
+    }
+
+    /* Trivial ASCII grayscale display. */
+    p0 = picref->data[0];
+    puts("\033c");
+    for (y = 0; y < picref->video->h; y++) {
+        p = p0;
+        for (x = 0; x < picref->video->w; x++)
+            putchar(" .-+#"[*(p++) / 52]);
+        putchar('\n');
+        p0 += picref->linesize[0];
+    }
+    fflush(stdout);
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    AVPacket packet;
+    AVFrame frame;
+    int got_frame;
+
+    if (argc != 2) {
+        fprintf(stderr, "Usage: %s file\n", argv[0]);
+        exit(1);
+    }
+
+    avcodec_register_all();
+    av_register_all();
+    avfilter_register_all();
+
+    if ((ret = open_input_file(argv[1])) < 0)
+        goto end;
+    if ((ret = init_filters(filter_descr)) < 0)
+        goto end;
+
+    /* read all packets */
+    while (1) {
+        AVFilterBufferRef *picref;
+        if ((ret = av_read_frame(fmt_ctx, &packet)) < 0)
+            break;
+
+        if (packet.stream_index == video_stream_index) {
+            avcodec_get_frame_defaults(&frame);
+            got_frame = 0;
+            ret = avcodec_decode_video2(dec_ctx, &frame, &got_frame, &packet);
+            av_free_packet(&packet);
+            if (ret < 0) {
+                av_log(NULL, AV_LOG_ERROR, "Error decoding video\n");
+                break;
+            }
+
+            if (got_frame) {
+                if (frame.pts == AV_NOPTS_VALUE)
+                    frame.pts = frame.pkt_dts == AV_NOPTS_VALUE ?
+                        frame.pkt_dts : frame.pkt_pts;
+                /* push the decoded frame into the filtergraph */
+                av_vsrc_buffer_add_frame(buffersrc_ctx, &frame);
+
+                /* pull filtered pictures from the filtergraph */
+                while (avfilter_poll_frame(buffersink_ctx->inputs[0])) {
+                    av_vsink_buffer_get_video_buffer_ref(buffersink_ctx, &picref, 0);
+                    if (picref) {
+                        display_picref(picref, buffersink_ctx->inputs[0]->time_base);
+                        avfilter_unref_buffer(picref);
+                    }
+                }
+            }
+        }
+    }
+end:
+    avfilter_graph_free(&filter_graph);
+    if (dec_ctx)
+        avcodec_close(dec_ctx);
+    av_close_input_file(fmt_ctx);
+
+    if (ret < 0 && ret != AVERROR_EOF) {
+        char buf[1024];
+        av_strerror(ret, buf, sizeof(buf));
+        fprintf(stderr, "Error occurred: %s\n", buf);
+        exit(1);
+    }
+
+    exit(0);
+}
--- a/doc/examples/filtering_audio.c
+++ b/doc/examples/filtering_audio.c
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2010 Nicolas George
- * Copyright (c) 2011 Stefano Sabatini
- * Copyright (c) 2012 Clément Bœsch
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * API example for audio decoding and filtering
- * @example filtering_audio.c
- */
-
-#include <unistd.h>
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavfilter/buffersink.h>
-#include <libavfilter/buffersrc.h>
-#include <libavutil/opt.h>
-
-static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono";
-static const char *player       = "ffplay -f s16le -ar 8000 -ac 1 -";
-
-static AVFormatContext *fmt_ctx;
-static AVCodecContext *dec_ctx;
-AVFilterContext *buffersink_ctx;
-AVFilterContext *buffersrc_ctx;
-AVFilterGraph *filter_graph;
-static int audio_stream_index = -1;
-
-static int open_input_file(const char *filename)
-{
-    int ret;
-    AVCodec *dec;
-
-    if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n");
-        return ret;
-    }
-
-    if ((ret = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot find stream information\n");
-        return ret;
-    }
-
-    /* select the audio stream */
-    ret = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &dec, 0);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot find an audio stream in the input file\n");
-        return ret;
-    }
-    audio_stream_index = ret;
-
-    /* create decoding context */
-    dec_ctx = avcodec_alloc_context3(dec);
-    if (!dec_ctx)
-        return AVERROR(ENOMEM);
-    avcodec_parameters_to_context(dec_ctx, fmt_ctx->streams[audio_stream_index]->codecpar);
-
-    /* init the audio decoder */
-    if ((ret = avcodec_open2(dec_ctx, dec, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot open audio decoder\n");
-        return ret;
-    }
-
-    return 0;
-}
-
-static int init_filters(const char *filters_descr)
-{
-    char args[512];
-    int ret = 0;
-    const AVFilter *abuffersrc  = avfilter_get_by_name("abuffer");
-    const AVFilter *abuffersink = avfilter_get_by_name("abuffersink");
-    AVFilterInOut *outputs = avfilter_inout_alloc();
-    AVFilterInOut *inputs  = avfilter_inout_alloc();
-    static const enum AVSampleFormat out_sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 };
-    static const int64_t out_channel_layouts[] = { AV_CH_LAYOUT_MONO, -1 };
-    static const int out_sample_rates[] = { 8000, -1 };
-    const AVFilterLink *outlink;
-    AVRational time_base = fmt_ctx->streams[audio_stream_index]->time_base;
-
-    filter_graph = avfilter_graph_alloc();
-    if (!outputs || !inputs || !filter_graph) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    /* buffer audio source: the decoded frames from the decoder will be inserted here. */
-    if (!dec_ctx->channel_layout)
-        dec_ctx->channel_layout = av_get_default_channel_layout(dec_ctx->channels);
-    snprintf(args, sizeof(args),
-            "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x%"PRIx64,
-             time_base.num, time_base.den, dec_ctx->sample_rate,
-             av_get_sample_fmt_name(dec_ctx->sample_fmt), dec_ctx->channel_layout);
-    ret = avfilter_graph_create_filter(&buffersrc_ctx, abuffersrc, "in",
-                                       args, NULL, filter_graph);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer source\n");
-        goto end;
-    }
-
-    /* buffer audio sink: to terminate the filter chain. */
-    ret = avfilter_graph_create_filter(&buffersink_ctx, abuffersink, "out",
-                                       NULL, NULL, filter_graph);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n");
-        goto end;
-    }
-
-    ret = av_opt_set_int_list(buffersink_ctx, "sample_fmts", out_sample_fmts, -1,
-                              AV_OPT_SEARCH_CHILDREN);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot set output sample format\n");
-        goto end;
-    }
-
-    ret = av_opt_set_int_list(buffersink_ctx, "channel_layouts", out_channel_layouts, -1,
-                              AV_OPT_SEARCH_CHILDREN);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot set output channel layout\n");
-        goto end;
-    }
-
-    ret = av_opt_set_int_list(buffersink_ctx, "sample_rates", out_sample_rates, -1,
-                              AV_OPT_SEARCH_CHILDREN);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot set output sample rate\n");
-        goto end;
-    }
-
-    /*
-     * Set the endpoints for the filter graph. The filter_graph will
-     * be linked to the graph described by filters_descr.
-     */
-
-    /*
-     * The buffer source output must be connected to the input pad of
-     * the first filter described by filters_descr; since the first
-     * filter input label is not specified, it is set to "in" by
-     * default.
-     */
-    outputs->name       = av_strdup("in");
-    outputs->filter_ctx = buffersrc_ctx;
-    outputs->pad_idx    = 0;
-    outputs->next       = NULL;
-
-    /*
-     * The buffer sink input must be connected to the output pad of
-     * the last filter described by filters_descr; since the last
-     * filter output label is not specified, it is set to "out" by
-     * default.
-     */
-    inputs->name       = av_strdup("out");
-    inputs->filter_ctx = buffersink_ctx;
-    inputs->pad_idx    = 0;
-    inputs->next       = NULL;
-
-    if ((ret = avfilter_graph_parse_ptr(filter_graph, filters_descr,
-                                        &inputs, &outputs, NULL)) < 0)
-        goto end;
-
-    if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
-        goto end;
-
-    /* Print summary of the sink buffer
-     * Note: args buffer is reused to store channel layout string */
-    outlink = buffersink_ctx->inputs[0];
-    av_get_channel_layout_string(args, sizeof(args), -1, outlink->channel_layout);
-    av_log(NULL, AV_LOG_INFO, "Output: srate:%dHz fmt:%s chlayout:%s\n",
-           (int)outlink->sample_rate,
-           (char *)av_x_if_null(av_get_sample_fmt_name(outlink->format), "?"),
-           args);
-
-end:
-    avfilter_inout_free(&inputs);
-    avfilter_inout_free(&outputs);
-
-    return ret;
-}
-
-static void print_frame(const AVFrame *frame)
-{
-    const int n = frame->nb_samples * av_get_channel_layout_nb_channels(frame->channel_layout);
-    const uint16_t *p     = (uint16_t*)frame->data[0];
-    const uint16_t *p_end = p + n;
-
-    while (p < p_end) {
-        fputc(*p    & 0xff, stdout);
-        fputc(*p>>8 & 0xff, stdout);
-        p++;
-    }
-    fflush(stdout);
-}
-
-int main(int argc, char **argv)
-{
-    int ret;
-    AVPacket packet;
-    AVFrame *frame = av_frame_alloc();
-    AVFrame *filt_frame = av_frame_alloc();
-
-    if (!frame || !filt_frame) {
-        perror("Could not allocate frame");
-        exit(1);
-    }
-    if (argc != 2) {
-        fprintf(stderr, "Usage: %s file | %s\n", argv[0], player);
-        exit(1);
-    }
-
-    if ((ret = open_input_file(argv[1])) < 0)
-        goto end;
-    if ((ret = init_filters(filter_descr)) < 0)
-        goto end;
-
-    /* read all packets */
-    while (1) {
-        if ((ret = av_read_frame(fmt_ctx, &packet)) < 0)
-            break;
-
-        if (packet.stream_index == audio_stream_index) {
-            ret = avcodec_send_packet(dec_ctx, &packet);
-            if (ret < 0) {
-                av_log(NULL, AV_LOG_ERROR, "Error while sending a packet to the decoder\n");
-                break;
-            }
-
-            while (ret >= 0) {
-                ret = avcodec_receive_frame(dec_ctx, frame);
-                if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-                    break;
-                } else if (ret < 0) {
-                    av_log(NULL, AV_LOG_ERROR, "Error while receiving a frame from the decoder\n");
-                    goto end;
-                }
-
-                if (ret >= 0) {
-                    /* push the audio data from decoded frame into the filtergraph */
-                    if (av_buffersrc_add_frame_flags(buffersrc_ctx, frame, AV_BUFFERSRC_FLAG_KEEP_REF) < 0) {
-                        av_log(NULL, AV_LOG_ERROR, "Error while feeding the audio filtergraph\n");
-                        break;
-                    }
-
-                    /* pull filtered audio from the filtergraph */
-                    while (1) {
-                        ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
-                        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-                            break;
-                        if (ret < 0)
-                            goto end;
-                        print_frame(filt_frame);
-                        av_frame_unref(filt_frame);
-                    }
-                    av_frame_unref(frame);
-                }
-            }
-        }
-        av_packet_unref(&packet);
-    }
-end:
-    avfilter_graph_free(&filter_graph);
-    avcodec_free_context(&dec_ctx);
-    avformat_close_input(&fmt_ctx);
-    av_frame_free(&frame);
-    av_frame_free(&filt_frame);
-
-    if (ret < 0 && ret != AVERROR_EOF) {
-        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
-        exit(1);
-    }
-
-    exit(0);
-}
--- a/doc/examples/filtering_video.c
+++ b/doc/examples/filtering_video.c
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2010 Nicolas George
- * Copyright (c) 2011 Stefano Sabatini
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * API example for decoding and filtering
- * @example filtering_video.c
- */
-
-#define _XOPEN_SOURCE 600 /* for usleep */
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavfilter/buffersink.h>
-#include <libavfilter/buffersrc.h>
-#include <libavutil/opt.h>
-
-const char *filter_descr = "scale=78:24,transpose=cclock";
-/* other way:
-   scale=78:24 [scl]; [scl] transpose=cclock // assumes "[in]" and "[out]" to be input output pads respectively
- */
-
-static AVFormatContext *fmt_ctx;
-static AVCodecContext *dec_ctx;
-AVFilterContext *buffersink_ctx;
-AVFilterContext *buffersrc_ctx;
-AVFilterGraph *filter_graph;
-static int video_stream_index = -1;
-static int64_t last_pts = AV_NOPTS_VALUE;
-
-static int open_input_file(const char *filename)
-{
-    int ret;
-    AVCodec *dec;
-
-    if ((ret = avformat_open_input(&fmt_ctx, filename, NULL, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot open input file\n");
-        return ret;
-    }
-
-    if ((ret = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot find stream information\n");
-        return ret;
-    }
-
-    /* select the video stream */
-    ret = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &dec, 0);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot find a video stream in the input file\n");
-        return ret;
-    }
-    video_stream_index = ret;
-
-    /* create decoding context */
-    dec_ctx = avcodec_alloc_context3(dec);
-    if (!dec_ctx)
-        return AVERROR(ENOMEM);
-    avcodec_parameters_to_context(dec_ctx, fmt_ctx->streams[video_stream_index]->codecpar);
-
-    /* init the video decoder */
-    if ((ret = avcodec_open2(dec_ctx, dec, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot open video decoder\n");
-        return ret;
-    }
-
-    return 0;
-}
-
-static int init_filters(const char *filters_descr)
-{
-    char args[512];
-    int ret = 0;
-    const AVFilter *buffersrc  = avfilter_get_by_name("buffer");
-    const AVFilter *buffersink = avfilter_get_by_name("buffersink");
-    AVFilterInOut *outputs = avfilter_inout_alloc();
-    AVFilterInOut *inputs  = avfilter_inout_alloc();
-    AVRational time_base = fmt_ctx->streams[video_stream_index]->time_base;
-    enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
-
-    filter_graph = avfilter_graph_alloc();
-    if (!outputs || !inputs || !filter_graph) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    /* buffer video source: the decoded frames from the decoder will be inserted here. */
-    snprintf(args, sizeof(args),
-            "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
-            dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
-            time_base.num, time_base.den,
-            dec_ctx->sample_aspect_ratio.num, dec_ctx->sample_aspect_ratio.den);
-
-    ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in",
-                                       args, NULL, filter_graph);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot create buffer source\n");
-        goto end;
-    }
-
-    /* buffer video sink: to terminate the filter chain. */
-    ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
-                                       NULL, NULL, filter_graph);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n");
-        goto end;
-    }
-
-    ret = av_opt_set_int_list(buffersink_ctx, "pix_fmts", pix_fmts,
-                              AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot set output pixel format\n");
-        goto end;
-    }
-
-    /*
-     * Set the endpoints for the filter graph. The filter_graph will
-     * be linked to the graph described by filters_descr.
-     */
-
-    /*
-     * The buffer source output must be connected to the input pad of
-     * the first filter described by filters_descr; since the first
-     * filter input label is not specified, it is set to "in" by
-     * default.
-     */
-    outputs->name       = av_strdup("in");
-    outputs->filter_ctx = buffersrc_ctx;
-    outputs->pad_idx    = 0;
-    outputs->next       = NULL;
-
-    /*
-     * The buffer sink input must be connected to the output pad of
-     * the last filter described by filters_descr; since the last
-     * filter output label is not specified, it is set to "out" by
-     * default.
-     */
-    inputs->name       = av_strdup("out");
-    inputs->filter_ctx = buffersink_ctx;
-    inputs->pad_idx    = 0;
-    inputs->next       = NULL;
-
-    if ((ret = avfilter_graph_parse_ptr(filter_graph, filters_descr,
-                                    &inputs, &outputs, NULL)) < 0)
-        goto end;
-
-    if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
-        goto end;
-
-end:
-    avfilter_inout_free(&inputs);
-    avfilter_inout_free(&outputs);
-
-    return ret;
-}
-
-static void display_frame(const AVFrame *frame, AVRational time_base)
-{
-    int x, y;
-    uint8_t *p0, *p;
-    int64_t delay;
-
-    if (frame->pts != AV_NOPTS_VALUE) {
-        if (last_pts != AV_NOPTS_VALUE) {
-            /* sleep roughly the right amount of time;
-             * usleep is in microseconds, just like AV_TIME_BASE. */
-            delay = av_rescale_q(frame->pts - last_pts,
-                                 time_base, AV_TIME_BASE_Q);
-            if (delay > 0 && delay < 1000000)
-                usleep(delay);
-        }
-        last_pts = frame->pts;
-    }
-
-    /* Trivial ASCII grayscale display. */
-    p0 = frame->data[0];
-    puts("\033c");
-    for (y = 0; y < frame->height; y++) {
-        p = p0;
-        for (x = 0; x < frame->width; x++)
-            putchar(" .-+#"[*(p++) / 52]);
-        putchar('\n');
-        p0 += frame->linesize[0];
-    }
-    fflush(stdout);
-}
-
-int main(int argc, char **argv)
-{
-    int ret;
-    AVPacket packet;
-    AVFrame *frame;
-    AVFrame *filt_frame;
-
-    if (argc != 2) {
-        fprintf(stderr, "Usage: %s file\n", argv[0]);
-        exit(1);
-    }
-
-    frame = av_frame_alloc();
-    filt_frame = av_frame_alloc();
-    if (!frame || !filt_frame) {
-        perror("Could not allocate frame");
-        exit(1);
-    }
-
-    if ((ret = open_input_file(argv[1])) < 0)
-        goto end;
-    if ((ret = init_filters(filter_descr)) < 0)
-        goto end;
-
-    /* read all packets */
-    while (1) {
-        if ((ret = av_read_frame(fmt_ctx, &packet)) < 0)
-            break;
-
-        if (packet.stream_index == video_stream_index) {
-            ret = avcodec_send_packet(dec_ctx, &packet);
-            if (ret < 0) {
-                av_log(NULL, AV_LOG_ERROR, "Error while sending a packet to the decoder\n");
-                break;
-            }
-
-            while (ret >= 0) {
-                ret = avcodec_receive_frame(dec_ctx, frame);
-                if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-                    break;
-                } else if (ret < 0) {
-                    av_log(NULL, AV_LOG_ERROR, "Error while receiving a frame from the decoder\n");
-                    goto end;
-                }
-
-                frame->pts = frame->best_effort_timestamp;
-
-                /* push the decoded frame into the filtergraph */
-                if (av_buffersrc_add_frame_flags(buffersrc_ctx, frame, AV_BUFFERSRC_FLAG_KEEP_REF) < 0) {
-                    av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n");
-                    break;
-                }
-
-                /* pull filtered frames from the filtergraph */
-                while (1) {
-                    ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
-                    if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-                        break;
-                    if (ret < 0)
-                        goto end;
-                    display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
-                    av_frame_unref(filt_frame);
-                }
-                av_frame_unref(frame);
-            }
-        }
-        av_packet_unref(&packet);
-    }
-end:
-    avfilter_graph_free(&filter_graph);
-    avcodec_free_context(&dec_ctx);
-    avformat_close_input(&fmt_ctx);
-    av_frame_free(&frame);
-    av_frame_free(&filt_frame);
-
-    if (ret < 0 && ret != AVERROR_EOF) {
-        fprintf(stderr, "Error occurred: %s\n", av_err2str(ret));
-        exit(1);
-    }
-
-    exit(0);
-}
--- a/doc/examples/http_multiclient.c
+++ b/doc/examples/http_multiclient.c
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2015 Stephan Holljes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * libavformat multi-client network API usage example.
- *
- * @example http_multiclient.c
- * This example will serve a file without decoding or demuxing it over http.
- * Multiple clients can connect and will receive the same file.
- */
-
-#include <libavformat/avformat.h>
-#include <libavutil/opt.h>
-#include <unistd.h>
-
-static void process_client(AVIOContext *client, const char *in_uri)
-{
-    AVIOContext *input = NULL;
-    uint8_t buf[1024];
-    int ret, n, reply_code;
-    uint8_t *resource = NULL;
-    while ((ret = avio_handshake(client)) > 0) {
-        av_opt_get(client, "resource", AV_OPT_SEARCH_CHILDREN, &resource);
-        // check for strlen(resource) is necessary, because av_opt_get()
-        // may return empty string.
-        if (resource && strlen(resource))
-            break;
-        av_freep(&resource);
-    }
-    if (ret < 0)
-        goto end;
-    av_log(client, AV_LOG_TRACE, "resource=%p\n", resource);
-    if (resource && resource[0] == '/' && !strcmp((resource + 1), in_uri)) {
-        reply_code = 200;
-    } else {
-        reply_code = AVERROR_HTTP_NOT_FOUND;
-    }
-    if ((ret = av_opt_set_int(client, "reply_code", reply_code, AV_OPT_SEARCH_CHILDREN)) < 0) {
-        av_log(client, AV_LOG_ERROR, "Failed to set reply_code: %s.\n", av_err2str(ret));
-        goto end;
-    }
-    av_log(client, AV_LOG_TRACE, "Set reply code to %d\n", reply_code);
-
-    while ((ret = avio_handshake(client)) > 0);
-
-    if (ret < 0)
-        goto end;
-
-    fprintf(stderr, "Handshake performed.\n");
-    if (reply_code != 200)
-        goto end;
-    fprintf(stderr, "Opening input file.\n");
-    if ((ret = avio_open2(&input, in_uri, AVIO_FLAG_READ, NULL, NULL)) < 0) {
-        av_log(input, AV_LOG_ERROR, "Failed to open input: %s: %s.\n", in_uri,
-               av_err2str(ret));
-        goto end;
-    }
-    for(;;) {
-        n = avio_read(input, buf, sizeof(buf));
-        if (n < 0) {
-            if (n == AVERROR_EOF)
-                break;
-            av_log(input, AV_LOG_ERROR, "Error reading from input: %s.\n",
-                   av_err2str(n));
-            break;
-        }
-        avio_write(client, buf, n);
-        avio_flush(client);
-    }
-end:
-    fprintf(stderr, "Flushing client\n");
-    avio_flush(client);
-    fprintf(stderr, "Closing client\n");
-    avio_close(client);
-    fprintf(stderr, "Closing input\n");
-    avio_close(input);
-    av_freep(&resource);
-}
-
-int main(int argc, char **argv)
-{
-    AVDictionary *options = NULL;
-    AVIOContext *client = NULL, *server = NULL;
-    const char *in_uri, *out_uri;
-    int ret, pid;
-    av_log_set_level(AV_LOG_TRACE);
-    if (argc < 3) {
-        printf("usage: %s input http://hostname[:port]\n"
-               "API example program to serve http to multiple clients.\n"
-               "\n", argv[0]);
-        return 1;
-    }
-
-    in_uri = argv[1];
-    out_uri = argv[2];
-
-    avformat_network_init();
-
-    if ((ret = av_dict_set(&options, "listen", "2", 0)) < 0) {
-        fprintf(stderr, "Failed to set listen mode for server: %s\n", av_err2str(ret));
-        return ret;
-    }
-    if ((ret = avio_open2(&server, out_uri, AVIO_FLAG_WRITE, NULL, &options)) < 0) {
-        fprintf(stderr, "Failed to open server: %s\n", av_err2str(ret));
-        return ret;
-    }
-    fprintf(stderr, "Entering main loop.\n");
-    for(;;) {
-        if ((ret = avio_accept(server, &client)) < 0)
-            goto end;
-        fprintf(stderr, "Accepted client, forking process.\n");
-        // XXX: Since we don't reap our children and don't ignore signals
-        //      this produces zombie processes.
-        pid = fork();
-        if (pid < 0) {
-            perror("Fork failed");
-            ret = AVERROR(errno);
-            goto end;
-        }
-        if (pid == 0) {
-            fprintf(stderr, "In child.\n");
-            process_client(client, in_uri);
-            avio_close(server);
-            exit(0);
-        }
-        if (pid > 0)
-            avio_close(client);
-    }
-end:
-    avio_close(server);
-    if (ret < 0 && ret != AVERROR_EOF) {
-        fprintf(stderr, "Some errors occurred: %s\n", av_err2str(ret));
-        return 1;
-    }
-    return 0;
-}
--- a/doc/examples/hw_decode.c
+++ b/doc/examples/hw_decode.c
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2017 Jun Zhao
- * Copyright (c) 2017 Kaixuan Liu
- *
- * HW Acceleration API (video decoding) decode sample
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file
- * HW-Accelerated decoding example.
- *
- * @example hw_decode.c
- * This example shows how to do HW-accelerated decoding with output
- * frames from the HW video surfaces.
- */
-
-#include <stdio.h>
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/pixdesc.h>
-#include <libavutil/hwcontext.h>
-#include <libavutil/opt.h>
-#include <libavutil/avassert.h>
-#include <libavutil/imgutils.h>
-
-static AVBufferRef *hw_device_ctx = NULL;
-static enum AVPixelFormat hw_pix_fmt;
-static FILE *output_file = NULL;
-
-static int hw_decoder_init(AVCodecContext *ctx, const enum AVHWDeviceType type)
-{
-    int err = 0;
-
-    if ((err = av_hwdevice_ctx_create(&hw_device_ctx, type,
-                                      NULL, NULL, 0)) < 0) {
-        fprintf(stderr, "Failed to create specified HW device.\n");
-        return err;
-    }
-    ctx->hw_device_ctx = av_buffer_ref(hw_device_ctx);
-
-    return err;
-}
-
-static enum AVPixelFormat get_hw_format(AVCodecContext *ctx,
-                                        const enum AVPixelFormat *pix_fmts)
-{
-    const enum AVPixelFormat *p;
-
-    for (p = pix_fmts; *p != -1; p++) {
-        if (*p == hw_pix_fmt)
-            return *p;
-    }
-
-    fprintf(stderr, "Failed to get HW surface format.\n");
-    return AV_PIX_FMT_NONE;
-}
-
-static int decode_write(AVCodecContext *avctx, AVPacket *packet)
-{
-    AVFrame *frame = NULL, *sw_frame = NULL;
-    AVFrame *tmp_frame = NULL;
-    uint8_t *buffer = NULL;
-    int size;
-    int ret = 0;
-
-    ret = avcodec_send_packet(avctx, packet);
-    if (ret < 0) {
-        fprintf(stderr, "Error during decoding\n");
-        return ret;
-    }
-
-    while (1) {
-        if (!(frame = av_frame_alloc()) || !(sw_frame = av_frame_alloc())) {
-            fprintf(stderr, "Can not alloc frame\n");
-            ret = AVERROR(ENOMEM);
-            goto fail;
-        }
-
-        ret = avcodec_receive_frame(avctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-            av_frame_free(&frame);
-            av_frame_free(&sw_frame);
-            return 0;
-        } else if (ret < 0) {
-            fprintf(stderr, "Error while decoding\n");
-            goto fail;
-        }
-
-        if (frame->format == hw_pix_fmt) {
-            /* retrieve data from GPU to CPU */
-            if ((ret = av_hwframe_transfer_data(sw_frame, frame, 0)) < 0) {
-                fprintf(stderr, "Error transferring the data to system memory\n");
-                goto fail;
-            }
-            tmp_frame = sw_frame;
-        } else
-            tmp_frame = frame;
-
-        size = av_image_get_buffer_size(tmp_frame->format, tmp_frame->width,
-                                        tmp_frame->height, 1);
-        buffer = av_malloc(size);
-        if (!buffer) {
-            fprintf(stderr, "Can not alloc buffer\n");
-            ret = AVERROR(ENOMEM);
-            goto fail;
-        }
-        ret = av_image_copy_to_buffer(buffer, size,
-                                      (const uint8_t * const *)tmp_frame->data,
-                                      (const int *)tmp_frame->linesize, tmp_frame->format,
-                                      tmp_frame->width, tmp_frame->height, 1);
-        if (ret < 0) {
-            fprintf(stderr, "Can not copy image to buffer\n");
-            goto fail;
-        }
-
-        if ((ret = fwrite(buffer, 1, size, output_file)) < 0) {
-            fprintf(stderr, "Failed to dump raw data.\n");
-            goto fail;
-        }
-
-    fail:
-        av_frame_free(&frame);
-        av_frame_free(&sw_frame);
-        av_freep(&buffer);
-        if (ret < 0)
-            return ret;
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    AVFormatContext *input_ctx = NULL;
-    int video_stream, ret;
-    AVStream *video = NULL;
-    AVCodecContext *decoder_ctx = NULL;
-    AVCodec *decoder = NULL;
-    AVPacket packet;
-    enum AVHWDeviceType type;
-    int i;
-
-    if (argc < 4) {
-        fprintf(stderr, "Usage: %s <device type> <input file> <output file>\n", argv[0]);
-        return -1;
-    }
-
-    type = av_hwdevice_find_type_by_name(argv[1]);
-    if (type == AV_HWDEVICE_TYPE_NONE) {
-        fprintf(stderr, "Device type %s is not supported.\n", argv[1]);
-        fprintf(stderr, "Available device types:");
-        while((type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE)
-            fprintf(stderr, " %s", av_hwdevice_get_type_name(type));
-        fprintf(stderr, "\n");
-        return -1;
-    }
-
-    /* open the input file */
-    if (avformat_open_input(&input_ctx, argv[2], NULL, NULL) != 0) {
-        fprintf(stderr, "Cannot open input file '%s'\n", argv[2]);
-        return -1;
-    }
-
-    if (avformat_find_stream_info(input_ctx, NULL) < 0) {
-        fprintf(stderr, "Cannot find input stream information.\n");
-        return -1;
-    }
-
-    /* find the video stream information */
-    ret = av_find_best_stream(input_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &decoder, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Cannot find a video stream in the input file\n");
-        return -1;
-    }
-    video_stream = ret;
-
-    for (i = 0;; i++) {
-        const AVCodecHWConfig *config = avcodec_get_hw_config(decoder, i);
-        if (!config) {
-            fprintf(stderr, "Decoder %s does not support device type %s.\n",
-                    decoder->name, av_hwdevice_get_type_name(type));
-            return -1;
-        }
-        if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX &&
-            config->device_type == type) {
-            hw_pix_fmt = config->pix_fmt;
-            break;
-        }
-    }
-
-    if (!(decoder_ctx = avcodec_alloc_context3(decoder)))
-        return AVERROR(ENOMEM);
-
-    video = input_ctx->streams[video_stream];
-    if (avcodec_parameters_to_context(decoder_ctx, video->codecpar) < 0)
-        return -1;
-
-    decoder_ctx->get_format  = get_hw_format;
-
-    if (hw_decoder_init(decoder_ctx, type) < 0)
-        return -1;
-
-    if ((ret = avcodec_open2(decoder_ctx, decoder, NULL)) < 0) {
-        fprintf(stderr, "Failed to open codec for stream #%u\n", video_stream);
-        return -1;
-    }
-
-    /* open the file to dump raw data */
-    output_file = fopen(argv[3], "w+");
-
-    /* actual decoding and dump the raw data */
-    while (ret >= 0) {
-        if ((ret = av_read_frame(input_ctx, &packet)) < 0)
-            break;
-
-        if (video_stream == packet.stream_index)
-            ret = decode_write(decoder_ctx, &packet);
-
-        av_packet_unref(&packet);
-    }
-
-    /* flush the decoder */
-    packet.data = NULL;
-    packet.size = 0;
-    ret = decode_write(decoder_ctx, &packet);
-    av_packet_unref(&packet);
-
-    if (output_file)
-        fclose(output_file);
-    avcodec_free_context(&decoder_ctx);
-    avformat_close_input(&input_ctx);
-    av_buffer_unref(&hw_device_ctx);
-
-    return 0;
-}
--- a/doc/examples/metadata.c
+++ b/doc/examples/metadata.c
@@ -23,7 +23,6 @@
 /**
 * @file
 * Shows how the metadata API can be used in application programs.
- * @example metadata.c
 */

 #include <stdio.h>
@@ -44,17 +43,13 @@ int main (int argc, char **argv)
        return 1;
    }

+    av_register_all();
    if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL)))
        return ret;

-    if ((ret = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot find stream information\n");
-        return ret;
-    }
-
    while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
        printf("%s=%s\n", tag->key, tag->value);

-    avformat_close_input(&fmt_ctx);
+    avformat_free_context(fmt_ctx);
    return 0;
 }
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1.git
 .9.3