doc/t2h: Support texinfo 7.1 and 7.2 pretest

Here is a proposed patch for portability of doc/t2h.pm for GNU Texinfo 7.1 and 7.1.90 (7.2 pretest). I tested against 7.1 and 7.1.90 (7.2 pretest). There is a difference in the headings compared to the website version, maybe related to FA_ICONS not being set the same, but the result seems correct. I also renamed $element to $output_unit in ffmpeg_heading_command as in new equivalent makeinfo/texi2any code the $element variable is the $command variable in ffmpeg_heading_command, which is very confusing. I left as is the $command variable to have a patch easier to read, but it could make sense to rename $command as $element later on. The patch could also have effects with Texinfo 7.0, since some of the changes are for that version, but that probably never show up because it is for situations that may not exist in ffmpeg manuals (for example @node without sectioning command), or because the code is robust to some missing information (case of $heading_level in ffmpeg_heading_command that was not set, as far as I can tell). Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 4d9cdf82ee)
Update for 6.1.6
2026-06-21 21:20:25 +02:00 · 2026-06-20 21:45:17 +02:00 · 2026-06-20 17:42:28 +02:00 · 2026-06-20 17:42:28 +02:00 · 2026-06-20 17:42:28 +02:00 · 2026-06-20 17:42:28 +02:00
2286 changed files with 50498 additions and 117525 deletions
@@ -0,0 +1,23 @@
+exclude: ^tests/ref/
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+    - id: check-case-conflict
+    - id: check-executables-have-shebangs
+    - id: check-illegal-windows-names
+    - id: check-shebang-scripts-are-executable
+    - id: check-yaml
+    - id: end-of-file-fixer
+    - id: fix-byte-order-marker
+    - id: mixed-line-ending
+    - id: trailing-whitespace
+- repo: local
+  hooks:
+    - id: aarch64-asm-indent
+      name: fix aarch64 assembly indentation
+      files: ^.*/aarch64/.*\.S$
+      language: script
+      entry: ./tools/check_arm_indent.sh --apply
+      pass_filenames: false
@@ -0,0 +1,29 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - release/6.1
+  pull_request:
+
+jobs:
+  lint:
+    name: Pre-Commit
+    runs-on: utilities
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install pre-commit CI
+        id: install
+        run: |
+            python3 -m venv ~/pre-commit
+            ~/pre-commit/bin/pip install --upgrade pip setuptools
+            ~/pre-commit/bin/pip install pre-commit
+            echo "envhash=$({ python3 --version && cat .forgejo/pre-commit/config.yaml; } | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-${{ steps.install.outputs.envhash }}
+      - name: Run pre-commit CI
+        run: ~/pre-commit/bin/pre-commit run -c .forgejo/pre-commit/config.yaml --show-diff-on-failure --color=always --all-files
@@ -0,0 +1,80 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - release/6.1
+  pull_request:
+
+jobs:
+  run_fate:
+    name: Fate (${{ matrix.runner }}, ${{ matrix.shared }}, ${{ matrix.bits }} bit)
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [linux-aarch64]
+        shared: ['static']
+        bits: ['64']
+        include:
+          - runner: linux-amd64
+            shared: 'static'
+            bits: '32'
+          - runner: linux-amd64
+            shared: 'shared'
+            bits: '64'
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Configure
+        run: |
+          ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 \
+              $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) \
+              $([ "${{ matrix.shared }}" != "shared" ] || echo --enable-shared --disable-static) \
+              || CFGRES=$? && CFGRES=$?
+          cat ffbuild/config.log
+          exit $CFGRES
+      - name: Build
+        run: make -j$(nproc)
+      - name: Restore Cached Fate-Suite
+        id: cache
+        uses: actions/cache/restore@v4
+        with:
+          path: fate-suite
+          key: fate-suite
+          restore-keys: |
+            fate-suite-
+      - name: Sync Fate-Suite
+        id: fate
+        run: |
+          make fate-rsync SAMPLES=$PWD/fate-suite
+          echo "hash=$(find fate-suite -type f -printf "%P %s %T@\n" | sort | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT
+      - name: Cache Fate-Suite
+        uses: actions/cache/save@v4
+        if: ${{ format('fate-suite-{0}', steps.fate.outputs.hash) != steps.cache.outputs.cache-matched-key }}
+        with:
+          path: fate-suite
+          key: fate-suite-${{ steps.fate.outputs.hash }}
+      - name: Run Fate
+        run: LD_LIBRARY_PATH="$(printf "%s:" "$PWD"/lib*)$PWD" make fate fate-build SAMPLES=$PWD/fate-suite -j$(nproc)
+  compile_only:
+    name: Fate (Win64, Build-Only)
+    strategy:
+      fail-fast: false
+      matrix:
+        image: ["ghcr.io/btbn/ffmpeg-builds/win64-gpl-6.1:latest"]
+    runs-on: linux-amd64
+    container: ${{ matrix.image }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Configure
+        run: |
+          ./configure --pkg-config-flags="--static" $FFBUILD_TARGET_FLAGS $FF_CONFIGURE \
+              --cc="$CC" --cxx="$CXX" --ar="$AR" --ranlib="$RANLIB" --nm="$NM" \
+              --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" \
+              --extra-libs="$FF_LIBS" --extra-ldflags="$FF_LDFLAGS" --extra-ldexeflags="$FF_LDEXEFLAGS"
+      - name: Build
+        run: make -j$(nproc)
+      - name: Run Fate
+        run: make -j$(nproc) fate-build
@@ -1 +1,2 @@
 *.pnm -diff -text
+tests/ref/fate/sub-scc eol=crlf
@@ -1,8 +1,8 @@
 <jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
 <sw@jkqxz.net> <mrt@jkqxz.net>
 <u@pkh.me> <cboesch@gopro.com>
-<quinkblack@foxmail.com> <wantlamy@gmail.com>
-<quinkblack@foxmail.com> <zhilizhao@tencent.com>
+<zhilizhao@tencent.com> <quinkblack@foxmail.com>
+<zhilizhao@tencent.com> <wantlamy@gmail.com>
 <modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
 <stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
 <barryjzhao@tencent.com> <mypopydev@gmail.com>
@@ -17,10 +17,8 @@
 <atomnuker@gmail.com> <rpehlivanov@obe.tv>
 <lizhong1008@gmail.com> <zhong.li@intel.com>
 <lizhong1008@gmail.com> <zhongli_dev@126.com>
-<andreas.rheinhardt@outlook.com> <andreas.rheinhardt@gmail.com>
-<andreas.rheinhardt@outlook.com> <andreas.rheinhardt@googlemail.com>
+<andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
 rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
 <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>
-<lq@chinaffmpeg.org> <liuqi05@kuaishou.com>
+<liuqi05@kuaishou.com> <lq@chinaffmpeg.org>
 <ruiling.song83@gmail.com> <ruiling.song@intel.com>
-Cosmin Stejerean <cosmin@cosmin.at> Cosmin Stejerean via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -158,7 +158,7 @@ Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

                     END OF TERMS AND CONDITIONS
-
+
           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
@@ -15,3 +15,11 @@ NOTICE
 ------

 - Non system dependencies (e.g. libx264, libvpx) are disabled by default.
+
+NOTICE for Package Maintainers
+------------------------------
+
+ - It is recommended to build FFmpeg twice, first with minimal external dependencies so
+   that 3rd party packages, which depend on FFmpegs libavutil/libavfilter/libavcodec/libavformat
+   can then be built. And last build FFmpeg with full dependancies (which may in turn depend on
+   some of these 3rd party packages). This avoids circular dependencies during build.
@@ -34,8 +34,8 @@ Miscellaneous Areas
 ===================

 documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
-project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
+project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
+project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
@@ -144,6 +144,7 @@ Codecs:
  bgmc.c, bgmc.h                        Thilo Borgmann
  binkaudio.c                           Peter Ross
  cavs*                                 Stefan Gehrer
+  cdxl.c                                Paul B Mahol
  celp_filters.*                        Vitor Sessak
  cinepak.c                             Roberto Togni
  cinepakenc.c                          Rl / Aetey G.T. AB
@@ -162,6 +163,7 @@ Codecs:
  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
@@ -215,6 +217,7 @@ Codecs:
  nvdec*, nvenc*                        Timo Rothenpieler
  omx.c                                 Martin Storsjo, Aman Gupta
  opus*                                 Rostislav Pehlivanov
+  paf.*                                 Paul B Mahol
  pcx.c                                 Ivo van Poorten
  pgssubdec.c                           Reimar Doeffinger
  ptx.c                                 Ivo van Poorten
@@ -228,6 +231,7 @@ Codecs:
  rpza.c                                Roberto Togni
  rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
  rv10.c                                Michael Niedermayer
+  s3tc*                                 Ivo van Poorten
  smc.c                                 Mike Melanson
  snow*                                 Michael Niedermayer, Loren Merritt
  sonic.c                               Alex Beregszaszi
@@ -235,13 +239,16 @@ Codecs:
  srt*                                  Aurelien Jacobs
  sunrast.c                             Ivo van Poorten
  svq3.c                                Michael Niedermayer
+  tak*                                  Paul B Mahol
  truemotion1*                          Mike Melanson
  tta.c                                 Alex Beregszaszi, Jaikrishnan Menon
+  ttaenc.c                              Paul B Mahol
  txd.c                                 Ivo van Poorten
  v4l2_*                                Jorge Ramirez-Ortiz
  vc2*                                  Rostislav Pehlivanov
  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
  vp3*                                  Mike Melanson
@@ -250,21 +257,22 @@ Codecs:
  vp8                                   David Conrad, Ronald Bultje
  vp9                                   Ronald Bultje
  vqavideo.c                            Mike Melanson
-  vvc                                   Nuo Mi
  wmaprodec.c                           Sascha Sommer
  wmavoice.c                            Ronald S. Bultje
  wmv2.c                                Michael Niedermayer
  xan.c                                 Mike Melanson
+  xbm*                                  Paul B Mahol
  xface                                 Stefano Sabatini
+  xwd*                                  Paul B Mahol

 Hardware acceleration:
  dxva2*                                Hendrik Leppkes, Laurent Aimar, Steve Lhomme
  d3d11va*                              Steve Lhomme
-  mediacodec*                           Matthieu Bouron, Aman Gupta, Zhao Zhili
+  mediacodec*                           Matthieu Bouron, Aman Gupta
  vaapi*                                Haihao Xiang
  vaapi_encode*                         Mark Thompson, Haihao Xiang
  vdpau*                                Philip Langdale, Carl Eugen Hoyos
-  videotoolbox*                         Rick Kern, Aman Gupta, Zhao Zhili
+  videotoolbox*                         Rick Kern, Aman Gupta


 libavdevice
@@ -299,34 +307,64 @@ Generic parts:
  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_fsync.c                            Thilo Borgmann
+  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_libplacebo.c                       Niklas Haas
+  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:
  vsrc_mandelbrot.c                     Michael Niedermayer
@@ -348,6 +386,7 @@ 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
  alp.c                                 Zane van Iperen
@@ -358,12 +397,16 @@ Muxers/Demuxers:
  argo_brp.c                            Zane van Iperen
  argo_cvg.c                            Zane van Iperen
  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
@@ -372,9 +415,10 @@ Muxers/Demuxers:
  dfpwmdec.c                            Jack Bruienne
  dss.c                                 Oleksij Rempel
  dtsdec.c                              foo86
+  dtshddec.c                            Paul B Mahol
  dv.c                                  Roman Shaposhnik
-  dvdvideodec.c                         Marth64
  electronicarts.c                      Peter Ross
+  epafdec.c                             Paul B Mahol
  evc*                                  Samsung (Dawid Kozinski)
  ffm*                                  Baptiste Coudurier
  flic.c                                Mike Melanson
@@ -389,6 +433,7 @@ Muxers/Demuxers:
  imf*                                  Pierre-Anthony Lemieux
  img2*.c                               Michael Niedermayer
  ipmovie.c                             Mike Melanson
+  ircam*                                Paul B Mahol
  iss.c                                 Stefan Gehrer
  jpegxl*                               Leo Izen
  jvdec.c                               Peter Ross
@@ -396,12 +441,14 @@ Muxers/Demuxers:
  libmodplug.c                          Clément Bœsch
  libopenmpt.c                          Josh de Kock
  lmlm4.c                               Ivo van Poorten
+  lvfdec.c                              Paul B Mahol
  lxfdec.c                              Tomas Härdin
  matroska.c                            Aurelien Jacobs, Andreas Rheinhardt
  matroskadec.c                         Aurelien Jacobs, Andreas Rheinhardt
  matroskaenc.c                         David Conrad, Andreas Rheinhardt
  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
@@ -414,6 +461,7 @@ Muxers/Demuxers:
  msnwc_tcp.c                           Ramiro Polla
  mtv.c                                 Reynaldo H. Verdejo Pinochet
  mxf*                                  Baptiste Coudurier, Tomas Härdin
+  nistspheredec.c                       Paul B Mahol
  nsvdec.c                              Francois Revol
  nut*                                  Michael Niedermayer
  nuv.c                                 Reimar Doeffinger
@@ -421,12 +469,13 @@ Muxers/Demuxers:
  oggenc.c                              Baptiste Coudurier
  oggparse*.c                           David Conrad
  oma.c                                 Maxim Poliakovski
+  paf.c                                 Paul B Mahol
  pp_bnk.c                              Zane van Iperen
  psxstr.c                              Mike Melanson
  pva.c                                 Ivo van Poorten
+  pvfdec.c                              Paul B Mahol
  r3d.c                                 Baptiste Coudurier
  raw.c                                 Michael Niedermayer
-  rcwtenc.c                             Marth64
  rdt.c                                 Ronald S. Bultje
  rl2.c                                 Sascha Sommer
  rmdec.c, rmenc.c                      Ronald S. Bultje
@@ -445,9 +494,11 @@ Muxers/Demuxers:
  sdp.c                                 Martin Storsjo
  segafilm.c                            Mike Melanson
  segment.c                             Stefano Sabatini
+  smjpeg*                               Paul B Mahol
  spdif*                                Anssi Hannula
  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
@@ -457,6 +508,7 @@ Muxers/Demuxers:
  webvtt*                               Matthew J Heaney
  westwood.c                            Mike Melanson
  wtv.c                                 Peter Ross
+  wvenc.c                               Paul B Mahol

 Protocols:
  async.c                               Zhang Rui
@@ -497,7 +549,8 @@ Linux / PowerPC                         Lauri Kasanen
 RISC-V                                  Rémi Denis-Courmont
 Windows MinGW                           Alex Beregszaszi, Ramiro Polla
 Windows Cygwin                          Victor Paesa
-Windows MSVC                            Hendrik Leppkes
+Windows MSVC                            Matthew Oliver, Hendrik Leppkes
+Windows ICL                             Matthew Oliver
 ADI/Blackfin DSP                        Marc Hoffman
 Sparc                                   Roman Shaposhnik
 OS/2                                    KO Myung-Hun
@@ -535,10 +588,12 @@ wm4
 Releases
 ========

+7.0                                     Michael Niedermayer
+6.1                                     Michael Niedermayer
+5.1                                     Michael Niedermayer
+4.4                                     Michael Niedermayer
+3.4                                     Michael Niedermayer
 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

@@ -566,7 +621,6 @@ 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
 Leo Izen (Traneptora)         B6FD 3CFC 7ACF 83FC 9137 6945 5A71 C331 FD2F A19A
-Leo Izen (Traneptora)         1D83 0A0B CE46 709E 203B 26FC 764E 48EA 4822 1833
 Loren Merritt                 ABD9 08F4 C920 3F65 D8BE 35D7 1540 DAA7 060F 56DE
 Lynne                         FE50 139C 6805 72CA FD52 1F8D A2FE A5F0 3F03 4464
 Michael Niedermayer           9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB
@@ -64,9 +64,6 @@ tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
 tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)

-tools/target_sws_fuzzer$(EXESUF): tools/target_sws_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-

 tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/enum_options$(EXESUF): $(FF_DEP_LIBS)
@@ -136,18 +133,13 @@ endif
 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)

 VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh
-ifeq ($(VERSION_TRACKING),yes)
 GIT_LOG     = $(SRC_PATH)/.git/logs/HEAD
-endif

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

-ifneq ($(VERSION_TRACKING),yes)
-libavutil/ffversion.h .version: REVISION=unknown
-endif
 libavutil/ffversion.h .version:
-	$(M)revision=$(REVISION) $(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
+	$(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION)
 	$(Q)touch .version

 # force version.sh to run whenever version might have changed
@@ -1 +1 @@
-5.1.git
+6.1.6
@@ -0,0 +1,15 @@
+
+            ┌──────────────────────────────────────────┐
+            │ RELEASE NOTES for FFmpeg 6.1 "Heaviside" │
+            └──────────────────────────────────────────┘
+
+   The FFmpeg Project proudly presents FFmpeg 6.1 "Heaviside", about 8
+   months after the release of FFmpeg 6.0.
+
+   A complete Changelog is available at the root of the project, and the
+   complete Git history on https://git.ffmpeg.org/gitweb/ffmpeg.git
+
+   We hope you will like this release as much as we enjoyed working on it, and
+   as usual, if you have any questions about it, or any FFmpeg related topic,
+   feel free to join us on the #ffmpeg IRC channel (on irc.libera.chat) or ask
+   on the mailing-lists.
@@ -1,136 +1,7 @@
-The last version increases of all libraries were on 2024-03-07
+The last version increases of all libraries were on 2023-02-09

 API changes, most recent first:

-------- 8< --------- FFmpeg 7.0 was cut here -------- 8< ---------
-
-2024-03-25 - 5df901ffa56 - lavu 59.7.100 - timestamp.h
-  Add av_ts_make_time_string2() for better timestamp precision, the new
-  function accepts AVRational as time base instead of *AVRational, and is not
-  an inline function like its predecessor.
-
-2024-03-23 - a9023377b22 - lavu 59.6.100 - film_grain_params.h
-  Add av_film_grain_params_select().
-
-2024-03-23 - 35d2960dcd0 - lavu 59.5.100 - film_grain_params.h
-  Add AVFilmGrainParams.color_range, color_primaries, color_trc, color_space,
-  width, height, subsampling_x, subsampling_y, bit_depth_luma and
-  bit_depth_chroma. Deprecate the corresponding fields from
-  AVFilmGrainH274Params.
-
-2024-03-23 - f17e18d2922 - lavc 61.3.100 - jni.h
-  Add av_jni_set_android_app_ctx() and av_jni_get_android_app_ctx().
-
-2024-03-22 - 26398da8f30 - lavu 59.4.100 - frame.h
-  Constified the first-level pointee of av_frame_side_data_get()
-  and renamed it to av_frame_side_data_get_c(). From now on,
-  av_frame_side_data_get() is a wrapper around av_frame_side_data_get_c()
-  that accepts AVFrameSideData * const *sd.
-
-2024-03-20 - 0d36844ddf9 - lavc 61.2.100 - avcodec.h
-  Add AVCodecContext.[nb_]decoded_side_data.
-
-2024-03-20 - d9ade14c5c5 - lavu 59.3.100 - frame.h
-  Add av_frame_side_data_free(), av_frame_side_data_new(),
-  av_frame_side_data_clone(), av_frame_side_data_get() as well
-  as AV_FRAME_SIDE_DATA_FLAG_UNIQUE.
-
-2024-03-16 - ed6207274e6 - lavu 59.2.100 - channel_layout.h
-  Add AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL.
-
-2024-03-08 - 68a8eca7523 - lavc 61.1.100 - avcodec.h
-  Add AVCodecContext.[nb_]side_data_prefer_packet.
-
-2024-03-08 - efe44787781 - lavu 59.1.100 - opt.h
-  Add AV_OPT_TYPE_FLAG_ARRAY and AVOptionArrayDef.
-
-2024-03-08 - c9f5cea9cca - lavc 61.0.100 - vdpau.h
-  Deprecate av_vdpau_alloc_context(), av_alloc_vdpaucontext(),
-  av_vdpau_hwaccel_get_render2() and av_vdpau_hwaccel_set_render2().
-  The former are superseded by av_vdpau_bind_context(), the latter
-  are unneeded as the relevant field is public and can be accessed directly.
-
-2024-03-06 - 49707b05900 - lavf 60.25.100 - avformat.h
-  Deprecate av_fmt_ctx_get_duration_estimation_method().
-  The relevant field is public and needs no getter to access.
-
-2024-03-05 - ab15c04dee5 - lavf 60.24.100 - avformat.h
-  Add avformat_stream_group_name().
-
-2024-02-28 - b295aafb082 - swr   4.14.100 - swresample.h
-  swr_convert() now accepts arrays of const pointers (to input and output).
-
-2024-02-28 - 58e3ef7f546 - lavu 58.40.100 - timestamp.h
-  av_ts_make_time_string() now accepts a pointer to const AVRational.
-
-2024-02-28 - dfb9d8a5a2f - lavf 60.23.100 - avio.h
-  avio_print_string_array() now accepts an array of const pointers.
-
-2024-02-26 - 41e349c24a7 - lavf 60.22.101 - avformat.h
-  AV_DISPOSITION_DEPENDENT may now also be used for video streams
-  intended to be merged with other video streams for presentation.
-
-2024-02-26 - 25a10677d12 - lavf 60.22.100 - avformat.h
-  Add AVStreamGroupTileGrid
-  Add AV_STREAM_GROUP_PARAMS_TILE_GRID
-  Add AVStreamGroup.params.tile_grid
-
-2024-02-21 - 1d66a122df9 - lavc 60.40.100 - avcodec.h
-  Deprecate AV_INPUT_BUFFER_MIN_SIZE without replacement.
-
-2024-02-16 - eea9bd88a5f - lavu 58.39.100 - pixfmt.h
-  Add AV_VIDEO_MAX_PLANES
-
-2024-02-13 - ec2036454bc - lavf 60.21.100 - avformat.h
-  Add AVStreamGroup.disposition.
-
-2024-02-12 - 66386bf2a2a - lavu 58.38.100 - channel_layout.h
-  Add av_channel_layout_retype().
-
-2024-02-12 - 4569b861322 - lavu 58.37.100 - channel_layout.h
-  Add av_channel_layout_custom_init().
-
-2024-02-04 - 45697e6a512 - lavc 60.39.100 - packet.h
-  Add AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT.
-
-2023-11-xx - xxxxxxxxxx - lavfi 9.16.100 - buffersink.h buffersrc.h
-  Add av_buffersink_get_colorspace and av_buffersink_get_color_range.
-  Add AVBufferSrcParameters.color_space and AVBufferSrcParameters.color_range.
-
-2023-11-xx - xxxxxxxxxx - lavfi 9.15.100 - avfilter.h
-  Add AVFilterLink.colorspace, AVFilterLink.color_range
-
-2023-12-21 - 142f727b9ca - lavu 58.36.100 - pixfmt.h hwcontext.h hwcontext_d3d12va.h
-  Add AV_HWDEVICE_TYPE_D3D12VA and AV_PIX_FMT_D3D12.
-  Add AVD3D12VADeviceContext, AVD3D12VASyncContext, AVD3D12VAFrame and
-  AVD3D12VAFramesContext.
-
-2023-12-18 - 74279227dd2 - lavc 60.36.100 - packet.h
-  Add AV_PKT_DATA_IAMF_MIX_GAIN_PARAM, AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM
-  and AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM.
-
-2023-12-18 - 556b596d1d9 - lavc 60.19.100 - avformat.h
-  Add AVStreamGroup struct.
-  Add AVFormatContext.stream_groups and AVFormatContext.nb_stream_groups
-  Add avformat_stream_group_create(), avformat_stream_group_add_stream(),
-  and av_stream_group_get_class().
-  Add enum AVStreamGroupParamsType with values AV_STREAM_GROUP_PARAMS_NONE,
-  AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT and
-  AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION.
-
-2023-12-18 - d2af93bbefc - lavu 58.35.100 - iamf.h
-  Add a new API to support Immersive Audio Model and Formats.
-
-2023-12-13 - 5475f665f60 - lavu 58.33.100 - imgutils.h
-  Add av_image_fill_color().
-
-2023-11-08 - b82957a66a7 - lavu 58.32.100 - channel_layout.h
-  Add AV_CH_LAYOUT_7POINT2POINT3 and AV_CHANNEL_LAYOUT_7POINT2POINT3.
-  Add AV_CH_LAYOUT_9POINT1POINT4_BACK and AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK.
-
-2023-10-31 - 57c16323f26 - lavu 58.31.100 - pixdesc.h
-  Add AV_PIX_FMT_FLAG_XYZ.
-
 -------- 8< --------- FFmpeg 6.1 was cut here -------- 8< ---------

 2023-10-27 - 52a97642604 - lavu 58.28.100 - channel_layout.h
@@ -38,7 +38,7 @@ PROJECT_NAME           = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 6.1.6

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -199,13 +199,6 @@ Identical to @option{pass_types}, except the units in the given set
 removed and all others passed through.
@end table

-The types used by pass_types and remove_types correspond to NAL unit types
-(nal_unit_type) in H.264, HEVC and H.266 (see Table 7-1 in the H.264
-and HEVC specifications or Table 5 in the H.266 specification), to
-marker values for JPEG (without 0xFF prefix) and to start codes without
-start code prefix (i.e. the byte following the 0x000001) for MPEG-2.
-For VP8 and VP9, every unit has type zero.
-
 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.
@@ -220,21 +213,6 @@ To remove all AUDs, SEI and filler from an H.265 stream:
 ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=35|38-40' OUTPUT
@end example

-To remove all user data from a MPEG-2 stream, including Closed Captions:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=178' OUTPUT
-@end example
-
-To remove all SEI from a H264 stream, including Closed Captions:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=6' OUTPUT
-@end example
-
-To remove all prefix and suffix SEI from a HEVC stream, including Closed Captions and dynamic HDR:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=39|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.
@@ -550,6 +528,10 @@ 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.
@@ -900,15 +882,6 @@ The sample rate of stream packet belongs.
 The AV_NOPTS_VALUE constant.
@end table

-For example, to set PTS equal to DTS (not recommended if B-frames are involved):
-@example
-ffmpeg -i INPUT -c:a copy -bsf:a setts=pts=DTS out.mkv
-@end example
-
-@section showinfo
-Log basic packet information. Mainly useful for testing, debugging,
-and development.
-
@anchor{text2movsub}
@section text2movsub

@@ -63,4 +63,3 @@ make -j<num>
 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.
-
@@ -3,7 +3,7 @@
@c man begin CODEC OPTIONS

 libavcodec provides some generic global options, which can be set on
-all the encoders and decoders. In addition, each codec may support
+all the encoders and decoders. In addition each codec may support
 so-called private options, which are specific for a given codec.

 Sometimes, a global option may only affect a specific kind of codec,
@@ -767,9 +767,15 @@ Set rate-distortion optimal quantization.
@item compression_level @var{integer} (@emph{encoding,audio,video})
@item bits_per_raw_sample @var{integer}
@item channel_layout @var{integer} (@emph{decoding/encoding,audio})
-See @ref{channel layout syntax,,the Channel Layout section in the ffmpeg-utils(1) manual,ffmpeg-utils}
-for the required syntax.

+Possible values:
+@table @samp
+@end table
+@item request_channel_layout @var{integer} (@emph{decoding,audio})
+
+Possible values:
+@table @samp
+@end table
@item rc_max_vbv_use @var{float} (@emph{encoding,video})
@item rc_min_vbv_use @var{float} (@emph{encoding,video})

@@ -26,9 +26,7 @@ The General Assembly is sovereign and legitimate for all its decisions regarding

 The General Assembly is made up of active contributors.

-Contributors are considered "active contributors" if they have authored more than 20 patches in the last 36 months in the main FFmpeg repository, or if they have been voted in by the GA.
-
-The list of active contributors is updated twice each year, on 1st January and 1st July, 0:00 UTC.
+Contributors are considered "active contributors" if they have pushed more than 20 patches in the last 36 months in the main FFmpeg repository, or if they have been voted in by the GA.

 Additional members are added to the General Assembly through a vote after proposal by a member of the General Assembly. They are part of the GA for two years, after which they need a confirmation by the GA.

@@ -130,30 +130,6 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto

@end table

-@section libxevd
-
-eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper.
-
-This decoder requires the presence of the libxevd headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-libxevd}.
-
-The xevd project website is at @url{https://github.com/mpeg5/xevd}.
-
-@subsection Options
-
-The following options are supported by the libxevd wrapper.
-The xevd-equivalent options or values are listed in parentheses for easy migration.
-
-To get a more accurate and extensive documentation of the libxevd options,
-invoke the command  @code{xevd_app --help} or consult the libxevd documentation.
-
-@table @option
-@item threads (@emph{threads})
-Force to use a specific number of threads
-
-@end table
-
@section QSV Decoders

 The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC,
@@ -285,168 +285,6 @@ This demuxer accepts the following option:

@end table

-@section dvdvideo
-
-DVD-Video demuxer, powered by libdvdnav and libdvdread.
-
-Can directly ingest DVD titles, specifically sequential PGCs, into
-a conversion pipeline. Menu assets, such as background video or audio,
-can also be demuxed given the menu's coordinates (at best effort).
-Seeking is not supported at this time.
-
-Block devices (DVD drives), ISO files, and directory structures are accepted.
-Activate with @code{-f dvdvideo} in front of one of these inputs.
-
-This demuxer does NOT have decryption code of any kind. You are on your own
-working with encrypted DVDs, and should not expect support on the matter.
-
-Underlying playback is handled by libdvdnav, and structure parsing by libdvdread.
-FFmpeg must be built with GPL library support available as well as the
-configure switches @code{--enable-libdvdnav} and @code{--enable-libdvdread}.
-
-You will need to provide either the desired "title number" or exact PGC/PG coordinates.
-Many open-source DVD players and tools can aid in providing this information.
-If not specified, the demuxer will default to title 1 which works for many discs.
-However, due to the flexibility of the format, it is recommended to check manually.
-There are many discs that are authored strangely or with invalid headers.
-
-If the input is a real DVD drive, please note that there are some drives which may
-silently fail on reading bad sectors from the disc, returning random bits instead
-which is effectively corrupt data. This is especially prominent on aging or rotting discs.
-A second pass and integrity checks would be needed to detect the corruption.
-This is not an FFmpeg issue.
-
-@subsection Background
-
-DVD-Video is not a directly accessible, linear container format in the
-traditional sense. Instead, it allows for complex and programmatic playback of
-carefully muxed MPEG-PS streams that are stored in headerless VOB files.
-To the end-user, these streams are known simply as "titles", but the actual
-logical playback sequence is defined by one or more "PGCs", or Program Group Chains,
-within the title. The PGC is in turn comprised of multiple "PGs", or Programs",
-which are the actual video segments (and for a typical video feature, sequentially
-ordered). The PGC structure, along with stream layout and metadata, are stored in
-IFO files that need to be parsed. PGCs can be thought of as playlists in easier terms.
-
-An actual DVD player relies on user GUI interaction via menus and an internal VM
-to drive the direction of demuxing. Generally, the user would either navigate (via menus)
-or automatically be redirected to the PGC of their choice. During this process and
-the subsequent playback, the DVD player's internal VM also maintains a state and
-executes instructions that can create jumps to different sectors during playback.
-This is why libdvdnav is involved, as a linear read of the MPEG-PS blobs on the
-disc (VOBs) is not enough to produce the right sequence in many cases.
-
-There are many other DVD structures (a long subject) that will not be discussed here.
-NAV packets, in particular, are handled by this demuxer to build accurate timing
-but not emitted as a stream. For a good high-level understanding, refer to:
-@url{https://code.videolan.org/videolan/libdvdnav/-/blob/master/doc/dvd_structures}
-
-@subsection Options
-
-This demuxer accepts the following options:
-
-@table @option
-
-@item title @var{int}
-The title number to play. Must be set if @option{pgc} and @option{pg} are not set.
-Not applicable to menus.
-Default is 0 (auto), which currently only selects the first available title (title 1)
-and notifies the user about the implications.
-
-@item chapter_start @var{int}
-The chapter, or PTT (part-of-title), number to start at. Not applicable to menus.
-Default is 1.
-
-@item chapter_end @var{int}
-The chapter, or PTT (part-of-title), number to end at. Not applicable to menus.
-Default is 0, which is a special value to signal end at the last possible chapter.
-
-@item angle @var{int}
-The video angle number, referring to what is essentially an additional
-video stream that is composed from alternate frames interleaved in the VOBs.
-Not applicable to menus.
-Default is 1.
-
-@item region @var{int}
-The region code to use for playback. Some discs may use this to default playback
-at a particular angle in different regions. This option will not affect the region code
-of a real DVD drive, if used as an input. Not applicable to menus.
-Default is 0, "world".
-
-@item menu @var{bool}
-Demux menu assets instead of navigating a title. Requires exact coordinates
-of the menu (@option{menu_lu}, @option{menu_vts}, @option{pgc}, @option{pg}).
-Default is false.
-
-@item menu_lu @var{int}
-The menu language to demux. In DVD, menus are grouped by language.
-Default is 0, the first language unit.
-
-@item menu_vts @var{int}
-The VTS where the menu lives, or 0 if it is a VMG menu (root-level).
-Default is 0, VMG menu.
-
-@item pgc @var{int}
-The entry PGC to start playback, in conjunction with @option{pg}.
-Alternative to setting @option{title}.
-Chapter markers are not supported at this time.
-Must be explicitly set for menus.
-Default is 0, automatically resolve from value of @option{title}.
-
-@item pg @var{int}
-The entry PG to start playback, in conjunction with @option{pgc}.
-Alternative to setting @option{title}.
-Chapter markers are not supported at this time.
-Default is 0, automatically resolve from value of @option{title}, or
-start from the beginning (PG 1) of the menu.
-
-@item preindex @var{bool}
-Enable this to have accurate chapter (PTT) markers and duration measurement,
-which requires a slow second pass read in order to index the chapter marker
-timestamps from NAV packets. This is non-ideal extra work for real optical drives.
-It is recommended and faster to use this option with a backup of the DVD structure
-stored on a hard drive. Not compatible with @option{pgc} and @option{pg}.
-Not applicable to menus.
-Default is 0, false.
-
-@item trim @var{bool}
-Skip padding cells (i.e. cells shorter than 1 second) from the beginning.
-There exist many discs with filler segments at the beginning of the PGC,
-often with junk data intended for controlling a real DVD player's
-buffering speed and with no other material data value.
-Not applicable to menus.
-Default is 1, true.
-
-@end table
-
-@subsection Examples
-
-@itemize
-@item
-Open title 3 from a given DVD structure:
-@example
-ffmpeg -f dvdvideo -title 3 -i <path to DVD> ...
-@end example
-
-@item
-Open chapters 3-6 from title 1 from a given DVD structure:
-@example
-ffmpeg -f dvdvideo -chapter_start 3 -chapter_end 6 -title 1 -i <path to DVD> ...
-@end example
-
-@item
-Open only chapter 5 from title 1 from a given DVD structure:
-@example
-ffmpeg -f dvdvideo -chapter_start 5 -chapter_end 5 -title 1 -i <path to DVD> ...
-@end example
-
-@item
-Demux menu with language 1 from VTS 1, PGC 1, starting at PG 1:
-@example
-ffmpeg -f dvdvideo -menu 1 -menu_lu 1 -menu_vts 1 -pgc 1 -pg 1 -i <path to DVD> ...
-@end example
-@end itemize
-
@section ea

 Electronic Arts Multimedia format demuxer.
@@ -567,6 +405,13 @@ prefer to use #EXT-X-START if it's in playlist instead of live_start_index.
@item allowed_extensions
 ',' separated list of file extensions that hls is allowed to access.

+@item extension_picky
+This blocks disallowed extensions from probing
+It also requires all available segments to have matching extensions to the format
+except mpegts, which is always allowed.
+It is recommended to set the whitelists correctly instead of depending on extensions
+Enabled by default.
+
@item max_reload
 Maximum number of times a insufficient list is attempted to be reloaded.
 Default value is 1000.
@@ -939,7 +784,7 @@ error or used to store a negative value for dts correction when treated as signe
 the user set an upper limit, beyond which the delta is clamped to 1. Values greater than the limit if negative when
 cast to int32 are used to adjust onward dts.

-Unit is the track time scale. Range is 0 to UINT_MAX. Default is @code{UINT_MAX - 48000*10} which allows up to
+Unit is the track time scale. Range is 0 to UINT_MAX. Default is @code{UINT_MAX - 48000*10} which allows upto
 a 10 second dts correction for 48 kHz audio streams while accommodating 99.9% of @code{uint32} range.

@item interleaved_read
@@ -1105,27 +950,4 @@ which in turn, acts as a ceiling for the size of scripts that can be read.
 Default is 1 MiB.
@end table

-@section w64
-
-Sony Wave64 Audio demuxer.
-
-This demuxer accepts the following options:
-@table @option
-@item max_size
-See the same option for the @ref{wav} demuxer.
-@end table
-
-@anchor{wav}
-@section wav
-
-RIFF Wave Audio demuxer.
-
-This demuxer accepts the following options:
-@table @option
-@item max_size
-Specify the maximum packet size in bytes for the demuxed packets. By default
-this is set to 0, which means that a sensible value is chosen based on the
-input format.
-@end table
-
@c man end DEMUXERS
@@ -56,8 +56,14 @@ and should try to fix issues their commit causes.

@section Language

-FFmpeg is mainly programmed in the ISO C11 language, except for the public
-headers which must stay C99 compatible.
+FFmpeg is mainly programmed in the ISO C99 language, extended with:
+@itemize @bullet
+@item
+Atomic operations from C11 @file{stdatomic.h}. They are emulated on
+architectures/compilers that do not support them, so all FFmpeg-internal code
+may use atomics without any extra checks. However, @file{stdatomic.h} must not
+be included in public headers, so they stay C99-compatible.
+@end itemize

 Compiler-specific extensions may be used with good reason, but must not be
 depended on, i.e. the code must still compile and work with compilers lacking
@@ -93,7 +99,7 @@ The specific syntax used for writing assembly is:
 NASM on x86;

@item
-GAS on ARM and RISC-V.
+GAS on ARM.
@end itemize

 A unit testing framework for assembly called @code{checkasm} lives under
@@ -390,6 +396,10 @@ If you apply a patch, send an
 answer to ffmpeg-devel (or wherever you got the patch from) saying that
 you applied the patch.

+@subheading Credit any researchers
+If a commit/patch fixes an issues found by some researcher, always credit the
+researcher in the commit message for finding/reporting the issue.
+
@subheading Always wait long enough before pushing changes
 Do NOT commit to code actively maintained by others without permission.
 Send a patch to ffmpeg-devel. If no one answers within a reasonable
@@ -634,6 +644,11 @@ patch is inline or attached per mail.
 You can check @url{https://patchwork.ffmpeg.org}, if your patch does not show up, its mime type
 likely was wrong.

+@subheading How to setup git send-email?
+
+Please see @url{https://git-send-email.io/}.
+For gmail additionally see @url{https://shallowsky.com/blog/tech/email/gmail-app-passwds.html}.
+
@subheading Sending patches from email clients
 Using @code{git send-email} might not be desirable for everyone. The
 following trick allows to send patches via email clients in a safe
@@ -918,6 +933,25 @@ In case you need finer control over how valgrind is invoked, use the
@code{--target-exec='valgrind <your_custom_valgrind_options>} option in
 your configure line instead.

+@anchor{Maintenance}
+@chapter Maintenance process
+
+@anchor{MAINTAINERS}
+@section MAINTAINERS
+
+The developers maintaining each part of the codebase are listed in @file{MAINTAINERS}.
+Being listed in @file{MAINTAINERS}, gives one the right to have git write access to
+the specific repository.
+
+@anchor{Becoming a maintainer}
+@section Becoming a maintainer
+
+People add themselves to @file{MAINTAINERS} by sending a patch like any other code
+change. These get reviewed by the community like any other patch. It is expected
+that, if someone has an objection to a new maintainer, she is willing to object
+in public with her full name and is willing to take over maintainership for the area.
+
+
@anchor{Release process}
@chapter Release process

@@ -615,7 +615,7 @@ and slightly improves compression.

 Opus encoder.

-This is a native FFmpeg encoder for the Opus format. Currently, it's in development and
+This is a native FFmpeg encoder for the Opus format. Currently its in development and
 only implements the CELT part of the codec. Its quality is usually worse and at best
 is equal to the libopus encoder.

@@ -2237,12 +2237,6 @@ the two temporal layer 2 frames within the temporal period.
@end table
@end table

-@item VP8-specific options
-@table @option
-@item screen-content-mode
-Screen content mode, one of: 0 (off), 1 (screen), 2 (screen with more aggressive rate control).
-@end table
-
@item VP9-specific options
@table @option
@item lossless
@@ -2427,10 +2421,6 @@ To get a more accurate and extensive documentation of the libx264
 options, invoke the command @command{x264 --fullhelp} or consult
 the libx264 documentation.

-In the list below, note that the @command{x264} option name is shown
-in parentheses after the libavcodec corresponding name, in case there
-is a direct mapping.
-
@table @option
@item b (@emph{bitrate})
 Set bitrate in bits/s. Note that FFmpeg's @option{b} option is
@@ -2438,19 +2428,17 @@ expressed in bits/s, while @command{x264}'s @option{bitrate} is in
 kilobits/s.

@item bf (@emph{bframes})
-Number of B-frames between I and P-frames

@item g (@emph{keyint})
-Maximum GOP size

@item qmin (@emph{qpmin})
-Minimum quantizer scale
+Minimum quantizer scale.

@item qmax (@emph{qpmax})
-Maximum quantizer scale
+Maximum quantizer scale.

@item qdiff (@emph{qpstep})
-Maximum difference between quantizer scales
+Maximum difference between quantizer scales.

@item qblur (@emph{qblur})
 Quantizer curve blur
@@ -2459,7 +2447,7 @@ Quantizer curve blur
 Quantizer curve compression factor

@item refs (@emph{ref})
-Number of reference frames each P-frame can use. The range is @var{0-16}.
+Number of reference frames each P-frame can use. The range is from @var{0-16}.

@item level (@emph{level})
 Set the @code{x264_param_t.i_level_idc} value in case the value is
@@ -2481,8 +2469,7 @@ Sets the threshold for the scene change detection.
@item trellis (@emph{trellis})
 Performs Trellis quantization to increase efficiency. Enabled by default.

-@item nr (@emph{nr})
-Noise reduction
+@item nr  (@emph{nr})

@item me_range (@emph{merange})
 Maximum range of the motion search in pixels.
@@ -2563,7 +2550,6 @@ open GOP by setting it to @code{-cgop}. The result is similar to
 the behavior of @command{x264}'s @option{--open-gop} option.

@item rc_init_occupancy (@emph{vbv-init})
-Initial VBV buffer occupancy

@item preset (@emph{preset})
 Set the encoding preset.
@@ -2609,7 +2595,7 @@ Set AQ strength, reduce blocking and blurring in flat and textured areas.
 Use psychovisual optimizations when set to 1. When set to 0, it has the
 same effect as @command{x264}'s @option{--no-psy} option.

-@item psy-rd (@emph{psy-rd})
+@item psy-rd  (@emph{psy-rd})
 Set strength of psychovisual optimization, in
@var{psy-rd}:@var{psy-trellis} format.

@@ -2641,7 +2627,7 @@ to 1.

@item avcintra-class (@emph{class})
 Configure the encoder to generate AVC-Intra.
-Valid values are 50, 100 and 200
+Valid values are 50,100 and 200

@item bluray-compat (@emph{bluray-compat})
 Configure the encoder to be compatible with the bluray standard.
@@ -2692,8 +2678,8 @@ Set loop filter parameters, in @var{alpha}:@var{beta} form.
 Set fluctuations reduction in QP (before curve compression).

@item partitions (@emph{partitions})
-Set partitions to consider as a comma-separated list of values.
-Possible values in the list:
+Set partitions to consider as a comma-separated list of. Possible
+values in the list:

@table @samp
@item p8x8
@@ -2749,32 +2735,19 @@ Variable bit rate.
 Constant bit rate (not allowed in MP4 container).
@end table

-@item x264opts @var{opts}
-@item x264-params @var{opts}
-Override the x264 configuration using a :-separated list of key=value
-options.
+@item x264opts (N.A.)
+Set any x264 option, see @command{x264 --fullhelp} for a list.

-The argument for both options is a list of @var{key}=@var{value}
-couples separated by ":". With @option{x264opts} the value can be
-omitted, and the value @code{1} is assumed in that case.
-
-For @var{filter} and @var{psy-rd} options values that use ":" as a
-separator themselves, use "," instead. They accept it as well since
-long ago but this is kept undocumented for some reason.
-
-For example, the options might be provided as:
-@example
-level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subq=6:8x8dct=0:trellis=0
-@end example
+Argument is a list of @var{key}=@var{value} couples separated by
+":". In @var{filter} and @var{psy-rd} options that use ":" as a separator
+themselves, use "," instead. They accept it as well since long ago but this
+is kept undocumented for some reason.

 For example to specify libx264 encoding options with @command{ffmpeg}:
@example
 ffmpeg -i foo.mpg -c:v libx264 -x264opts keyint=123:min-keyint=20 -an out.mkv
@end example

-To get the complete list of the libx264 options, invoke the command
-@command{x264 --fullhelp} or consult the libx264 documentation.
-
@item a53cc @var{boolean}
 Import closed captions (which must be ATSC compatible format) into output.
 Only the mpeg2 and h264 decoders provide these. Default is 1 (on).
@@ -2785,6 +2758,20 @@ Import user data unregistered SEI if available into output. Default is 0 (off).
@item mb_info @var{boolean}
 Set mb_info data through AVFrameSideData, only useful when used from the
 API. Default is 0 (off).
+
+@item x264-params (N.A.)
+Override the x264 configuration using a :-separated list of key=value
+parameters.
+
+This option is functionally the same as the @option{x264opts}, but is
+duplicated for compatibility with the Libav fork.
+
+For example to specify libx264 encoding options with @command{ffmpeg}:
+@example
+ffmpeg -i INPUT -c:v libx264 -x264-params level=30:bframes=0:weightp=0:\
+cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:\
+no-fast-pskip=1:subq=6:8x8dct=0:trellis=0 OUTPUT
+@end example
@end table

 Encoding ffpresets for common usages are provided so they can be used with the
@@ -2924,75 +2911,6 @@ ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2
@end example
@end table

-@section libxeve
-
-eXtra-fast Essential Video Encoder (XEVE) MPEG-5 EVC encoder wrapper.
-The xeve-equivalent options or values are listed in parentheses for easy migration.
-
-This encoder requires the presence of the libxeve headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-libxeve}.
-
-@float NOTE
-Many libxeve encoder options are mapped to FFmpeg global codec options,
-while unique encoder options are provided through private options.
-Additionally the xeve-params private options allows one to pass a list
-of key=value tuples as accepted by the libxeve @code{parse_xeve_params} function.
-@end float
-
-The xeve project website is at @url{https://github.com/mpeg5/xeve}.
-
-@subsection Options
-
-The following options are supported by the libxeve wrapper.
-The xeve-equivalent options or values are listed in parentheses for easy migration.
-
-@float NOTE
-To reduce the duplication of documentation, only the private options
-and some others requiring special attention are documented here. For
-the documentation of the undocumented generic options, see
-@ref{codec-options,,the Codec Options chapter}.
-@end float
-
-@float NOTE
-To get a more accurate and extensive documentation of the libxeve options,
-invoke the command  @code{xeve_app --help} or consult the libxeve documentation.
-@end float
-
-@table @option
-@item b (@emph{bitrate})
-Set target video bitrate in bits/s.
-Note that FFmpeg's b option is expressed in bits/s, while xeve's bitrate is in kilobits/s.
-
-@item bf (@emph{bframes})
-Set the maximum number of B frames (1,3,7,15).
-
-@item g (@emph{keyint})
-Set the GOP size (I-picture period).
-
-@item preset (@emph{preset})
-Set the xeve preset.
-Set the encoder preset value to determine encoding speed [fast, medium, slow, placebo]
-
-@item tune (@emph{tune})
-Set the encoder tune parameter [psnr, zerolatency]
-
-@item profile (@emph{profile})
-Set the encoder profile [0: baseline; 1: main]
-
-@item crf (@emph{crf})
-Set the quality for constant quality mode.
-Constant rate factor <10..49> [default: 32]
-
-@item qp (@emph{qp})
-Set constant quantization rate control method parameter.
-Quantization parameter qp <0..51> [default: 32]
-
-@item threads (@emph{threads})
-Force to use a specific number of threads
-
-@end table
-
@section libxvid

 Xvid MPEG-4 Part 2 encoder wrapper.
@@ -3338,8 +3256,8 @@ quality range is 1 to 51, with 1 being the best quality.
@end itemize

@item
-Otherwise when the desired average bitrate is specified with the @option{b}
-option, a bitrate-based mode is used.
+Otherwise, a bitrate-based mode is used. For all of those, you should specify at
+least the desired average bitrate with the @option{b} option.
@itemize @minus
@item
@var{LA} - VBR with lookahead, when the @option{look_ahead} option is specified.
@@ -3360,9 +3278,6 @@ than the average bitrate.
@option{avbr_accuracy} and @option{avbr_convergence} are set to non-zero. This
 mode is available for H264 and HEVC on Windows.
@end itemize
-
-@item
-Otherwise the default ratecontrol method @var{CQP} is used.
@end itemize

 Note that depending on your system, a different mode than the one you specified
@@ -4089,10 +4004,6 @@ Quality-defined variable-bitrate.
 Average variable bitrate.
@end table

-@item blbrc
-Enable block level rate control, which assigns different bitrate block by block.
-Invalid for CQP mode.
-
@end table

 Each encoder also has its own specific options:
@@ -95,6 +95,7 @@ int main(int argc, char *argv[])
    avio_ctx = avio_alloc_context(avio_ctx_buffer, avio_ctx_buffer_size,
                                  0, &bd, &read_packet, NULL, NULL);
    if (!avio_ctx) {
+        av_freep(&avio_ctx_buffer);
        ret = AVERROR(ENOMEM);
        goto end;
    }
@@ -128,6 +128,10 @@ int main(int argc, char **argv)
    outfilename = argv[2];

    pkt = av_packet_alloc();
+    if (!pkt) {
+        fprintf(stderr, "Could not allocate AVPacket\n");
+        exit(1); /* or proper cleanup and returning */
+    }

    /* find the MPEG audio decoder */
    codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
@@ -161,7 +165,7 @@ int main(int argc, char **argv)
    }
    outfile = fopen(outfilename, "wb");
    if (!outfile) {
-        av_free(c);
+        fprintf(stderr, "Could not open %s\n", outfilename);
        exit(1);
    }

@@ -138,11 +138,9 @@ static int decode_packet(AVCodecContext *dec, const AVPacket *pkt)
            ret = output_audio_frame(frame);

        av_frame_unref(frame);
-        if (ret < 0)
-            return ret;
    }

-    return 0;
+    return ret;
 }

 static int open_codec_context(int *stream_idx,
@@ -347,8 +347,7 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
    if (frame) {
        /* convert samples from native format to destination codec format, using the resampler */
        /* compute destination number of samples */
-        dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples,
-                                        c->sample_rate, c->sample_rate, AV_ROUND_UP);
+        dst_nb_samples = swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples;
        av_assert0(dst_nb_samples == frame->nb_samples);

        /* when we pass a frame to the encoder, it may keep a reference to it
@@ -28,6 +28,8 @@
 * GPU video surfaces, write the decoded frames to an output file.
 */

+#include "config.h"
+
 #include <stdio.h>

 #include "libavformat/avformat.h"
@@ -75,8 +75,7 @@ static int str_to_dict(char* optstr, AVDictionary **opt)
        if (value == NULL)
            return AVERROR(EINVAL);
        av_dict_set(opt, key, value, 0);
-    } while(key != NULL);
-    return 0;
+    } while(1);
 }

 static int dynamic_set_parameter(AVCodecContext *avctx)
@@ -334,17 +333,15 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec, char *optstr)

 fail:
        av_frame_free(&frame);
-        if (ret < 0)
-            return ret;
    }
-    return 0;
+    return ret;
 }

 int main(int argc, char **argv)
 {
    const AVCodec *enc_codec;
    int ret = 0;
-    AVPacket *dec_pkt;
+    AVPacket *dec_pkt = NULL;

    if (argc < 5 || (argc - 5) % 2) {
        av_log(NULL, AV_LOG_ERROR, "Usage: %s <input file> <encoder> <output file>"
@@ -196,7 +196,7 @@ static int open_output_file(const char *filename)
            /* Third parameter can be used to pass settings to encoder */
            ret = avcodec_open2(enc_ctx, encoder, NULL);
            if (ret < 0) {
-                av_log(NULL, AV_LOG_ERROR, "Cannot open %s encoder for stream #%u\n", encoder->name, i);
+                av_log(NULL, AV_LOG_ERROR, "Cannot open video encoder for stream #%u\n", i);
                return ret;
            }
            ret = avcodec_parameters_from_context(out_stream->codecpar, enc_ctx);
@@ -88,6 +88,10 @@ static int encode_write(AVCodecContext *avctx, AVFrame *frame, FILE *fout)
        enc_pkt->stream_index = 0;
        ret = fwrite(enc_pkt->data, enc_pkt->size, 1, fout);
        av_packet_unref(enc_pkt);
+        if (ret != enc_pkt->size) {
+            ret = AVERROR(errno);
+            break;
+        }
    }

 end:
@@ -215,10 +215,8 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec)

 fail:
        av_frame_free(&frame);
-        if (ret < 0)
-            return ret;
    }
-    return 0;
+    return ret;
 }

 int main(int argc, char **argv)
@@ -450,7 +450,7 @@ work with streams that were detected during the initial scan; streams that
 are detected later are ignored.

 The size of the initial scan is controlled by two options: @code{probesize}
-(default ~5@tie{}Mo) and @code{analyzeduration} (default 5,000,000@tie{}µs = 5@tie{}s). For
+(default ~5 Mo) and @code{analyzeduration} (default 5,000,000 µs = 5 s). For
 the subtitle stream to be detected, both values must be large enough.

@section Why was the @command{ffmpeg} @option{-sameq} option removed? What to use instead?
@@ -467,7 +467,7 @@ point acceptable for your tastes. The most common options to do that are
@option{-qscale} and @option{-qmax}, but you should peruse the documentation
 of the encoder you chose.

-@section I have a stretched video, why does scaling not fix it?
+@section I have a stretched video, why does scaling does not fix it?

 A lot of video codecs and formats can store the @emph{aspect ratio} of the
 video: this is the ratio between the width and the height of either the full
@@ -79,14 +79,6 @@ Do not put a '~' character in the samples path to indicate a home
 directory. Because of shell nuances, this will cause FATE to fail.
@end float

-Beware that some assertions are disabled by default, so mind setting
-@option{--assert-level=<level>} at configuration time, e.g. when seeking
-the highest possible test coverage:
-@example
-./configure --assert-level=2
-@end example
-Note that raising the assert level could have a performance impact.
-
 To get the complete list of tests, run the command:
@example
 make fate-list
@@ -1,5 +1,5 @@
 slot=                                    # some unique identifier
-repo=git://source.ffmpeg.org/ffmpeg.git  # the source repository
+repo=https://git.ffmpeg.org/ffmpeg.git   # the source repository
 #branch=release/2.6                       # the branch to test
 samples=                                 # path to samples directory
 workdir=                                 # directory in which to do all the work
@@ -11,16 +11,21 @@ ignore_tests=
 # the following are optional and map to configure options
 arch=
 cpu=
+toolchain=
 cross_prefix=
 as=
 cc=
+cxx=
 ld=
+nm=
 target_os=
 sysroot=
 target_exec=
 target_path=
 target_samples=
 extra_cflags=
+extra_cxxflags=
+extra_objcflags=
 extra_ldflags=
 extra_libs=
 extra_conf=     # extra configure options not covered above
@@ -31,25 +36,3 @@ makeopts=       # extra options passed to 'make'
                # defaulting to makeopts above if this is not set
 #tar=           # command to create a tar archive from its arguments on stdout,
                # defaults to 'tar c'
-#fate_targets=  # targets to make when running fate; defaults to "fate",
-                # can be set to run a subset of tests, e.g. "fate-checkasm".
-
-#fate_environments=  # a list of names of configurations to run tests for;
-                     # each round is run with variables from ${${name}_env} set.
-
-# One example of using fate_environments:
-
-# target_exec="qemu-aarch64-static"
-# fate_targets="fate-checkasm fate-cpu"
-# fate_environments="sve128 sve256"
-# sve128_env="QEMU_CPU=max,sve128=on"
-# sve256_env="QEMU_CPU=max,sve256=on"
-
-# The variables set by fate_environments can also be used explicitly
-# by target_exec, e.g. like this:
-
-# target_exec="qemu-aarch64-static -cpu \$(MY_CPU)"
-# fate_targets="fate-checkasm fate-cpu"
-# fate_environments="sve128 sve256"
-# sve128_env="MY_CPU=max,sve128=on"
-# sve256_env="MY_CPU=max,sve256=on"
@@ -118,7 +118,7 @@ Encoded packets are then passed to the decoder (unless streamcopy is selected
 for the stream, see further for a description). The decoder produces
 uncompressed frames (raw video/PCM audio/...) which can be processed further by
 filtering (see next section). After filtering, the frames are passed to the
-encoder, which encodes them and outputs encoded packets. Finally, those are
+encoder, which encodes them and outputs encoded packets. Finally those are
 passed to the muxer, which writes the encoded packets to the output file.

@section Filtering
@@ -219,40 +219,6 @@ Since there is no decoding or encoding, it is very fast and there is no quality
 loss. However, it might not work in some cases because of many factors. Applying
 filters is obviously also impossible, since filters work on uncompressed data.

-@section Loopback decoders
-While decoders are normally associated with demuxer streams, it is also possible
-to create "loopback" decoders that decode the output from some encoder and allow
-it to be fed back to complex filtergraphs. This is done with the @code{-dec}
-directive, which takes as a parameter the index of the output stream that should
-be decoded. Every such directive creates a new loopback decoder, indexed with
-successive integers starting at zero. These indices should then be used to refer
-to loopback decoders in complex filtergraph link labels, as described in the
-documentation for @option{-filter_complex}.
-
-E.g. the following example:
-
-@example
-ffmpeg -i INPUT                                        \
-  -map 0:v:0 -c:v libx264 -crf 45 -f null -            \
-  -dec 0:0 -filter_complex '[0:v][dec:0]hstack[stack]' \
-  -map '[stack]' -c:v ffv1 OUTPUT
-@end example
-
-reads an input video and
-@itemize
-@item
-(line 2) encodes it with @code{libx264} at low quality;
-
-@item
-(line 3) decodes this encoded stream and places it side by side with the
-original input video;
-
-@item
-(line 4) combined video is then losslessly encoded and written into
-@file{OUTPUT}.
-
-@end itemize
-
@c man end DETAILED DESCRIPTION

@chapter Stream selection
@@ -657,206 +623,6 @@ Not all muxers support embedded thumbnails, and those who do, only support a few
 Creates a program with the specified @var{title}, @var{program_num} and adds the specified
@var{stream}(s) to it.

-@item -stream_group type=@var{type}:st=@var{stream}[:st=@var{stream}][:stg=@var{stream_group}][:id=@var{stream_group_id}...] (@emph{output})
-
-Creates a stream group of the specified @var{type}, @var{stream_group_id} and adds the specified
-@var{stream}(s) and/or previously defined @var{stream_group}(s) to it.
-
-@var{type} can be one of the following:
-@table @option
-
-@item iamf_audio_element
-Groups @var{stream}s that belong to the same IAMF Audio Element
-
-For this group @var{type}, the following options are available
-@table @option
-@item audio_element_type
-The Audio Element type. The following values are supported:
-
-@table @option
-@item channel
-Scalable channel audio representation
-@item scene
-Ambisonics representation
-@end table
-
-@item demixing
-Demixing information used to reconstruct a scalable channel audio representation.
-This option must be separated from the rest with a ',', and takes the following
-key=value options
-
-@table @option
-@item parameter_id
-An identifier parameters blocks in frames may refer to
-@item dmixp_mode
-A pre-defined combination of demixing parameters
-@end table
-
-@item recon_gain
-Recon gain information used to reconstruct a scalable channel audio representation.
-This option must be separated from the rest with a ',', and takes the following
-key=value options
-
-@table @option
-@item parameter_id
-An identifier parameters blocks in frames may refer to
-@end table
-
-@item layer
-A layer defining a Channel Layout in the Audio Element.
-This option must be separated from the rest with a ','. Several ',' separated entries
-can be defined, and at least one must be set.
-
-It takes the following ":"-separated key=value options
-
-@table @option
-@item ch_layout
-The layer's channel layout
-@item flags
-The following flags are available:
-
-@table @option
-@item recon_gain
-Wether to signal if recon_gain is present as metadata in parameter blocks within frames
-@end table
-
-@item output_gain
-@item output_gain_flags
-Which channels output_gain applies to. The following flags are available:
-
-@table @option
-@item FL
-@item FR
-@item BL
-@item BR
-@item TFL
-@item TFR
-@end table
-
-@item ambisonics_mode
-The ambisonics mode. This has no effect if audio_element_type is set to channel.
-
-The following values are supported:
-
-@table @option
-@item mono
-Each ambisonics channel is coded as an individual mono stream in the group
-@end table
-
-@end table
-
-@item default_w
-Default weight value
-
-@end table
-
-@item iamf_mix_presentation
-Groups @var{stream}s that belong to all IAMF Audio Element the same
-IAMF Mix Presentation references
-
-For this group @var{type}, the following options are available
-
-@table @option
-@item submix
-A sub-mix within the Mix Presentation.
-This option must be separated from the rest with a ','. Several ',' separated entries
-can be defined, and at least one must be set.
-
-It takes the following ":"-separated key=value options
-
-@table @option
-@item parameter_id
-An identifier parameters blocks in frames may refer to, for post-processing the mixed
-audio signal to generate the audio signal for playback
-@item parameter_rate
-The sample rate duration fields in parameters blocks in frames that refer to this
-@var{parameter_id} are expressed as
-@item default_mix_gain
-Default mix gain value to apply when there are no parameter blocks sharing the same
-@var{parameter_id} for a given frame
-
-@item element
-References an Audio Element used in this Mix Presentation to generate the final output
-audio signal for playback.
-This option must be separated from the rest with a '|'. Several '|' separated entries
-can be defined, and at least one must be set.
-
-It takes the following ":"-separated key=value options:
-
-@table @option
-@item stg
-The @var{stream_group_id} for an Audio Element which this sub-mix refers to
-@item parameter_id
-An identifier parameters blocks in frames may refer to, for applying any processing to
-the referenced and rendered Audio Element before being summed with other processed Audio
-Elements
-@item parameter_rate
-The sample rate duration fields in parameters blocks in frames that refer to this
-@var{parameter_id} are expressed as
-@item default_mix_gain
-Default mix gain value to apply when there are no parameter blocks sharing the same
-@var{parameter_id} for a given frame
-@item annotations
-A key=value string describing the sub-mix element where "key" is a string conforming to
-BCP-47 that specifies the language for the "value" string. "key" must be the same as the
-one in the mix's @var{annotations}
-@item headphones_rendering_mode
-Indicates whether the input channel-based Audio Element is rendered to stereo loudspeakers
-or spatialized with a binaural renderer when played back on headphones.
-This has no effect if the referenced Audio Element's @var{audio_element_type} is set to
-channel.
-
-The following values are supported:
-
-@table @option
-@item stereo
-@item binaural
-@end table
-
-@end table
-
-@item layout
-Specifies the layouts for this sub-mix on which the loudness information was measured.
-This option must be separated from the rest with a '|'. Several '|' separated entries
-can be defined, and at least one must be set.
-
-It takes the following ":"-separated key=value options:
-
-@table @option
-@item layout_type
-
-@table @option
-@item loudspeakers
-The layout follows the loudspeaker sound system convention of ITU-2051-3.
-@item binaural
-The layout is binaural.
-@end table
-
-@item sound_system
-Channel layout matching one of Sound Systems A to J of ITU-2051-3, plus 7.1.2 and 3.1.2
-This has no effect if @var{layout_type} is set to binaural.
-@item integrated_loudness
-The program integrated loudness information, as defined in ITU-1770-4.
-@item digital_peak
-The digital (sampled) peak value of the audio signal, as defined in ITU-1770-4.
-@item true_peak
-The true peak of the audio signal, as defined in ITU-1770-4.
-@item dialog_anchored_loudness
-The Dialogue loudness information, as defined in ITU-1770-4.
-@item album_anchored_loudness
-The Album loudness information, as defined in ITU-1770-4.
-@end table
-
-@end table
-
-@item annotations
-A key=value string string describing the mix where "key" is a string conforming to BCP-47
-that specifies the language for the "value" string. "key" must be the same as the ones in
-all sub-mix element's @var{annotations}s
-@end table
-
-@end table
-
@item -target @var{type} (@emph{output})
 Specify target file type (@code{vcd}, @code{svcd}, @code{dvd}, @code{dv},
@code{dv50}). @var{type} may be prefixed with @code{pal-}, @code{ntsc-} or
@@ -1011,6 +777,12 @@ syntax.
 See the @ref{filter_complex_option,,-filter_complex option} if you
 want to create filtergraphs with multiple inputs and/or outputs.

+@anchor{filter_script option}
+@item -filter_script[:@var{stream_specifier}] @var{filename} (@emph{output,per-stream})
+This option is similar to @option{-filter}, the only difference is that its
+argument is the name of the file from which a filtergraph description is to be
+read.
+
@item -reinit_filter[:@var{stream_specifier}] @var{integer} (@emph{input,per-stream})
 This boolean option determines if the filtergraph(s) to which this stream is fed gets
 reinitialized when input frame parameters change mid-stream. This option is enabled by
@@ -1058,7 +830,7 @@ be achieved with @code{ffmpeg ... < /dev/null} but it requires a
 shell.

@item -debug_ts (@emph{global})
-Print timestamp/latency information. It is off by default. This option is
+Print timestamp information. It is off by default. This option is
 mostly useful for testing and debugging purposes, and the output
 format may change from one version to another, so it should not be
 employed by portable scripts.
@@ -1264,6 +1036,10 @@ list separated with slashes. Two first values are the beginning and
 end frame numbers, last one is quantizer to use if positive, or quality
 factor if negative.

+@item -psnr
+Calculate PSNR of compressed frames. This option is deprecated, pass the
+PSNR flag to the encoder instead, using @code{-flags +psnr}.
+
@item -vstats
 Dump video coding statistics to @file{vstats_HHMMSS.log}. See the
@ref{vstats_file_format,,vstats file format} section for the format description.
@@ -1278,6 +1054,8 @@ Specify which version of the vstats format to use. Default is @code{2}. See the

@item -vtag @var{fourcc/tag} (@emph{output})
 Force video tag/fourcc. This is an alias for @code{-tag:v}.
+@item -vbsf @var{bitstream_filter}
+Deprecated see -bsf

@item -force_key_frames[:@var{stream_specifier}] @var{time}[,@var{time}...] (@emph{output,per-stream})
@item -force_key_frames[:@var{stream_specifier}] expr:@var{expr} (@emph{output,per-stream})
@@ -1387,21 +1165,6 @@ Choose the first device and use the primary device context.

@item d3d11va
@var{device} is the number of the Direct3D 11 display adapter.
-If not specified, it will attempt to use the default Direct3D 11 display adapter
-or the first Direct3D 11 display adapter whose hardware VendorId is specified
-by @samp{vendor_id}.
-
-Examples:
-@table @emph
-@item -init_hw_device d3d11va
-Create a d3d11va device on the default Direct3D 11 display adapter.
-
-@item -init_hw_device d3d11va:1
-Create a d3d11va device on the Direct3D 11 display adapter specified by index 1.
-
-@item -init_hw_device d3d11va:,vendor_id=0x8086
-Create a d3d11va device on the first Direct3D 11 display adapter whose hardware VendorId is 0x8086.
-@end table

@item vaapi
@var{device} is either an X11 display name, a DRM render node or a DirectX adapter index.
@@ -1409,29 +1172,6 @@ If not specified, it will attempt to open the default X11 display (@emph{$DISPLA
 and then the first DRM render node (@emph{/dev/dri/renderD128}), or the default
 DirectX adapter on Windows.

-The following options are recognized:
-@table @option
-@item kernel_driver
-When @var{device} is not specified, use this option to specify the name of the kernel
-driver associated with the desired device. This option is available only when
-the hardware acceleration method @emph{drm} and @emph{vaapi} are enabled.
-@end table
-
-Examples:
-@table @emph
-@item -init_hw_device vaapi
-Create a vaapi device on the default device.
-
-@item -init_hw_device vaapi:/dev/dri/renderD129
-Create a vaapi device on DRM render node @file{/dev/dri/renderD129}.
-
-@item -init_hw_device vaapi:1
-Create a vaapi device on DirectX adapter 1.
-
-@item -init_hw_device vaapi:,kernel_driver=i915
-Create a vaapi device on a device associated with kernel driver @samp{i915}.
-@end table
-
@item vdpau
@var{device} is an X11 display name.
 If not specified, it will attempt to open the default X11 display (@emph{$DISPLAY}).
@@ -1453,38 +1193,16 @@ If not specified, @samp{auto_any} is used.
 platform-appropriate subdevice (@samp{dxva2} or @samp{d3d11va} or @samp{vaapi}) and then deriving a
 QSV device from that.)

-The following options are recognized:
-@table @option
-@item child_device
-Specify a DRM render node on Linux or DirectX adapter on Windows.
-@item child_device_type
-Choose platform-appropriate subdevice type. On Windows @samp{d3d11va} is used
-as default subdevice type when @code{--enable-libvpl} is specified at configuration time,
-@samp{dxva2} is used as default subdevice type when @code{--enable-libmfx} is specified at
-configuration time. On Linux user can use @samp{vaapi} only as subdevice type.
-@end table
+Alternatively, @samp{child_device_type} helps to choose platform-appropriate subdevice type.
+On Windows @samp{d3d11va} is used as default subdevice type.

 Examples:
@table @emph
-@item -init_hw_device qsv:hw,child_device=/dev/dri/renderD129
-Create a QSV device with @samp{MFX_IMPL_HARDWARE} on DRM render node @file{/dev/dri/renderD129}.
-
-@item -init_hw_device qsv:hw,child_device=1
-Create a QSV device with @samp{MFX_IMPL_HARDWARE} on DirectX adapter 1.
-
@item -init_hw_device qsv:hw,child_device_type=d3d11va
 Choose the GPU subdevice with type @samp{d3d11va} and create QSV device with @samp{MFX_IMPL_HARDWARE}.

@item -init_hw_device qsv:hw,child_device_type=dxva2
 Choose the GPU subdevice with type @samp{dxva2} and create QSV device with @samp{MFX_IMPL_HARDWARE}.
-
-@item -init_hw_device qsv:hw,child_device=1,child_device_type=d3d11va
-Create a QSV device with @samp{MFX_IMPL_HARDWARE} on DirectX adapter 1 with subdevice type @samp{d3d11va}.
-
-@item -init_hw_device vaapi=va:/dev/dri/renderD129 -init_hw_device qsv=hw1@@@var{va}
-Create a VAAPI device called @samp{va} on @file{/dev/dri/renderD129}, then derive a QSV device called @samp{hw1}
-from device @samp{va}.
-
@end table

@item opencl
@@ -1691,6 +1409,8 @@ This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter optio
@table @option
@item -atag @var{fourcc/tag} (@emph{output})
 Force audio tag/fourcc. This is an alias for @code{-tag:a}.
+@item -absf @var{bitstream_filter}
+Deprecated, see -bsf
@item -guess_layout_max @var{channels} (@emph{input,per-stream})
 If some input channel layout is not known, try to guess only if it
 corresponds to at most the specified number of channels. For example, 2
@@ -1712,6 +1432,8 @@ option to disable streams individually.
 As an output option, disables subtitle recording i.e. automatic selection or
 mapping of any subtitle stream. For full manual control see the @code{-map}
 option.
+@item -sbsf @var{bitstream_filter}
+Deprecated, see -bsf
@end table

@section Advanced Subtitle options
@@ -1744,7 +1466,8 @@ Set the size of the canvas used to render subtitles.
 Create one or more streams in the output file. This option has two forms for
 specifying the data source(s): the first selects one or more streams from some
 input file (specified with @code{-i}), the second takes an output from some
-complex filtergraph (specified with @code{-filter_complex}).
+complex filtergraph (specified with @code{-filter_complex} or
+@code{-filter_complex_script}).

 In the first form, an output stream is created for every stream from the input
 file with the index @var{input_file_id}. If @var{stream_specifier} is given,
@@ -1836,6 +1559,77 @@ such streams is attempted.
 Allow input streams with unknown type to be copied instead of failing if copying
 such streams is attempted.

+@item -map_channel [@var{input_file_id}.@var{stream_specifier}.@var{channel_id}|-1][?][:@var{output_file_id}.@var{stream_specifier}]
+This option is deprecated and will be removed. It can be replaced by the
+@var{pan} filter. In some cases it may be easier to use some combination of the
+@var{channelsplit}, @var{channelmap}, or @var{amerge} filters.
+
+Map an audio channel from a given input to an output. If
+@var{output_file_id}.@var{stream_specifier} is not set, the audio channel will
+be mapped on all the audio streams.
+
+Using "-1" instead of
+@var{input_file_id}.@var{stream_specifier}.@var{channel_id} will map a muted
+channel.
+
+A trailing @code{?} will allow the map_channel to be
+optional: if the map_channel matches no channel the map_channel will be ignored instead
+of failing.
+
+For example, assuming @var{INPUT} is a stereo audio file, you can switch the
+two audio channels with the following command:
+@example
+ffmpeg -i INPUT -map_channel 0.0.1 -map_channel 0.0.0 OUTPUT
+@end example
+
+If you want to mute the first channel and keep the second:
+@example
+ffmpeg -i INPUT -map_channel -1 -map_channel 0.0.1 OUTPUT
+@end example
+
+The order of the "-map_channel" option specifies the order of the channels in
+the output stream. The output channel layout is guessed from the number of
+channels mapped (mono if one "-map_channel", stereo if two, etc.). Using "-ac"
+in combination of "-map_channel" makes the channel gain levels to be updated if
+input and output channel layouts don't match (for instance two "-map_channel"
+options and "-ac 6").
+
+You can also extract each channel of an input to specific outputs; the following
+command extracts two channels of the @var{INPUT} audio stream (file 0, stream 0)
+to the respective @var{OUTPUT_CH0} and @var{OUTPUT_CH1} outputs:
+@example
+ffmpeg -i INPUT -map_channel 0.0.0 OUTPUT_CH0 -map_channel 0.0.1 OUTPUT_CH1
+@end example
+
+The following example splits the channels of a stereo input into two separate
+streams, which are put into the same output file:
+@example
+ffmpeg -i stereo.wav -map 0:0 -map 0:0 -map_channel 0.0.0:0.0 -map_channel 0.0.1:0.1 -y out.ogg
+@end example
+
+Note that currently each output stream can only contain channels from a single
+input stream; you can't for example use "-map_channel" to pick multiple input
+audio channels contained in different streams (from the same or different files)
+and merge them into a single output stream. It is therefore not currently
+possible, for example, to turn two separate mono streams into a single stereo
+stream. However splitting a stereo stream into two single channel mono streams
+is possible.
+
+If you need this feature, a possible workaround is to use the @emph{amerge}
+filter. For example, if you need to merge a media (here @file{input.mkv}) with 2
+mono audio streams into one single stereo channel audio stream (and keep the
+video stream), you can use the following command:
+@example
+ffmpeg -i input.mkv -filter_complex "[0:1] [0:2] amerge" -c:a pcm_s16le -c:v copy output.mkv
+@end example
+
+To map the first two audio channels from the first input, and using the
+trailing @code{?}, ignore the audio channel mapping if the first input is
+mono instead of stereo:
+@example
+ffmpeg -i INPUT -map_channel 0.0.0 -map_channel 0.0.1? OUTPUT
+@end example
+
@item -map_metadata[:@var{metadata_spec_out}] @var{infile}[:@var{metadata_spec_in}] (@emph{output,per-metadata})
 Set metadata information of the next output file from @var{infile}. Note that
 those are file indices (zero-based), not filenames.
@@ -1933,6 +1727,9 @@ constant frame rate.
@item vfr (2)
 Frames are passed through with their timestamp or dropped so as to
 prevent 2 frames from having the same timestamp.
+@item drop
+As passthrough but destroys all timestamps, making the muxer generate
+fresh timestamps based on frame-rate.
@item auto (-1)
 Chooses between cfr and vfr depending on muxer capabilities. This is the
 default method.
@@ -2048,8 +1845,8 @@ of seconds.

 The timestamp discontinuity correction enabled by this option is only
 applied to input formats accepting timestamp discontinuity (for which
-the @code{AVFMT_TS_DISCONT} flag is enabled), e.g. MPEG-TS and HLS, and
-is automatically disabled when employing the @code{-copyts} option
+the @code{AV_FMT_DISCONT} flag is enabled), e.g. MPEG-TS and HLS, and
+is automatically disabled when employing the @code{-copy_ts} option
 (unless wrapping is detected).

 If a timestamp discontinuity is detected whose absolute value is
@@ -2065,7 +1862,7 @@ seconds.

 The timestamp correction enabled by this option is only applied to
 input formats not accepting timestamp discontinuity (for which the
-@code{AVFMT_TS_DISCONT} flag is not enabled).
+@code{AV_FMT_DISCONT} flag is not enabled).

 If a timestamp discontinuity is detected whose absolute value is
 greater than @var{threshold}, ffmpeg will drop the PTS/DTS timestamp
@@ -2090,36 +1887,16 @@ an output mpegts file:
 ffmpeg -i inurl -streamid 0:33 -streamid 1:36 out.ts
@end example

-@item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{input/output,per-stream})
-Apply bitstream filters to matching streams. The filters are applied to each
-packet as it is received from the demuxer (when used as an input option) or
-before it is sent to the muxer (when used as an output option).
-
-@var{bitstream_filters} is a comma-separated list of bitstream filter
-specifications, each of the form
+@item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream})
+Set bitstream filters for matching streams. @var{bitstream_filters} is
+a comma-separated list of bitstream filters. Use the @code{-bsfs} option
+to get the list of bitstream filters.
@example
-@var{filter}[=@var{optname0}=@var{optval0}:@var{optname1}=@var{optval1}:...]
+ffmpeg -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264
@end example
-Any of the ',=:' characters that are to be a part of an option value need to be
-escaped with a backslash.
-
-Use the @code{-bsfs} option to get the list of bitstream filters.
-
-E.g.
-@example
-ffmpeg -bsf:v h264_mp4toannexb -i h264.mp4 -c:v copy -an out.h264
-@end example
-applies the @code{h264_mp4toannexb} bitstream filter (which converts
-MP4-encapsulated H.264 stream to Annex B) to the @emph{input} video stream.
-
-On the other hand,
@example
 ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt
@end example
-applies the @code{mov2textsub} bitstream filter (which extracts text from MOV
-subtitles) to the @emph{output} subtitle stream. Note, however, that since both
-examples use @code{-c copy}, it matters little whether the filters are applied
-on input or output - that would change if transcoding was happening.

@item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{input/output,per-stream})
 Force a tag/fourcc for matching streams.
@@ -2139,16 +1916,11 @@ type -- see the @option{-filter} options. @var{filtergraph} is a description of
 the filtergraph, as described in the ``Filtergraph syntax'' section of the
 ffmpeg-filters manual.

-Input link labels must refer to either input streams or loopback decoders. For
-input streams, use the @code{[file_index:stream_specifier]} syntax (i.e. the
-same as @option{-map} uses). If @var{stream_specifier} matches multiple streams,
-the first one will be used.
-
-For decoders, the link label must be [dec:@var{dec_idx}], where @var{dec_idx} is
-the index of the loopback decoder to be connected to given input.
-
-An unlabeled input will be connected to the first unused input stream of the
-matching type.
+Input link labels must refer to input streams using the
+@code{[file_index:stream_specifier]} syntax (i.e. the same as @option{-map}
+uses). If @var{stream_specifier} matches multiple streams, the first one will be
+used. An unlabeled input will be connected to the first unused input stream of
+the matching type.

 Output link labels are referred to with @option{-map}. Unlabeled outputs are
 added to the first output file.
@@ -2209,6 +1981,12 @@ The default is the number of available CPUs.
 Define a complex filtergraph, i.e. one with arbitrary number of inputs and/or
 outputs. Equivalent to @option{-filter_complex}.

+@anchor{filter_complex_script option}
+@item -filter_complex_script @var{filename} (@emph{global})
+This option is similar to @option{-filter_complex}, the only difference is that
+its argument is the name of the file from which a complex filtergraph
+description is to be read.
+
@item -accurate_seek (@emph{input})
 This option enables or disables accurate seeking in input files with the
@option{-ss} option. It is enabled by default, so seeking is accurate when
@@ -2402,14 +2180,11 @@ Number of audio samples in the frame.
 Size of the encoded packet in bytes.

@item br (@emph{packet})
-Current bitrate in bits per second.
+Current bitrate in bits per second. Post-encoding only.

@item abr (@emph{packet})
 Average bitrate for the whole stream so far, in bits per second, -1 if it cannot
-be determined at this point.
-
-@item key (@emph{packet})
-Character 'K' if the packet contains a keyframe, character 'N' otherwise.
+be determined at this point. Post-encoding only.
@end table

 Directives tagged with @emph{packet} may only be used with
@@ -196,18 +196,6 @@ will produce a thread pool with this many threads available for parallel
 processing. The default is 0 which means that the thread count will be
 determined by the number of available CPUs.

-@item -enable_vulkan
-Use vulkan renderer rather than SDL builtin renderer. Depends on libplacebo.
-
-@item -vulkan_params
-
-Vulkan configuration using a list of @var{key}=@var{value} pairs separated by
-":".
-
-@item -hwaccel
-Use HW accelerated decoding. Enable this option will enable vulkan renderer
-automatically.
-
@end table

@section While playing
@@ -48,8 +48,8 @@ name (which may be shared by other sections), and an unique
 name. See the output of @option{sections}.

 Metadata tags stored in the container or in the streams are recognized
-and printed in the corresponding "FORMAT", "STREAM", "STREAM_GROUP_STREAM"
-or "PROGRAM_STREAM" section.
+and printed in the corresponding "FORMAT", "STREAM" or "PROGRAM_STREAM"
+section.

@c man end

@@ -232,13 +232,6 @@ multimedia stream.
 Each media stream information is printed within a dedicated section
 with name "PROGRAM_STREAM".

-@item -show_stream_groups
-Show information about stream groups and their streams contained in the
-input multimedia stream.
-
-Each media stream information is printed within a dedicated section
-with name "STREAM_GROUP_STREAM".
-
@item -show_chapters
 Show information about chapters stored in the format.

@@ -422,9 +415,8 @@ keyN=valN
 [/SECTION]
@end example

-Metadata tags are printed as a line in the corresponding FORMAT, STREAM,
-STREAM_GROUP_STREAM or PROGRAM_STREAM section, and are prefixed by the
-string "TAG:".
+Metadata tags are printed as a line in the corresponding FORMAT, STREAM or
+PROGRAM_STREAM section, and are prefixed by the string "TAG:".

 A description of the accepted options follows.

@@ -15,7 +15,6 @@
      <xsd:element name="frames"   type="ffprobe:framesType"  minOccurs="0" maxOccurs="1" />
      <xsd:element name="packets_and_frames" type="ffprobe:packetsAndFramesType" minOccurs="0" maxOccurs="1" />
      <xsd:element name="programs" type="ffprobe:programsType" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="stream_groups" type="ffprobe:StreamGroupsType" minOccurs="0" maxOccurs="1" />
      <xsd:element name="streams"  type="ffprobe:streamsType" minOccurs="0" maxOccurs="1" />
      <xsd:element name="chapters" type="ffprobe:chaptersType" minOccurs="0" maxOccurs="1" />
      <xsd:element name="format"   type="ffprobe:formatType"  minOccurs="0" maxOccurs="1" />
@@ -106,6 +105,8 @@
    <xsd:attribute name="pkt_dts_time"  type="xsd:float"/>
    <xsd:attribute name="best_effort_timestamp"      type="xsd:long" />
    <xsd:attribute name="best_effort_timestamp_time" type="xsd:float" />
+    <xsd:attribute name="pkt_duration"  type="xsd:long" />
+    <xsd:attribute name="pkt_duration_time" type="xsd:float"/>
    <xsd:attribute name="duration"      type="xsd:long" />
    <xsd:attribute name="duration_time" type="xsd:float"/>
    <xsd:attribute name="pkt_pos"       type="xsd:long" />
@@ -127,6 +128,8 @@
    <xsd:attribute name="pix_fmt"                type="xsd:string"/>
    <xsd:attribute name="sample_aspect_ratio"    type="xsd:string"/>
    <xsd:attribute name="pict_type"              type="xsd:string"/>
+    <xsd:attribute name="coded_picture_number"   type="xsd:long"  />
+    <xsd:attribute name="display_picture_number" type="xsd:long"  />
    <xsd:attribute name="interlaced_frame"       type="xsd:int"   />
    <xsd:attribute name="top_field_first"        type="xsd:int"   />
    <xsd:attribute name="repeat_pict"            type="xsd:int"   />
@@ -159,8 +162,6 @@
  <xsd:complexType name="frameSideDataType">
    <xsd:sequence>
      <xsd:element name="timecodes" type="ffprobe:frameSideDataTimecodeList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="components" type="ffprobe:frameSideDataComponentList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>

    <xsd:attribute name="side_data_type"              type="xsd:string"/>
@@ -168,11 +169,6 @@
    <xsd:attribute name="timecode"                    type="xsd:string"/>
  </xsd:complexType>

-  <xsd:complexType name="frameSideDatumType">
-    <xsd:attribute name="key"   type="xsd:string"/>
-    <xsd:attribute name="value" type="xsd:string"/>
-  </xsd:complexType>
-
  <xsd:complexType name="frameSideDataTimecodeList">
    <xsd:sequence>
      <xsd:element name="timecode" type="ffprobe:frameSideDataTimecodeType" minOccurs="0" maxOccurs="unbounded"/>
@@ -183,31 +179,6 @@
    <xsd:attribute name="value"              type="xsd:string"/>
  </xsd:complexType>

-  <xsd:complexType name="frameSideDataComponentList">
-    <xsd:sequence>
-      <xsd:element name="component" type="ffprobe:frameSideDataComponentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameSideDataComponentType">
-    <xsd:sequence>
-      <xsd:element name="pieces" type="ffprobe:frameSideDataPieceList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameSideDataPieceList">
-    <xsd:sequence>
-      <xsd:element name="piece" type="ffprobe:frameSideDataPieceType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameSideDataPieceType">
-    <xsd:sequence>
-      <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
  <xsd:complexType name="subtitleType">
    <xsd:attribute name="media_type"         type="xsd:string" fixed="subtitle" use="required"/>
    <xsd:attribute name="pts"                type="xsd:long" />
@@ -230,12 +201,6 @@
    </xsd:sequence>
  </xsd:complexType>

-  <xsd:complexType name="StreamGroupsType">
-    <xsd:sequence>
-      <xsd:element name="stream_group" type="ffprobe:streamGroupType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
  <xsd:complexType name="streamDispositionType">
    <xsd:attribute name="default"          type="xsd:int" use="required" />
    <xsd:attribute name="dub"              type="xsd:int" use="required" />
@@ -332,88 +297,6 @@
    <xsd:attribute name="pcr_pid"              type="xsd:int"    use="required"/>
  </xsd:complexType>

-  <xsd:complexType name="streamGroupType">
-    <xsd:sequence>
-      <xsd:element name="disposition"      type="ffprobe:streamDispositionType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="tags"             type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="streams"          type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="components"       type="ffprobe:streamGroupComponentList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="index"            type="xsd:int"    use="required"/>
-    <xsd:attribute name="nb_streams"       type="xsd:int"    use="required"/>
-    <xsd:attribute name="type"             type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupComponentList">
-    <xsd:sequence>
-      <xsd:element name="component" type="ffprobe:streamGroupComponentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupComponentType">
-    <xsd:sequence>
-      <xsd:element name="subcomponents" type="ffprobe:streamGroupSubComponentList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="component_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupSubComponentList">
-    <xsd:sequence>
-      <xsd:element name="subcomponent" type="ffprobe:streamGroupSubComponentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupSubComponentType">
-    <xsd:sequence>
-      <xsd:element name="pieces" type="ffprobe:streamGroupPieceList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="subcomponent_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupPieceList">
-    <xsd:sequence>
-      <xsd:element name="piece" type="ffprobe:streamGroupPieceType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupPieceType">
-    <xsd:sequence>
-      <xsd:element name="subpieces" type="ffprobe:streamGroupSubPieceList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="piece_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupSubPieceList">
-    <xsd:sequence>
-      <xsd:element name="subpiece" type="ffprobe:streamGroupSubPieceType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupSubPieceType">
-    <xsd:sequence>
-      <xsd:element name="blocks" type="ffprobe:streamGroupBlockList" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="subpiece_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupBlockList">
-    <xsd:sequence>
-      <xsd:element name="block" type="ffprobe:streamGroupBlockType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupBlockType">
-    <xsd:sequence>
-      <xsd:element name="block_entry" type="ffprobe:streamGroupEntryType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="streamGroupEntryType">
-    <xsd:attribute name="key"   type="xsd:string"/>
-    <xsd:attribute name="value" type="xsd:string"/>
-  </xsd:complexType>
-
  <xsd:complexType name="formatType">
    <xsd:sequence>
      <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
@@ -422,7 +305,6 @@
    <xsd:attribute name="filename"         type="xsd:string" use="required"/>
    <xsd:attribute name="nb_streams"       type="xsd:int"    use="required"/>
    <xsd:attribute name="nb_programs"      type="xsd:int"    use="required"/>
-    <xsd:attribute name="nb_stream_groups" type="xsd:int"    use="required"/>
    <xsd:attribute name="format_name"      type="xsd:string" use="required"/>
    <xsd:attribute name="format_long_name" type="xsd:string"/>
    <xsd:attribute name="start_time"       type="xsd:float"/>
@@ -13,15 +13,6 @@ corresponding value to true. They can be set to false by prefixing
 the option name with "no". For example using "-nofoo"
 will set the boolean option with name "foo" to false.

-Options that take arguments support a special syntax where the argument given on
-the command line is interpreted as a path to the file from which the actual
-argument value is loaded. To use this feature, add a forward slash '/'
-immediately before the option name (after the leading dash). E.g.
-@example
-ffmpeg -i INPUT -/filter:v filter.script OUTPUT
-@end example
-will load a filtergraph description from the file named @file{filter.script}.
-
@anchor{Stream specifiers}
@section Stream specifiers
 Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
@@ -46,9 +37,9 @@ Matches the stream with this index. E.g. @code{-threads:1 4} would set the
 thread count for the second stream to 4. If @var{stream_index} is used as an
 additional stream specifier (see below), then it selects stream number
@var{stream_index} from the matching streams. Stream numbering is based on the
-order of the streams as detected by libavformat except when a stream group
-specifier or program ID is also specified. In this case it is based on the
-ordering of the streams in the group or program.
+order of the streams as detected by libavformat except when a program ID is
+also specified. In this case it is based on the ordering of the streams in the
+program.
@item @var{stream_type}[:@var{additional_stream_specifier}]
@var{stream_type} is one of following: 'v' or 'V' for video, 'a' for audio, 's'
 for subtitle, 'd' for data, and 't' for attachments. 'v' matches all video
@@ -57,17 +48,6 @@ thumbnails or cover arts. If @var{additional_stream_specifier} is used, then
 it matches streams which both have this type and match the
@var{additional_stream_specifier}. Otherwise, it matches all streams of the
 specified type.
-@item g:@var{group_specifier}[:@var{additional_stream_specifier}]
-Matches streams which are in the group with the specifier @var{group_specifier}.
-if @var{additional_stream_specifier} is used, then it matches streams which both
-are part of the group and match the @var{additional_stream_specifier}.
-@var{group_specifier} may be one of the following:
-@table @option
-@item @var{group_index}
-Match the stream with this group index.
-@item #@var{group_id} or i:@var{group_id}
-Match the stream with this group id.
-@end table
@item p:@var{program_id}[:@var{additional_stream_specifier}]
 Matches streams which are in the program with the id @var{program_id}. If
@var{additional_stream_specifier} is used, then it matches streams which both
@@ -46,8 +46,7 @@ Enable fast, but inaccurate seeks for some formats.
@item genpts
 Generate missing PTS if DTS is present.
@item igndts
-Ignore DTS if PTS is also set. In case the PTS is set, the DTS value
-is set to NOPTS. This is ignored when the @code{nofillin} flag is set.
+Ignore DTS if PTS is set. Inert when nofillin is set.
@item ignidx
 Ignore index.
@item nobuffer
@@ -343,22 +343,6 @@ libxavs2 is under the GNU Public License Version 2 or later
 details), you must upgrade FFmpeg's license to GPL in order to use it.
@end float

-@section eXtra-fast Essential Video Encoder (XEVE)
-
-FFmpeg can make use of the XEVE library for EVC video encoding.
-
-Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for
-installing the XEVE library. Then pass @code{--enable-libxeve} to configure to
-enable it.
-
-@section eXtra-fast Essential Video Decoder (XEVD)
-
-FFmpeg can make use of the XEVD library for EVC video decoding.
-
-Go to @url{https://github.com/mpeg5/xevd} and follow the instructions for
-installing the XEVD library. Then pass @code{--enable-libxevd} to configure to
-enable it.
-
@section ZVBI

 ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB
@@ -614,7 +598,6 @@ library:
@item raw DTS                   @tab X @tab X
@item raw DTS-HD                @tab   @tab X
@item raw E-AC-3                @tab X @tab X
-@item raw EVC                   @tab X @tab X
@item raw FLAC                  @tab X @tab X
@item raw GSM                   @tab   @tab X
@item raw H.261                 @tab X @tab X
@@ -670,8 +653,7 @@ library:
@item Redirector                @tab   @tab X
@item RedSpark                  @tab   @tab X
@item Renderware TeXture Dictionary @tab   @tab X
-@item Resolume DXV              @tab X @tab X
-    @tab Encoding is only supported for the DXT1 (Normal Quality, No Alpha) texture format.
+@item Resolume DXV              @tab   @tab X
@item RF64                      @tab   @tab X
@item RL2                       @tab   @tab X
    @tab Audio and video format used in some games by Entertainment Software Partners.
@@ -962,8 +944,6 @@ following image formats are supported:
@item Electronic Arts TQI video  @tab     @tab  X
@item Escape 124             @tab     @tab  X
@item Escape 130             @tab     @tab  X
-@item EVC / MPEG-5 Part 1    @tab  E  @tab  E
-    @tab encoding and decoding supported through external libraries libxeve and libxevd
@item FFmpeg video codec #1  @tab  X  @tab  X
    @tab lossless codec (fourcc: FFV1)
@item Flash Screen Video v1  @tab  X  @tab  X
@@ -1017,7 +997,6 @@ following image formats are supported:
@item Lagarith               @tab     @tab  X
@item LCL (LossLess Codec Library) MSZH  @tab     @tab  X
@item LCL (LossLess Codec Library) ZLIB  @tab  E  @tab  E
-@item LEAD MCMP              @tab     @tab  X
@item LOCO                   @tab     @tab  X
@item LucasArts SANM/Smush   @tab     @tab  X
    @tab Used in LucasArts games / SMUSH animations.
@@ -66,7 +66,7 @@ This will put the FFmpeg sources into the directory @var{<target>} and let
 you push back your changes to the remote repository.

@example
-git clone git@@ffmpeg.org:ffmpeg-web <target>
+git clone gil@@ffmpeg.org:ffmpeg-web <target>
@end example

 This will put the source of the FFmpeg website into the directory
@@ -143,7 +143,7 @@ git log <filename(s)>
@end example

 You may also use the graphical tools like @command{gitview} or @command{gitk}
-or the web interface available at @url{http://source.ffmpeg.org/}.
+or the web interface available at @url{https://git.ffmpeg.org/ffmpeg.git}.

@section Checking source tree status

@@ -222,8 +222,7 @@ $ ffmpeg -f avfoundation -capture_raw_data true -i "zr100:none" out.dv

@section bktr

-BSD video input device. Deprecated and will be removed - please contact
-the developers if you are interested in maintaining it.
+BSD video input device.

@subsection Options

@@ -723,7 +722,7 @@ Win32 GDI-based screen capture device.

 This device allows you to capture a region of the display on Windows.

-Amongst options for the imput filenames are such elements as:
+There are two options for the input filename:
@example
 desktop
@end example
@@ -731,13 +730,9 @@ or
@example
 title=@var{window_title}
@end example
-or
-@example
-hwnd=@var{window_hwnd}
-@end example

 The first option will capture the entire desktop, or a fixed region of the
-desktop. The second and third options will instead capture the contents of a single
+desktop. The second option will instead capture the contents of a single
 window, regardless of its position on the screen.

 For example, to grab the entire desktop using @command{ffmpeg}:
@@ -1,94 +0,0 @@
-FFmpeg Infrastructure:
-======================
-
-
-
-
-Servers:
-~~~~~~~~
-
-
-Main Server:
------------
-Our Main server is hosted at telepoint.bg
-for more details see: https://www.ffmpeg.org/#thanks_sponsor_0001
-Nothing runs on our main server directly, instead several VMs run on it.
-
-
-ffmpeg.org VM:
--------------
-Web, mail, and public facing git, also website git
-
-
-fftrac VM:
----------
-trac.ffmpeg.org         Issue tracking
-
-
-ffaux VM:
---------
-patchwork.ffmpeg.org    Patch tracking
-vote.ffmpeg.org         Condorcet voting
-
-
-fate:
-----
-fate.ffmpeg.org         FFmpeg automated testing environment
-
-
-coverage:
---------
-coverage.ffmpeg.org     Fate code coverage
-
-
-The main and fate server as well as VMs currently run ubuntu
-
-
-
-Cronjobs:
-~~~~~~~~~
-Part of the docs is in the main ffmpeg repository as texi files, this part is build by a cronjob. So is the
-doxygen stuff as well as the FFmpeg git snapshot.
-These 3 scripts are under the ffcron user
-
-
-
-Git:
-~~~~
-Public facing git is provided by our infra, (https://git.ffmpeg.org/gitweb)
-main developer ffmpeg git repository for historic reasons is provided by (git@source.ffmpeg.org:ffmpeg)
-Other developer git repositories are provided via git@git.ffmpeg.org:<NAME_OF_REPOSITORY>
-git mirrors are available on https://github.com/FFmpeg
-(there are some exceptions where primary repositories are on github or elsewhere instead of the mirrors)
-
-Github mirrors are redundantly synced by multiple people
-
-You need a new git repository related to FFmpeg ? contact root at ffmpeg.org
-
-
-Fate:
-~~~~~
-fatesamples are provided via rsync. Every FFmpeg developer who has a shell account in ffmpeg.org
-should be in the samples group and be able to upload samples.
-See https://www.ffmpeg.org/fate.html#Uploading-new-samples-to-the-fate-suite
-
-
-
-Accounts:
-~~~~~~~~~
-You need an account for some FFmpeg work? Send mail to root at ffmpeg.org
-
-
-
-VMs:
-~~~~
-You need a VM, docker container for FFmpeg? contact root at ffmpeg.org
-(for docker, CC Andriy)
-
-
-
-IRC:
-~~~~
-irc channels are at https://libera.chat/
-irc channel archives are at https://libera.irclog.whitequark.org
-
@@ -344,7 +344,7 @@ recommended.
 Avoid sending the same message to multiple mailing lists.

@item
-Please follow our @url{https://ffmpeg.org/community.html#Code-of-conduct, Code of Conduct}.
+Please follow our @url{https://ffmpeg.org/community.html#Code-of-Conduct, Code of Conduct}.
@end itemize

@chapter Help
@@ -1,4 +1,3 @@
-@anchor{metadata}
@chapter Metadata
@c man begin METADATA

@@ -157,4 +157,3 @@ PFD[32]   would for example be signed 32 bit little-endian IEEE float
@item XVID @tab non-compliant MPEG-4 generated by old Xvid
@item XVIX @tab non-compliant MPEG-4 generated by old Xvid with interlacing bug
@end multitable
-
@@ -302,7 +302,7 @@ ffmpeg -re -i INPUT -c:v rawvideo -pix_fmt bgra -f fbdev /dev/fb0
 See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).

@section opengl
-OpenGL output device. Deprecated and will be removed.
+OpenGL output device.

 To enable this output device you need to configure FFmpeg with @code{--enable-opengl}.

@@ -408,13 +408,7 @@ ffmpeg  -i INPUT -f pulse "stream name"

@section sdl

-SDL (Simple DirectMedia Layer) output device. Deprecated and will be removed.
-
-For monitoring purposes in FFmpeg, pipes and a video player such as ffplay can be used:
-
-@example
-ffmpeg -i INPUT -f nut -c:v rawvideo - | ffplay -
-@end example
+SDL (Simple DirectMedia Layer) output device.

 "sdl2" can be used as alias for "sdl".

@@ -54,12 +54,24 @@ sub get_formatting_function($$) {
 }

 # determine texinfo version
-my $program_version_num = version->declare(ff_get_conf('PACKAGE_VERSION'))->numify;
+my $package_version = ff_get_conf('PACKAGE_VERSION');
+$package_version =~ s/\+dev$//;
+my $program_version_num = version->declare($package_version)->numify;
 my $program_version_6_8 = $program_version_num >= 6.008000;

 # no navigation elements
 ff_set_from_init_file('HEADERS', 0);

+my %sectioning_commands = %Texinfo::Common::sectioning_commands;
+if (scalar(keys(%sectioning_commands)) == 0) {
+  %sectioning_commands = %Texinfo::Commands::sectioning_heading_commands;
+}
+
+my %root_commands = %Texinfo::Common::root_commands;
+if (scalar(keys(%root_commands)) == 0) {
+  %root_commands = %Texinfo::Commands::root_commands;
+}
+
 sub ffmpeg_heading_command($$$$$)
 {
    my $self = shift;
@@ -77,6 +89,9 @@ sub ffmpeg_heading_command($$$$$)
        return $result;
    }

+    # no need to set it as the $element_id is output unconditionally
+    my $heading_id;
+
    my $element_id = $self->command_id($command);
    $result .= "<a name=\"$element_id\"></a>\n"
        if (defined($element_id) and $element_id ne '');
@@ -84,24 +99,40 @@ sub ffmpeg_heading_command($$$$$)
    print STDERR "Process $command "
        .Texinfo::Structuring::_print_root_command_texi($command)."\n"
            if ($self->get_conf('DEBUG'));
-    my $element;
-    if ($Texinfo::Common::root_commands{$command->{'cmdname'}}
-        and $command->{'parent'}
-        and $command->{'parent'}->{'type'}
-        and $command->{'parent'}->{'type'} eq 'element') {
-        $element = $command->{'parent'};
+    my $output_unit;
+    if ($root_commands{$command->{'cmdname'}}) {
+        if ($command->{'associated_unit'}) {
+          $output_unit = $command->{'associated_unit'};
+        } elsif ($command->{'structure'}
+                 and $command->{'structure'}->{'associated_unit'}) {
+          $output_unit = $command->{'structure'}->{'associated_unit'};
+        } elsif ($command->{'parent'}
+                 and $command->{'parent'}->{'type'}
+                 and $command->{'parent'}->{'type'} eq 'element') {
+          $output_unit = $command->{'parent'};
+        }
    }
-    if ($element) {
+
+    if ($output_unit) {
        $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
-                                                       $command, $element);
+                                                       $command, $output_unit);
    }

    my $heading_level;
    # node is used as heading if there is nothing else.
    if ($cmdname eq 'node') {
-        if (!$element or (!$element->{'extra'}->{'section'}
-            and $element->{'extra'}->{'node'}
-            and $element->{'extra'}->{'node'} eq $command
+        if (!$output_unit or
+            (((!$output_unit->{'extra'}->{'section'}
+              and $output_unit->{'extra'}->{'node'}
+              and $output_unit->{'extra'}->{'node'} eq $command)
+             or
+             ((($output_unit->{'extra'}->{'unit_command'}
+                and $output_unit->{'extra'}->{'unit_command'} eq $command)
+               or
+               ($output_unit->{'unit_command'}
+                and $output_unit->{'unit_command'} eq $command))
+              and $command->{'extra'}
+              and not $command->{'extra'}->{'associated_section'}))
             # bogus node may not have been normalized
            and defined($command->{'extra'}->{'normalized'}))) {
            if ($command->{'extra'}->{'normalized'} eq 'Top') {
@@ -111,7 +142,15 @@ sub ffmpeg_heading_command($$$$$)
            }
        }
    } else {
-        $heading_level = $command->{'level'};
+        if (defined($command->{'extra'})
+            and defined($command->{'extra'}->{'section_level'})) {
+          $heading_level = $command->{'extra'}->{'section_level'};
+        } elsif ($command->{'structure'}
+                 and defined($command->{'structure'}->{'section_level'})) {
+          $heading_level = $command->{'structure'}->{'section_level'};
+        } else {
+          $heading_level = $command->{'level'};
+        }
    }

    my $heading = $self->command_text($command);
@@ -119,8 +158,8 @@ sub ffmpeg_heading_command($$$$$)
    # if there is an error in the node.
    if (defined($heading) and $heading ne '' and defined($heading_level)) {

-        if ($Texinfo::Common::root_commands{$cmdname}
-            and $Texinfo::Common::sectioning_commands{$cmdname}) {
+        if ($root_commands{$cmdname}
+            and $sectioning_commands{$cmdname}) {
            my $content_href = $self->command_contents_href($command, 'contents',
                                                            $self->{'current_filename'});
            if ($content_href) {
@@ -140,7 +179,13 @@ sub ffmpeg_heading_command($$$$$)
            }
        }

-        if ($self->in_preformatted()) {
+        my $in_preformatted;
+        if ($program_version_num >= 7.001090) {
+          $in_preformatted = $self->in_preformatted_context();
+        } else {
+          $in_preformatted = $self->in_preformatted();
+        }
+        if ($in_preformatted) {
            $result .= $heading."\n";
        } else {
            # if the level was changed, set the command name right
@@ -149,21 +194,25 @@ sub ffmpeg_heading_command($$$$$)
                $cmdname
                    = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
            }
-            # format_heading_text expects an array of headings for texinfo >= 7.0
            if ($program_version_num >= 7.000000) {
-                $heading = [$heading];
-            }
-            $result .= &{get_formatting_function($self,'format_heading_text')}(
+                $result .= &{get_formatting_function($self,'format_heading_text')}($self,
+                     $cmdname, [$cmdname], $heading,
+                     $heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL') -1,
+                     $heading_id, $command);
+
+            } else {
+              $result .= &{get_formatting_function($self,'format_heading_text')}(
                        $self, $cmdname, $heading,
                        $heading_level +
                        $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command);
+            }
        }
    }
    $result .= $content if (defined($content));
    return $result;
 }

-foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') {
+foreach my $command (keys(%sectioning_commands), 'node') {
    texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }

@@ -188,28 +237,56 @@ sub ffmpeg_begin_file($$$)
    my $filename = shift;
    my $element = shift;

-    my $command;
-    if ($element and $self->get_conf('SPLIT')) {
-        $command = $self->element_command($element);
+    my ($element_command, $node_command, $command_for_title);
+    if ($element) {
+        if ($element->{'unit_command'}) {
+          $element_command = $element->{'unit_command'};
+        } elsif ($self->can('tree_unit_element_command')) {
+          $element_command = $self->tree_unit_element_command($element);
+        } elsif ($self->can('tree_unit_element_command')) {
+          $element_command = $self->element_command($element);
+        }
+
+       $node_command = $element_command;
+       if ($element_command and $element_command->{'cmdname'}
+           and $element_command->{'cmdname'} ne 'node'
+           and $element_command->{'extra'}
+           and $element_command->{'extra'}->{'associated_node'}) {
+         $node_command = $element_command->{'extra'}->{'associated_node'};
+       }
+
+       $command_for_title = $element_command if ($self->get_conf('SPLIT'));
    }

-    my ($title, $description, $encoding, $date, $css_lines,
-        $doctype, $bodytext, $copying_comment, $after_body_open,
-        $extra_head, $program_and_version, $program_homepage,
+    my ($title, $description, $keywords, $encoding, $date, $css_lines, $doctype,
+        $root_html_element_attributes, $body_attributes, $copying_comment,
+        $after_body_open, $extra_head, $program_and_version, $program_homepage,
        $program, $generator);
-    if ($program_version_num >= 7.000000) {
-        ($title, $description, $encoding, $date, $css_lines,
-         $doctype, $bodytext, $copying_comment, $after_body_open,
+    if ($program_version_num >= 7.001090) {
+        ($title, $description, $keywords, $encoding, $date, $css_lines, $doctype,
+         $root_html_element_attributes, $body_attributes, $copying_comment,
+         $after_body_open, $extra_head, $program_and_version, $program_homepage,
+         $program, $generator) = $self->_file_header_information($command_for_title,
+                                                                 $filename);
+    } elsif ($program_version_num >= 7.000000) {
+        ($title, $description, $encoding, $date, $css_lines, $doctype,
+         $root_html_element_attributes, $copying_comment, $after_body_open,
         $extra_head, $program_and_version, $program_homepage,
-         $program, $generator) = $self->_file_header_information($command);
+         $program, $generator) = $self->_file_header_information($command_for_title,
+                                                                 $filename);
    } else {
        ($title, $description, $encoding, $date, $css_lines,
-         $doctype, $bodytext, $copying_comment, $after_body_open,
-         $extra_head, $program_and_version, $program_homepage,
-         $program, $generator) = $self->_file_header_informations($command);
+         $doctype, $root_html_element_attributes, $copying_comment,
+         $after_body_open, $extra_head, $program_and_version, $program_homepage,
+         $program, $generator) = $self->_file_header_informations($command_for_title);
    }

-    my $links = $self->_get_links ($filename, $element);
+    my $links;
+    if ($program_version_num >= 7.000000) {
+      $links = $self->_get_links($filename, $element, $node_command);
+    } else {
+      $links = $self->_get_links ($filename, $element);
+    }

    my $head1 = $ENV{"FFMPEG_HEADER1"} || <<EOT;
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -252,13 +329,25 @@ sub ffmpeg_program_string($)
  if (defined($self->get_conf('PROGRAM'))
      and $self->get_conf('PROGRAM') ne ''
      and defined($self->get_conf('PACKAGE_URL'))) {
-    return $self->convert_tree(
+    if ($program_version_num >= 7.001090) {
+     return $self->convert_tree(
+      $self->cdt('This document was generated using @uref{{program_homepage}, @emph{{program}}}.',
+         { 'program_homepage' => {'text' => $self->get_conf('PACKAGE_URL')},
+           'program' => {'text' => $self->get_conf('PROGRAM') }}));
+    } else {
+     return $self->convert_tree(
      $self->gdt('This document was generated using @uref{{program_homepage}, @emph{{program}}}.',
-         { 'program_homepage' => $self->get_conf('PACKAGE_URL'),
-           'program' => $self->get_conf('PROGRAM') }));
+         { 'program_homepage' => {'text' => $self->get_conf('PACKAGE_URL')},
+           'program' => {'text' => $self->get_conf('PROGRAM') }}));
+    }
  } else {
-    return $self->convert_tree(
-      $self->gdt('This document was generated automatically.'));
+    if ($program_version_num >= 7.001090) {
+      return $self->convert_tree(
+        $self->cdt('This document was generated automatically.'));
+    } else {
+      return $self->convert_tree(
+        $self->gdt('This document was generated automatically.'));
+    }
  }
 }
 if ($program_version_6_8) {
@@ -44,4 +44,3 @@ a+b*c;
 here the reader knows that a,b,c are meant to be signed integers but for C
 standard compliance / to avoid undefined behavior they are stored in unsigned
 ints.
-
@@ -727,10 +727,6 @@ FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR
 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR
@item 7.1.4
 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR
-@item 7.2.3
-FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2
-@item 9.1.4
-FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR
@item hexadecagonal
 FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR
@item downmix
@@ -815,7 +811,7 @@ Compute arcsine of @var{x}.
@item atan(x)
 Compute arctangent of @var{x}.

-@item atan2(y, x)
+@item atan2(x, y)
 Compute principal value of the arc tangent of @var{y}/@var{x}.

@item between(x, min, max)
@@ -939,15 +935,9 @@ Returns the value of the expression printed.

 Prints t with loglevel l

-@item random(idx)
-Return a pseudo random value between 0.0 and 1.0. @var{idx} is the
-index of the internal variable which will be used to save the
-seed/state.
-
-@item randomi(idx, min, max)
-Return a pseudo random value in the interval between @var{min} and
-@var{max}. @var{idx} is the index of the internal variable which will
-be used to save the seed/state.
+@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 root(expr, max)
 Find an input value for which the function represented by @var{expr}
@@ -130,7 +130,7 @@ $(BIN2CEXE): ffbuild/bin2c_host.o
 ifdef CONFIG_PTX_COMPRESSION
 %.ptx.gz: TAG = GZIP
 %.ptx.gz: %.ptx
-	$(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@
+	$(M)gzip -c9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@

 %.ptx.c: %.ptx.gz $(BIN2CEXE)
 	$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@)))
@@ -140,7 +140,7 @@ else
 endif

 clean::
-	$(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
+	$(RM) $(BIN2CEXE)

 %.c %.h %.pc %.ver %.version: TAG = GEN

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 toupper(){
    echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 }
@@ -18,13 +18,10 @@ OBJS-ffmpeg +=                  \
    fftools/ffmpeg_mux.o        \
    fftools/ffmpeg_mux_init.o   \
    fftools/ffmpeg_opt.o        \
-    fftools/ffmpeg_sched.o      \
    fftools/objpool.o           \
    fftools/sync_queue.o        \
    fftools/thread_queue.o      \

-OBJS-ffplay += fftools/ffplay_renderer.o
-
 define DOFFTOOL
 OBJS-$(1) += fftools/cmdutils.o fftools/opt_common.o fftools/$(1).o $(OBJS-$(1)-yes)
 ifdef HAVE_GNU_WINDRES
@@ -37,7 +37,6 @@
 #include "libswresample/swresample.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
-#include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/display.h"
 #include "libavutil/getenv_utf8.h"
@@ -84,7 +83,7 @@ void init_dynload(void)
 #endif
 }

-int parse_number(const char *context, const char *numstr, enum OptionType type,
+int parse_number(const char *context, const char *numstr, int type,
                 double min, double max, double *dst)
 {
    char *tail;
@@ -94,9 +93,9 @@ int parse_number(const char *context, const char *numstr, enum OptionType type,
        error = "Expected number for %s but found: %s\n";
    else if (d < min || d > max)
        error = "The value for %s was %s which is not within %f - %f\n";
-    else if (type == OPT_TYPE_INT64 && (int64_t)d != d)
+    else if (type == OPT_INT64 && (int64_t)d != d)
        error = "Expected int64 for %s but found %s\n";
-    else if (type == OPT_TYPE_INT && (int)d != d)
+    else if (type == OPT_INT && (int)d != d)
        error = "Expected int for %s but found %s\n";
    else {
        *dst = d;
@@ -108,7 +107,7 @@ int parse_number(const char *context, const char *numstr, enum OptionType type,
 }

 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
-                       int rej_flags)
+                       int rej_flags, int alt_flags)
 {
    const OptionDef *po;
    int first;
@@ -118,6 +117,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
        char buf[128];

        if (((po->flags & req_flags) != req_flags) ||
+            (alt_flags && !(po->flags & alt_flags)) ||
            (po->flags & rej_flags))
            continue;

@@ -126,15 +126,10 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
            first = 0;
        }
        av_strlcpy(buf, po->name, sizeof(buf));
-
-        if (po->flags & OPT_FLAG_PERSTREAM)
-            av_strlcat(buf, "[:<stream_spec>]", sizeof(buf));
-        else if (po->flags & OPT_FLAG_SPEC)
-            av_strlcat(buf, "[:<spec>]", sizeof(buf));
-
-        if (po->argname)
-            av_strlcatf(buf, sizeof(buf), " <%s>", po->argname);
-
+        if (po->argname) {
+            av_strlcat(buf, " ", sizeof(buf));
+            av_strlcat(buf, po->argname, sizeof(buf));
+        }
        printf("-%-17s  %s\n", buf, po->help);
    }
    printf("\n");
@@ -155,9 +150,6 @@ void show_help_children(const AVClass *class, int flags)

 static const OptionDef *find_option(const OptionDef *po, const char *name)
 {
-    if (*name == '/')
-        name++;
-
    while (po->name) {
        const char *end;
        if (av_strstart(name, po->name, &end) && (!*end || *end == ':'))
@@ -231,138 +223,85 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)
 }
 #endif /* HAVE_COMMANDLINETOARGVW */

-static int opt_has_arg(const OptionDef *o)
-{
-    if (o->type == OPT_TYPE_BOOL)
-        return 0;
-    if (o->type == OPT_TYPE_FUNC)
-        return !!(o->flags & OPT_FUNC_ARG);
-    return 1;
-}
-
 static int write_option(void *optctx, const OptionDef *po, const char *opt,
-                        const char *arg, const OptionDef *defs)
+                        const char *arg)
 {
    /* new-style options contain an offset into optctx, old-style address of
     * a global var*/
-    void *dst = po->flags & OPT_FLAG_OFFSET ?
+    void *dst = po->flags & (OPT_OFFSET | OPT_SPEC) ?
                (uint8_t *)optctx + po->u.off : po->u.dst_ptr;
-    char *arg_allocated = NULL;
-
-    SpecifierOptList *sol = NULL;
+    int *dstcount;
    double num;
-    int ret = 0;
+    int ret;

-    if (*opt == '/') {
-        opt++;
-
-        if (po->type == OPT_TYPE_BOOL) {
-            av_log(NULL, AV_LOG_FATAL,
-                   "Requested to load an argument from file for a bool option '%s'\n",
-                   po->name);
-            return AVERROR(EINVAL);
-        }
-
-        arg_allocated = file_read(arg);
-        if (!arg_allocated) {
-            av_log(NULL, AV_LOG_FATAL,
-                   "Error reading the value for option '%s' from file: %s\n",
-                   opt, arg);
-            return AVERROR(EINVAL);
-        }
-
-        arg = arg_allocated;
-    }
-
-    if (po->flags & OPT_FLAG_SPEC) {
+    if (po->flags & OPT_SPEC) {
+        SpecifierOpt **so = dst;
        char *p = strchr(opt, ':');
        char *str;

-        sol = dst;
-        ret = GROW_ARRAY(sol->opt, sol->nb_opt);
+        dstcount = (int *)(so + 1);
+        ret = grow_array((void**)so, sizeof(**so), dstcount, *dstcount + 1);
        if (ret < 0)
-            goto finish;
+            return ret;

        str = av_strdup(p ? p + 1 : "");
-        if (!str) {
-            ret = AVERROR(ENOMEM);
-            goto finish;
-        }
-        sol->opt[sol->nb_opt - 1].specifier = str;
-        dst = &sol->opt[sol->nb_opt - 1].u;
+        if (!str)
+            return AVERROR(ENOMEM);
+        (*so)[*dstcount - 1].specifier = str;
+        dst = &(*so)[*dstcount - 1].u;
    }

-    if (po->type == OPT_TYPE_STRING) {
+    if (po->flags & OPT_STRING) {
        char *str;
-        if (arg_allocated) {
-            str           = arg_allocated;
-            arg_allocated = NULL;
-        } else
-            str = av_strdup(arg);
+        str = av_strdup(arg);
        av_freep(dst);
-
-        if (!str) {
-            ret = AVERROR(ENOMEM);
-            goto finish;
-        }
-
+        if (!str)
+            return AVERROR(ENOMEM);
        *(char **)dst = str;
-    } else if (po->type == OPT_TYPE_BOOL || po->type == OPT_TYPE_INT) {
-        ret = parse_number(opt, arg, OPT_TYPE_INT64, INT_MIN, INT_MAX, &num);
+    } else if (po->flags & OPT_BOOL || po->flags & OPT_INT) {
+        ret = parse_number(opt, arg, OPT_INT64, INT_MIN, INT_MAX, &num);
        if (ret < 0)
-            goto finish;
+            return ret;

        *(int *)dst = num;
-    } else if (po->type == OPT_TYPE_INT64) {
-        ret = parse_number(opt, arg, OPT_TYPE_INT64, INT64_MIN, INT64_MAX, &num);
+    } else if (po->flags & OPT_INT64) {
+        ret = parse_number(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX, &num);
        if (ret < 0)
-            goto finish;
+            return ret;

        *(int64_t *)dst = num;
-    } else if (po->type == OPT_TYPE_TIME) {
+    } else if (po->flags & OPT_TIME) {
        ret = av_parse_time(dst, arg, 1);
        if (ret < 0) {
            av_log(NULL, AV_LOG_ERROR, "Invalid duration for option %s: %s\n",
                   opt, arg);
-            goto finish;
+            return ret;
        }
-    } else if (po->type == OPT_TYPE_FLOAT) {
-        ret = parse_number(opt, arg, OPT_TYPE_FLOAT, -INFINITY, INFINITY, &num);
+    } else if (po->flags & OPT_FLOAT) {
+        ret = parse_number(opt, arg, OPT_FLOAT, -INFINITY, INFINITY, &num);
        if (ret < 0)
-            goto finish;
+            return ret;

        *(float *)dst = num;
-    } else if (po->type == OPT_TYPE_DOUBLE) {
-        ret = parse_number(opt, arg, OPT_TYPE_DOUBLE, -INFINITY, INFINITY, &num);
+    } else if (po->flags & OPT_DOUBLE) {
+        ret = parse_number(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY, &num);
        if (ret < 0)
-            goto finish;
+            return ret;

        *(double *)dst = num;
-    } else {
-        av_assert0(po->type == OPT_TYPE_FUNC && po->u.func_arg);
-
-        ret = po->u.func_arg(optctx, opt, arg);
+    } else if (po->u.func_arg) {
+        int ret = po->u.func_arg(optctx, opt, arg);
        if (ret < 0) {
            av_log(NULL, AV_LOG_ERROR,
                   "Failed to set value '%s' for option '%s': %s\n",
                   arg, opt, av_err2str(ret));
-            goto finish;
+            return ret;
        }
    }
-    if (po->flags & OPT_EXIT) {
-        ret = AVERROR_EXIT;
-        goto finish;
-    }
+    if (po->flags & OPT_EXIT)
+        return AVERROR_EXIT;

-    if (sol) {
-        sol->type = po->type;
-        sol->opt_canon = (po->flags & OPT_HAS_CANON) ?
-                         find_option(defs, po->u1.name_canon) : po;
-    }
-
-finish:
-    av_freep(&arg_allocated);
-    return ret;
+    return 0;
 }

 int parse_option(void *optctx, const char *opt, const char *arg,
@@ -370,8 +309,7 @@ int parse_option(void *optctx, const char *opt, const char *arg,
 {
    static const OptionDef opt_avoptions = {
        .name       = "AVOption passthrough",
-        .type       = OPT_TYPE_FUNC,
-        .flags      = OPT_FUNC_ARG,
+        .flags      = HAS_ARG,
        .u.func_arg = opt_default,
    };

@@ -382,9 +320,9 @@ int parse_option(void *optctx, const char *opt, const char *arg,
    if (!po->name && opt[0] == 'n' && opt[1] == 'o') {
        /* handle 'no' bool option */
        po = find_option(options, opt + 2);
-        if ((po->name && po->type == OPT_TYPE_BOOL))
+        if ((po->name && (po->flags & OPT_BOOL)))
            arg = "0";
-    } else if (po->type == OPT_TYPE_BOOL)
+    } else if (po->flags & OPT_BOOL)
        arg = "1";

    if (!po->name)
@@ -393,16 +331,16 @@ int parse_option(void *optctx, const char *opt, const char *arg,
        av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
        return AVERROR(EINVAL);
    }
-    if (opt_has_arg(po) && !arg) {
+    if (po->flags & HAS_ARG && !arg) {
        av_log(NULL, AV_LOG_ERROR, "Missing argument for option '%s'\n", opt);
        return AVERROR(EINVAL);
    }

-    ret = write_option(optctx, po, opt, arg, options);
+    ret = write_option(optctx, po, opt, arg);
    if (ret < 0)
        return ret;

-    return opt_has_arg(po);
+    return !!(po->flags & HAS_ARG);
 }

 int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
@@ -441,7 +379,7 @@ int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
    return 0;
 }

-int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs)
+int parse_optgroup(void *optctx, OptionGroup *g)
 {
    int i, ret;

@@ -464,7 +402,7 @@ int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs)
        av_log(NULL, AV_LOG_DEBUG, "Applying option %s (%s) with argument %s.\n",
               o->key, o->opt->help, o->val);

-        ret = write_option(optctx, o->opt, o->key, o->val, defs);
+        ret = write_option(optctx, o->opt, o->key, o->val);
        if (ret < 0)
            return ret;
    }
@@ -494,7 +432,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
             (po->name && !strcmp(optname, po->name)))
            return i;

-        if (!po->name || opt_has_arg(po))
+        if (!po->name || po->flags & HAS_ARG)
            i++;
    }
    return 0;
@@ -528,14 +466,7 @@ static void check_options(const OptionDef *po)
 {
    while (po->name) {
        if (po->flags & OPT_PERFILE)
-            av_assert0(po->flags & (OPT_INPUT | OPT_OUTPUT | OPT_DECODER));
-
-        if (po->type == OPT_TYPE_FUNC)
-            av_assert0(!(po->flags & (OPT_FLAG_OFFSET | OPT_FLAG_SPEC)));
-
-        // OPT_FUNC_ARG can only be ser for OPT_TYPE_FUNC
-        av_assert0((po->type == OPT_TYPE_FUNC) || !(po->flags & OPT_FUNC_ARG));
-
+            av_assert0(po->flags & (OPT_INPUT | OPT_OUTPUT));
        po++;
    }
 }
@@ -581,7 +512,7 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit,
    return o;
 }

-#define FLAGS (o->type == AV_OPT_TYPE_FLAGS && (arg[0]=='-' || arg[0]=='+')) ? AV_DICT_APPEND : 0
+#define FLAGS ((o->type == AV_OPT_TYPE_FLAGS && (arg[0]=='-' || arg[0]=='+')) ? AV_DICT_APPEND : 0)
 int opt_default(void *optctx, const char *opt, const char *arg)
 {
    const AVOption *o;
@@ -711,7 +642,7 @@ static int finish_group(OptionParseContext *octx, int group_idx,
 static int add_opt(OptionParseContext *octx, const OptionDef *opt,
                   const char *key, const char *val)
 {
-    int global = !(opt->flags & OPT_PERFILE);
+    int global = !(opt->flags & (OPT_PERFILE | OPT_SPEC | OPT_OFFSET));
    OptionGroup *g = global ? &octx->global_opts : &octx->cur_group;
    int ret;

@@ -734,10 +665,10 @@ static int init_parse_context(OptionParseContext *octx,

    memset(octx, 0, sizeof(*octx));

-    octx->groups    = av_calloc(nb_groups, sizeof(*octx->groups));
+    octx->nb_groups = nb_groups;
+    octx->groups    = av_calloc(octx->nb_groups, sizeof(*octx->groups));
    if (!octx->groups)
        return AVERROR(ENOMEM);
-    octx->nb_groups = nb_groups;

    for (i = 0; i < octx->nb_groups; i++)
        octx->groups[i].group_def = &groups[i];
@@ -793,7 +724,7 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
    while (optindex < argc) {
        const char *opt = argv[optindex++], *arg;
        const OptionDef *po;
-        int ret, group_idx;
+        int ret;

        av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt);

@@ -822,15 +753,14 @@ do {                                                                           \
 } while (0)

        /* named group separators, e.g. -i */
-        group_idx = match_group_separator(groups, nb_groups, opt);
-        if (group_idx >= 0) {
+        if ((ret = match_group_separator(groups, nb_groups, opt)) >= 0) {
            GET_ARG(arg);
-            ret = finish_group(octx, group_idx, arg);
+            ret = finish_group(octx, ret, arg);
            if (ret < 0)
                return ret;

            av_log(NULL, AV_LOG_DEBUG, " matched as %s with argument '%s'.\n",
-                   groups[group_idx].name, arg);
+                   groups[ret].name, arg);
            continue;
        }

@@ -840,7 +770,7 @@ do {                                                                           \
            if (po->flags & OPT_EXIT) {
                /* optional argument, e.g. -h */
                arg = argv[optindex++];
-            } else if (opt_has_arg(po)) {
+            } else if (po->flags & HAS_ARG) {
                GET_ARG(arg);
            } else {
                arg = "1";
@@ -873,7 +803,7 @@ do {                                                                           \
        /* boolean -nofoo options */
        if (opt[0] == 'n' && opt[1] == 'o' &&
            (po = find_option(options, opt + 2)) &&
-            po->name && po->type == OPT_TYPE_BOOL) {
+            po->name && po->flags & OPT_BOOL) {
            ret = add_opt(octx, po, opt, "0");
            if (ret < 0)
                return ret;
@@ -896,6 +826,11 @@ do {                                                                           \
    return 0;
 }

+void print_error(const char *filename, int err)
+{
+    av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err));
+}
+
 int read_yesno(void)
 {
    int c = getchar();
@@ -1115,7 +1050,7 @@ double get_rotation(const int32_t *displaymatrix)
 {
    double theta = 0;
    if (displaymatrix)
-        theta = -round(av_display_rotation_get(displaymatrix));
+        theta = -round(av_display_rotation_get((int32_t*) displaymatrix));

    theta -= 360*floor(theta/360 + 0.9/360);

@@ -1127,29 +1062,3 @@ double get_rotation(const int32_t *displaymatrix)

    return theta;
 }
-
-/* read file contents into a string */
-char *file_read(const char *filename)
-{
-    AVIOContext *pb      = NULL;
-    int ret = avio_open(&pb, filename, AVIO_FLAG_READ);
-    AVBPrint bprint;
-    char *str;
-
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename);
-        return NULL;
-    }
-
-    av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED);
-    ret = avio_read_to_bprint(pb, &bprint, SIZE_MAX);
-    avio_closep(&pb);
-    if (ret < 0) {
-        av_bprint_finalize(&bprint, NULL);
-        return NULL;
-    }
-    ret = av_bprint_finalize(&bprint, &str);
-    if (ret < 0)
-        return NULL;
-    return str;
-}
@@ -77,17 +77,6 @@ int opt_default(void *optctx, const char *opt, const char *arg);
 */
 int opt_timelimit(void *optctx, const char *opt, const char *arg);

-enum OptionType {
-    OPT_TYPE_FUNC,
-    OPT_TYPE_BOOL,
-    OPT_TYPE_STRING,
-    OPT_TYPE_INT,
-    OPT_TYPE_INT64,
-    OPT_TYPE_FLOAT,
-    OPT_TYPE_DOUBLE,
-    OPT_TYPE_TIME,
-};
-
 /**
 * Parse a string and return its corresponding value as a double.
 *
@@ -99,7 +88,7 @@ enum OptionType {
 * @param min the minimum valid accepted value
 * @param max the maximum valid accepted value
 */
-int parse_number(const char *context, const char *numstr, enum OptionType type,
+int parse_number(const char *context, const char *numstr, int type,
                 double min, double max, double *dst);

 typedef struct SpecifierOpt {
@@ -114,70 +103,31 @@ typedef struct SpecifierOpt {
    } u;
 } SpecifierOpt;

-typedef struct SpecifierOptList {
-    SpecifierOpt    *opt;
-    int           nb_opt;
-
-    /* Canonical option definition that was parsed into this list. */
-    const struct OptionDef *opt_canon;
-    enum OptionType type;
-} SpecifierOptList;
-
 typedef struct OptionDef {
    const char *name;
-    enum OptionType type;
    int flags;
-
-/* The OPT_TYPE_FUNC option takes an argument.
- * Must not be used with other option types, as for those it holds:
- * - OPT_TYPE_BOOL do not take an argument
- * - all other types do
- */
-#define OPT_FUNC_ARG    (1 << 0)
-/* Program will immediately exit after processing this option */
-#define OPT_EXIT        (1 << 1)
-/* Option is intended for advanced users. Only affects
- * help output.
- */
-#define OPT_EXPERT      (1 << 2)
-#define OPT_VIDEO       (1 << 3)
-#define OPT_AUDIO       (1 << 4)
-#define OPT_SUBTITLE    (1 << 5)
-#define OPT_DATA        (1 << 6)
-/* The option is per-file (currently ffmpeg-only). At least one of OPT_INPUT,
- * OPT_OUTPUT, OPT_DECODER must be set when this flag is in use.
-   */
-#define OPT_PERFILE     (1 << 7)
-
-/* Option is specified as an offset in a passed optctx.
- * Always use as OPT_OFFSET in option definitions. */
-#define OPT_FLAG_OFFSET (1 << 8)
-#define OPT_OFFSET      (OPT_FLAG_OFFSET | OPT_PERFILE)
-
-/* Option is to be stored in a SpecifierOptList.
-   Always use as OPT_SPEC in option definitions. */
-#define OPT_FLAG_SPEC   (1 << 9)
-#define OPT_SPEC        (OPT_FLAG_SPEC | OPT_OFFSET)
-
-/* Option applies per-stream (implies OPT_SPEC). */
-#define OPT_FLAG_PERSTREAM  (1 << 10)
-#define OPT_PERSTREAM   (OPT_FLAG_PERSTREAM | OPT_SPEC)
-
-/* ffmpeg-only - specifies whether an OPT_PERFILE option applies to input,
- * output, or both. */
-#define OPT_INPUT       (1 << 11)
-#define OPT_OUTPUT      (1 << 12)
-
-/* This option is a "canonical" form, to which one or more alternatives
- * exist. These alternatives are listed in u1.names_alt. */
-#define OPT_HAS_ALT     (1 << 13)
-/* This option is an alternative form of some other option, whose
- * name is stored in u1.name_canon */
-#define OPT_HAS_CANON   (1 << 14)
-
-/* ffmpeg-only - OPT_PERFILE may apply to standalone decoders */
-#define OPT_DECODER     (1 << 15)
-
+#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_INT    0x0080
+#define OPT_FLOAT  0x0100
+#define OPT_SUBTITLE 0x0200
+#define OPT_INT64  0x0400
+#define OPT_EXIT   0x0800
+#define OPT_DATA   0x1000
+#define OPT_PERFILE  0x2000     /* the option is per-file (currently ffmpeg-only).
+                                   implied by OPT_OFFSET or OPT_SPEC */
+#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
+#define OPT_INPUT  0x40000
+#define OPT_OUTPUT 0x80000
     union {
        void *dst_ptr;
        int (*func_arg)(void *, const char *, const char *);
@@ -185,15 +135,6 @@ typedef struct OptionDef {
    } u;
    const char *help;
    const char *argname;
-
-    union {
-        /* Name of the canonical form of this option.
-         * Is valid when OPT_HAS_CANON is set. */
-        const char *name_canon;
-        /* A NULL-terminated list of alternate forms of this option.
-         * Is valid when OPT_HAS_ALT is set. */
-        const char * const *names_alt;
-    } u1;
 } OptionDef;

 /**
@@ -203,9 +144,10 @@ typedef struct OptionDef {
 * @param msg title of this group. Only printed if at least one option matches.
 * @param req_flags print only options which have all those flags set.
 * @param rej_flags don't print options which have any of those flags set.
+ * @param alt_flags print only options that have at least one of those flags set
 */
 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
-                       int rej_flags);
+                       int rej_flags, int alt_flags);

 /**
 * Show help for all options with given flags in class and all its
@@ -307,7 +249,7 @@ typedef struct OptionParseContext {
 *
 * @param optctx an app-specific options context. NULL for global options group
 */
-int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs);
+int parse_optgroup(void *optctx, OptionGroup *g);

 /**
 * Split the commandline into an intermediate form convenient for further
@@ -398,10 +340,7 @@ int setup_find_stream_info_opts(AVFormatContext *s,
 *
 * @see av_strerror()
 */
-static inline void print_error(const char *filename, int err)
-{
-    av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err));
-}
+void print_error(const char *filename, int err);

 /**
 * Print the program banner to stderr. The banner contents depend on the
@@ -480,7 +419,4 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems);

 double get_rotation(const int32_t *displaymatrix);

-/* read file contents into a string */
-char *file_read(const char *filename);
-
 #endif /* FFTOOLS_CMDUTILS_H */
@@ -99,8 +99,6 @@

 #include "cmdutils.h"
 #include "ffmpeg.h"
-#include "ffmpeg_sched.h"
-#include "ffmpeg_utils.h"
 #include "sync_queue.h"

 const char program_name[] = "ffmpeg";
@@ -117,7 +115,7 @@ typedef struct BenchmarkTimeStamps {
 static BenchmarkTimeStamps get_benchmark_time_stamps(void);
 static int64_t getmaxrss(void);

-atomic_uint nb_output_dumped = 0;
+unsigned nb_output_dumped = 0;

 static BenchmarkTimeStamps current_time;
 AVIOContext *progress_avio = NULL;
@@ -131,9 +129,6 @@ int         nb_output_files   = 0;
 FilterGraph **filtergraphs;
 int        nb_filtergraphs;

-Decoder     **decoders;
-int        nb_decoders;
-
 #if HAVE_TERMIOS_H

 /* init terminal so that we can grab keys */
@@ -141,6 +136,30 @@ static struct termios oldtty;
 static int restore_tty;
 #endif

+/* sub2video hack:
+   Convert subtitles to video with alpha to insert them in filter graphs.
+   This is a temporary solution until libavfilter gets real subtitles support.
+ */
+
+static void sub2video_heartbeat(InputFile *infile, int64_t pts, AVRational tb)
+{
+    /* When a frame is read from a file, examine all sub2video streams in
+       the same file and send the sub2video frame again. Otherwise, decoded
+       video frames could be accumulating in the filter graph while a filter
+       (possibly overlay) is desperately waiting for a subtitle frame. */
+    for (int i = 0; i < infile->nb_streams; i++) {
+        InputStream *ist = infile->streams[i];
+
+        if (ist->dec_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE)
+            continue;
+
+        for (int j = 0; j < ist->nb_filters; j++)
+            ifilter_sub2video_heartbeat(ist->filters[j], pts, tb);
+    }
+}
+
+/* end of sub2video hack */
+
 static void term_exit_sigsafe(void)
 {
 #if HAVE_TERMIOS_H
@@ -306,8 +325,9 @@ static int read_key(void)
        }
        //Read it
        if(nchars != 0) {
-            read(0, &ch, 1);
-            return ch;
+            if (read(0, &ch, 1) == 1)
+                return ch;
+            return 0;
        }else{
            return -1;
        }
@@ -328,25 +348,23 @@ const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };

 static void ffmpeg_cleanup(int ret)
 {
+    int i;
+
    if (do_benchmark) {
        int maxrss = getmaxrss() / 1024;
-        av_log(NULL, AV_LOG_INFO, "bench: maxrss=%iKiB\n", maxrss);
+        av_log(NULL, AV_LOG_INFO, "bench: maxrss=%ikB\n", maxrss);
    }

-    for (int i = 0; i < nb_filtergraphs; i++)
+    for (i = 0; i < nb_filtergraphs; i++)
        fg_free(&filtergraphs[i]);
    av_freep(&filtergraphs);

-    for (int i = 0; i < nb_output_files; i++)
+    for (i = 0; i < nb_output_files; i++)
        of_free(&output_files[i]);

-    for (int i = 0; i < nb_input_files; i++)
+    for (i = 0; i < nb_input_files; i++)
        ifile_close(&input_files[i]);

-    for (int i = 0; i < nb_decoders; i++)
-        dec_free(&decoders[i]);
-    av_freep(&decoders);
-
    if (vstats_file) {
        if (fclose(vstats_file))
            av_log(NULL, AV_LOG_ERROR,
@@ -379,7 +397,7 @@ static void ffmpeg_cleanup(int ret)

 OutputStream *ost_iter(OutputStream *prev)
 {
-    int of_idx  = prev ? prev->file->index : 0;
+    int of_idx  = prev ? prev->file_index : 0;
    int ost_idx = prev ? prev->index + 1  : 0;

    for (; of_idx < nb_output_files; of_idx++) {
@@ -395,7 +413,7 @@ OutputStream *ost_iter(OutputStream *prev)

 InputStream *ist_iter(InputStream *prev)
 {
-    int if_idx  = prev ? prev->file->index : 0;
+    int if_idx  = prev ? prev->file_index : 0;
    int ist_idx = prev ? prev->index + 1  : 0;

    for (; if_idx < nb_input_files; if_idx++) {
@@ -409,89 +427,21 @@ InputStream *ist_iter(InputStream *prev)
    return NULL;
 }

-static void frame_data_free(void *opaque, uint8_t *data)
-{
-    FrameData *fd = (FrameData *)data;
-
-    avcodec_parameters_free(&fd->par_enc);
-
-    av_free(data);
-}
-
-static int frame_data_ensure(AVBufferRef **dst, int writable)
-{
-    AVBufferRef *src = *dst;
-
-    if (!src || (writable && !av_buffer_is_writable(src))) {
-        FrameData *fd;
-
-        fd = av_mallocz(sizeof(*fd));
-        if (!fd)
-            return AVERROR(ENOMEM);
-
-        *dst = av_buffer_create((uint8_t *)fd, sizeof(*fd),
-                                frame_data_free, NULL, 0);
-        if (!*dst) {
-            av_buffer_unref(&src);
-            av_freep(&fd);
-            return AVERROR(ENOMEM);
-        }
-
-        if (src) {
-            const FrameData *fd_src = (const FrameData *)src->data;
-
-            memcpy(fd, fd_src, sizeof(*fd));
-            fd->par_enc = NULL;
-
-            if (fd_src->par_enc) {
-                int ret = 0;
-
-                fd->par_enc = avcodec_parameters_alloc();
-                ret = fd->par_enc ?
-                      avcodec_parameters_copy(fd->par_enc, fd_src->par_enc) :
-                      AVERROR(ENOMEM);
-                if (ret < 0) {
-                    av_buffer_unref(dst);
-                    av_buffer_unref(&src);
-                    return ret;
-                }
-            }
-
-            av_buffer_unref(&src);
-        } else {
-            fd->dec.frame_num = UINT64_MAX;
-            fd->dec.pts       = AV_NOPTS_VALUE;
-
-            for (unsigned i = 0; i < FF_ARRAY_ELEMS(fd->wallclock); i++)
-                fd->wallclock[i] = INT64_MIN;
-        }
-    }
-
-    return 0;
-}
-
 FrameData *frame_data(AVFrame *frame)
 {
-    int ret = frame_data_ensure(&frame->opaque_ref, 1);
-    return ret < 0 ? NULL : (FrameData*)frame->opaque_ref->data;
-}
+    if (!frame->opaque_ref) {
+        FrameData *fd;

-const FrameData *frame_data_c(AVFrame *frame)
-{
-    int ret = frame_data_ensure(&frame->opaque_ref, 0);
-    return ret < 0 ? NULL : (const FrameData*)frame->opaque_ref->data;
-}
+        frame->opaque_ref = av_buffer_allocz(sizeof(*fd));
+        if (!frame->opaque_ref)
+            return NULL;
+        fd = (FrameData*)frame->opaque_ref->data;

-FrameData *packet_data(AVPacket *pkt)
-{
-    int ret = frame_data_ensure(&pkt->opaque_ref, 1);
-    return ret < 0 ? NULL : (FrameData*)pkt->opaque_ref->data;
-}
+        fd->dec.frame_num = UINT64_MAX;
+        fd->dec.pts       = AV_NOPTS_VALUE;
+    }

-const FrameData *packet_data_c(AVPacket *pkt)
-{
-    int ret = frame_data_ensure(&pkt->opaque_ref, 0);
-    return ret < 0 ? NULL : (const FrameData*)pkt->opaque_ref->data;
+    return (FrameData*)frame->opaque_ref->data;
 }

 void remove_avoptions(AVDictionary **a, AVDictionary *b)
@@ -535,13 +485,23 @@ void update_benchmark(const char *fmt, ...)
    }
 }

-static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time, int64_t pts)
+void close_output_stream(OutputStream *ost)
+{
+    OutputFile *of = output_files[ost->file_index];
+    ost->finished |= ENCODER_FINISHED;
+
+    if (ost->sq_idx_encode >= 0)
+        sq_send(of->sq_encode, ost->sq_idx_encode, SQFRAME(NULL));
+}
+
+static void print_report(int is_last_report, int64_t timer_start, int64_t cur_time)
 {
    AVBPrint buf, buf_script;
    int64_t total_size = of_filesize(output_files[0]);
    int vid;
    double bitrate;
    double speed;
+    int64_t pts = AV_NOPTS_VALUE;
    static int64_t last_time = -1;
    static int first_report = 1;
    uint64_t nb_frames_dup = 0, nb_frames_drop = 0;
@@ -559,7 +519,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
            last_time = cur_time;
        }
        if (((cur_time - last_time) < stats_period && !first_report) ||
-            (first_report && atomic_load(&nb_output_dumped) < nb_output_files))
+            (first_report && nb_output_dumped < nb_output_files))
            return;
        last_time = cur_time;
    }
@@ -570,12 +530,12 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
    av_bprint_init(&buf_script, 0, AV_BPRINT_SIZE_AUTOMATIC);
    for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
-        const float q = ost->enc ? atomic_load(&ost->quality) / (float) FF_QP2LAMBDA : -1;
+        const float q = ost->enc ? ost->quality / (float) FF_QP2LAMBDA : -1;

        if (vid && ost->type == AVMEDIA_TYPE_VIDEO) {
            av_bprintf(&buf, "q=%2.1f ", q);
            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
-                       ost->file->index, ost->index, q);
+                       ost->file_index, ost->index, q);
        }
        if (!vid && ost->type == AVMEDIA_TYPE_VIDEO && ost->filter) {
            float fps;
@@ -587,22 +547,26 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
            av_bprintf(&buf_script, "frame=%"PRId64"\n", frame_number);
            av_bprintf(&buf_script, "fps=%.2f\n", fps);
            av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
-                       ost->file->index, ost->index, q);
+                       ost->file_index, ost->index, q);
            if (is_last_report)
                av_bprintf(&buf, "L");

-            nb_frames_dup  = atomic_load(&ost->filter->nb_frames_dup);
-            nb_frames_drop = atomic_load(&ost->filter->nb_frames_drop);
+            nb_frames_dup  = ost->filter->nb_frames_dup;
+            nb_frames_drop = ost->filter->nb_frames_drop;

            vid = 1;
        }
-    }
-
-    if (copy_ts) {
-        if (copy_ts_first_pts == AV_NOPTS_VALUE && pts > 1)
-            copy_ts_first_pts = pts;
-        if (copy_ts_first_pts != AV_NOPTS_VALUE)
-            pts -= copy_ts_first_pts;
+        /* compute min output value */
+        if (ost->last_mux_dts != AV_NOPTS_VALUE) {
+            if (pts == AV_NOPTS_VALUE || ost->last_mux_dts > pts)
+                pts = ost->last_mux_dts;
+            if (copy_ts) {
+                if (copy_ts_first_pts == AV_NOPTS_VALUE && pts > 1)
+                    copy_ts_first_pts = pts;
+                if (copy_ts_first_pts != AV_NOPTS_VALUE)
+                    pts -= copy_ts_first_pts;
+            }
+        }
    }

    us    = FFABS64U(pts) % AV_TIME_BASE;
@@ -615,7 +579,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
    speed   = pts != AV_NOPTS_VALUE && t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1;

    if (total_size < 0) av_bprintf(&buf, "size=N/A time=");
-    else                av_bprintf(&buf, "size=%8.0fKiB time=", total_size / 1024.0);
+    else                av_bprintf(&buf, "size=%8.0fkB time=", total_size / 1024.0);
    if (pts == AV_NOPTS_VALUE) {
        av_bprintf(&buf, "N/A ");
    } else {
@@ -685,6 +649,201 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
    first_report = 0;
 }

+int copy_av_subtitle(AVSubtitle *dst, const AVSubtitle *src)
+{
+    int ret = AVERROR_BUG;
+    AVSubtitle tmp = {
+        .format = src->format,
+        .start_display_time = src->start_display_time,
+        .end_display_time = src->end_display_time,
+        .num_rects = 0,
+        .rects = NULL,
+        .pts = src->pts
+    };
+
+    if (!src->num_rects)
+        goto success;
+
+    if (!(tmp.rects = av_calloc(src->num_rects, sizeof(*tmp.rects))))
+        return AVERROR(ENOMEM);
+
+    for (int i = 0; i < src->num_rects; i++) {
+        AVSubtitleRect *src_rect = src->rects[i];
+        AVSubtitleRect *dst_rect;
+
+        if (!(dst_rect = tmp.rects[i] = av_mallocz(sizeof(*tmp.rects[0])))) {
+            ret = AVERROR(ENOMEM);
+            goto cleanup;
+        }
+
+        tmp.num_rects++;
+
+        dst_rect->type      = src_rect->type;
+        dst_rect->flags     = src_rect->flags;
+
+        dst_rect->x         = src_rect->x;
+        dst_rect->y         = src_rect->y;
+        dst_rect->w         = src_rect->w;
+        dst_rect->h         = src_rect->h;
+        dst_rect->nb_colors = src_rect->nb_colors;
+
+        if (src_rect->text)
+            if (!(dst_rect->text = av_strdup(src_rect->text))) {
+                ret = AVERROR(ENOMEM);
+                goto cleanup;
+            }
+
+        if (src_rect->ass)
+            if (!(dst_rect->ass = av_strdup(src_rect->ass))) {
+                ret = AVERROR(ENOMEM);
+                goto cleanup;
+            }
+
+        for (int j = 0; j < 4; j++) {
+            // SUBTITLE_BITMAP images are special in the sense that they
+            // are like PAL8 images. first pointer to data, second to
+            // palette. This makes the size calculation match this.
+            size_t buf_size = src_rect->type == SUBTITLE_BITMAP && j == 1 ?
+                              AVPALETTE_SIZE :
+                              src_rect->h * src_rect->linesize[j];
+
+            if (!src_rect->data[j])
+                continue;
+
+            if (!(dst_rect->data[j] = av_memdup(src_rect->data[j], buf_size))) {
+                ret = AVERROR(ENOMEM);
+                goto cleanup;
+            }
+            dst_rect->linesize[j] = src_rect->linesize[j];
+        }
+    }
+
+success:
+    *dst = tmp;
+
+    return 0;
+
+cleanup:
+    avsubtitle_free(&tmp);
+
+    return ret;
+}
+
+static void subtitle_free(void *opaque, uint8_t *data)
+{
+    AVSubtitle *sub = (AVSubtitle*)data;
+    avsubtitle_free(sub);
+    av_free(sub);
+}
+
+int subtitle_wrap_frame(AVFrame *frame, AVSubtitle *subtitle, int copy)
+{
+    AVBufferRef *buf;
+    AVSubtitle *sub;
+    int ret;
+
+    if (copy) {
+        sub = av_mallocz(sizeof(*sub));
+        ret = sub ? copy_av_subtitle(sub, subtitle) : AVERROR(ENOMEM);
+        if (ret < 0) {
+            av_freep(&sub);
+            return ret;
+        }
+    } else {
+        sub = av_memdup(subtitle, sizeof(*subtitle));
+        if (!sub)
+            return AVERROR(ENOMEM);
+        memset(subtitle, 0, sizeof(*subtitle));
+    }
+
+    buf = av_buffer_create((uint8_t*)sub, sizeof(*sub),
+                           subtitle_free, NULL, 0);
+    if (!buf) {
+        avsubtitle_free(sub);
+        av_freep(&sub);
+        return AVERROR(ENOMEM);
+    }
+
+    frame->buf[0] = buf;
+
+    return 0;
+}
+
+int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt)
+{
+    OutputFile *of = output_files[ost->file_index];
+    int64_t signal_pts = av_rescale_q(pkt->pts, pkt->time_base,
+                                      AV_TIME_BASE_Q);
+
+    if (!ost->fix_sub_duration_heartbeat || !(pkt->flags & AV_PKT_FLAG_KEY))
+        // we are only interested in heartbeats on streams configured, and
+        // only on random access points.
+        return 0;
+
+    for (int i = 0; i < of->nb_streams; i++) {
+        OutputStream *iter_ost = of->streams[i];
+        InputStream  *ist      = iter_ost->ist;
+        int ret = AVERROR_BUG;
+
+        if (iter_ost == ost || !ist || !ist->decoding_needed ||
+            ist->dec_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE)
+            // We wish to skip the stream that causes the heartbeat,
+            // output streams without an input stream, streams not decoded
+            // (as fix_sub_duration is only done for decoded subtitles) as
+            // well as non-subtitle streams.
+            continue;
+
+        if ((ret = fix_sub_duration_heartbeat(ist, signal_pts)) < 0)
+            return ret;
+    }
+
+    return 0;
+}
+
+/* pkt = NULL means EOF (needed to flush decoder buffers) */
+static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
+{
+    InputFile *f = input_files[ist->file_index];
+    int64_t dts_est = AV_NOPTS_VALUE;
+    int ret = 0;
+    int eof_reached = 0;
+
+    if (ist->decoding_needed) {
+        ret = dec_packet(ist, pkt, no_eof);
+        if (ret < 0 && ret != AVERROR_EOF)
+            return ret;
+    }
+    if (ret == AVERROR_EOF || (!pkt && !ist->decoding_needed))
+        eof_reached = 1;
+
+    if (pkt && pkt->opaque_ref) {
+        DemuxPktData *pd = (DemuxPktData*)pkt->opaque_ref->data;
+        dts_est = pd->dts_est;
+    }
+
+    if (f->recording_time != INT64_MAX) {
+        int64_t start_time = 0;
+        if (copy_ts) {
+            start_time += f->start_time != AV_NOPTS_VALUE ? f->start_time : 0;
+            start_time += start_at_zero ? 0 : f->start_time_effective;
+        }
+        if (dts_est >= f->recording_time + start_time)
+            pkt = NULL;
+    }
+
+    for (int oidx = 0; oidx < ist->nb_outputs; oidx++) {
+        OutputStream *ost = ist->outputs[oidx];
+        if (ost->enc || (!pkt && no_eof))
+            continue;
+
+        ret = of_streamcopy(ost, pkt, dts_est);
+        if (ret < 0)
+            return ret;
+    }
+
+    return !eof_reached;
+}
+
 static void print_stream_maps(void)
 {
    av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
@@ -692,7 +851,7 @@ static void print_stream_maps(void)
        for (int j = 0; j < ist->nb_filters; j++) {
            if (!filtergraph_is_simple(ist->filters[j]->graph)) {
                av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d (%s) -> %s",
-                       ist->file->index, ist->index, ist->dec ? ist->dec->name : "?",
+                       ist->file_index, ist->index, ist->dec ? ist->dec->name : "?",
                       ist->filters[j]->name);
                if (nb_filtergraphs > 1)
                    av_log(NULL, AV_LOG_INFO, " (graph %d)", ist->filters[j]->graph->index);
@@ -705,7 +864,7 @@ static void print_stream_maps(void)
        if (ost->attachment_filename) {
            /* an attached file */
            av_log(NULL, AV_LOG_INFO, "  File %s -> Stream #%d:%d\n",
-                   ost->attachment_filename, ost->file->index, ost->index);
+                   ost->attachment_filename, ost->file_index, ost->index);
            continue;
        }

@@ -715,15 +874,15 @@ static void print_stream_maps(void)
            if (nb_filtergraphs > 1)
                av_log(NULL, AV_LOG_INFO, " (graph %d)", ost->filter->graph->index);

-            av_log(NULL, AV_LOG_INFO, " -> Stream #%d:%d (%s)\n", ost->file->index,
+            av_log(NULL, AV_LOG_INFO, " -> Stream #%d:%d (%s)\n", ost->file_index,
                   ost->index, ost->enc_ctx->codec->name);
            continue;
        }

        av_log(NULL, AV_LOG_INFO, "  Stream #%d:%d -> #%d:%d",
-               ost->ist->file->index,
+               ost->ist->file_index,
               ost->ist->index,
-               ost->file->index,
+               ost->file_index,
               ost->index);
        if (ost->enc_ctx) {
            const AVCodec *in_codec    = ost->ist->dec;
@@ -761,6 +920,43 @@ static void print_stream_maps(void)
    }
 }

+/**
+ * Select the output stream to process.
+ *
+ * @retval 0 an output stream was selected
+ * @retval AVERROR(EAGAIN) need to wait until more input is available
+ * @retval AVERROR_EOF no more streams need output
+ */
+static int choose_output(OutputStream **post)
+{
+    int64_t opts_min = INT64_MAX;
+    OutputStream *ost_min = NULL;
+
+    for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
+        int64_t opts;
+
+        if (ost->filter && ost->filter->last_pts != AV_NOPTS_VALUE) {
+            opts = ost->filter->last_pts;
+        } else {
+            opts = ost->last_mux_dts == AV_NOPTS_VALUE ?
+                   INT64_MIN : ost->last_mux_dts;
+        }
+
+        if (!ost->initialized && !ost->finished) {
+            ost_min = ost;
+            break;
+        }
+        if (!ost->finished && opts < opts_min) {
+            opts_min = opts;
+            ost_min  = ost;
+        }
+    }
+    if (!ost_min)
+        return AVERROR_EOF;
+    *post = ost_min;
+    return ost_min->unavailable ? AVERROR(EAGAIN) : 0;
+}
+
 static void set_tty_echo(int on)
 {
 #if HAVE_TERMIOS_H
@@ -832,29 +1028,161 @@ static int check_keyboard_interaction(int64_t cur_time)
    return 0;
 }

+static void reset_eagain(void)
+{
+    int i;
+    for (i = 0; i < nb_input_files; i++)
+        input_files[i]->eagain = 0;
+    for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost))
+        ost->unavailable = 0;
+}
+
+static void decode_flush(InputFile *ifile)
+{
+    for (int i = 0; i < ifile->nb_streams; i++) {
+        InputStream *ist = ifile->streams[i];
+
+        if (ist->discard || !ist->decoding_needed)
+            continue;
+
+        dec_packet(ist, NULL, 1);
+    }
+}
+
+/*
+ * Return
+ * - 0 -- one packet was read and processed
+ * - AVERROR(EAGAIN) -- no packets were available for selected file,
+ *   this function should be called again
+ * - AVERROR_EOF -- this function should not be called again
+ */
+static int process_input(int file_index)
+{
+    InputFile *ifile = input_files[file_index];
+    InputStream *ist;
+    AVPacket *pkt;
+    int ret, i;
+
+    ret = ifile_get_packet(ifile, &pkt);
+
+    if (ret == AVERROR(EAGAIN)) {
+        ifile->eagain = 1;
+        return ret;
+    }
+    if (ret == 1) {
+        /* the input file is looped: flush the decoders */
+        decode_flush(ifile);
+        return AVERROR(EAGAIN);
+    }
+    if (ret < 0) {
+        if (ret != AVERROR_EOF) {
+            av_log(ifile, AV_LOG_ERROR,
+                   "Error retrieving a packet from demuxer: %s\n", av_err2str(ret));
+            if (exit_on_error)
+                return ret;
+        }
+
+        for (i = 0; i < ifile->nb_streams; i++) {
+            ist = ifile->streams[i];
+            if (!ist->discard) {
+                ret = process_input_packet(ist, NULL, 0);
+                if (ret>0)
+                    return 0;
+                else if (ret < 0)
+                    return ret;
+            }
+
+            /* mark all outputs that don't go through lavfi as finished */
+            for (int oidx = 0; oidx < ist->nb_outputs; oidx++) {
+                OutputStream *ost = ist->outputs[oidx];
+                OutputFile    *of = output_files[ost->file_index];
+
+                ret = of_output_packet(of, ost, NULL);
+                if (ret < 0)
+                    return ret;
+            }
+        }
+
+        ifile->eof_reached = 1;
+        return AVERROR(EAGAIN);
+    }
+
+    reset_eagain();
+
+    ist = ifile->streams[pkt->stream_index];
+
+    sub2video_heartbeat(ifile, pkt->pts, pkt->time_base);
+
+    ret = process_input_packet(ist, pkt, 0);
+
+    av_packet_free(&pkt);
+
+    return ret < 0 ? ret : 0;
+}
+
+/**
+ * Run a single step of transcoding.
+ *
+ * @return  0 for success, <0 for error
+ */
+static int transcode_step(OutputStream *ost)
+{
+    InputStream  *ist = NULL;
+    int ret;
+
+    if (ost->filter) {
+        if ((ret = fg_transcode_step(ost->filter->graph, &ist)) < 0)
+            return ret;
+        if (!ist)
+            return 0;
+    } else {
+        ist = ost->ist;
+        av_assert0(ist);
+    }
+
+    ret = process_input(ist->file_index);
+    if (ret == AVERROR(EAGAIN)) {
+        if (input_files[ist->file_index]->eagain)
+            ost->unavailable = 1;
+        return 0;
+    }
+
+    if (ret < 0)
+        return ret == AVERROR_EOF ? 0 : ret;
+
+    // process_input() above might have caused output to become available
+    // in multiple filtergraphs, so we process all of them
+    for (int i = 0; i < nb_filtergraphs; i++) {
+        ret = reap_filters(filtergraphs[i], 0);
+        if (ret < 0)
+            return ret;
+    }
+
+    return 0;
+}
+
 /*
 * The following code is the main loop of the file converter
 */
-static int transcode(Scheduler *sch)
+static int transcode(int *err_rate_exceeded)
 {
-    int ret = 0;
-    int64_t timer_start, transcode_ts = 0;
+    int ret = 0, i;
+    InputStream *ist;
+    int64_t timer_start;

    print_stream_maps();

+    *err_rate_exceeded = 0;
    atomic_store(&transcode_init_done, 1);

-    ret = sch_start(sch);
-    if (ret < 0)
-        return ret;
-
    if (stdin_interaction) {
        av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");
    }

    timer_start = av_gettime_relative();

-    while (!sch_wait(sch, stats_period, &transcode_ts)) {
+    while (!received_sigterm) {
+        OutputStream *ost;
        int64_t cur_time= av_gettime_relative();

        /* if 'q' pressed, exits */
@@ -862,22 +1190,58 @@ static int transcode(Scheduler *sch)
            if (check_keyboard_interaction(cur_time) < 0)
                break;

+        ret = choose_output(&ost);
+        if (ret == AVERROR(EAGAIN)) {
+            reset_eagain();
+            av_usleep(10000);
+            ret = 0;
+            continue;
+        } else if (ret < 0) {
+            av_log(NULL, AV_LOG_VERBOSE, "No more output streams to write to, finishing.\n");
+            ret = 0;
+            break;
+        }
+
+        ret = transcode_step(ost);
+        if (ret < 0 && ret != AVERROR_EOF) {
+            av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", av_err2str(ret));
+            break;
+        }
+
        /* dump report by using the output first video and audio streams */
-        print_report(0, timer_start, cur_time, transcode_ts);
+        print_report(0, timer_start, cur_time);
    }

-    ret = sch_stop(sch, &transcode_ts);
+    /* at the end of stream, we must flush the decoder buffers */
+    for (ist = ist_iter(NULL); ist; ist = ist_iter(ist)) {
+        float err_rate;
+
+        if (!input_files[ist->file_index]->eof_reached) {
+            int err = process_input_packet(ist, NULL, 0);
+            ret = err_merge(ret, err);
+        }
+
+        err_rate = (ist->frames_decoded || ist->decode_errors) ?
+                   ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f;
+        if (err_rate > max_error_rate) {
+            av_log(ist, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n",
+                   err_rate, max_error_rate);
+            *err_rate_exceeded = 1;
+        } else if (err_rate)
+            av_log(ist, AV_LOG_VERBOSE, "Decode error rate %g\n", err_rate);
+    }
+    ret = err_merge(ret, enc_flush());
+
+    term_exit();

    /* write the trailer if needed */
-    for (int i = 0; i < nb_output_files; i++) {
+    for (i = 0; i < nb_output_files; i++) {
        int err = of_write_trailer(output_files[i]);
        ret = err_merge(ret, err);
    }

-    term_exit();
-
    /* dump report by using the first video and audio streams */
-    print_report(1, timer_start, av_gettime_relative(), transcode_ts);
+    print_report(1, timer_start, av_gettime_relative());

    return ret;
 }
@@ -928,9 +1292,7 @@ static int64_t getmaxrss(void)

 int main(int argc, char **argv)
 {
-    Scheduler *sch = NULL;
-
-    int ret;
+    int ret, err_rate_exceeded;
    BenchmarkTimeStamps ti;

    init_dynload();
@@ -947,14 +1309,8 @@ int main(int argc, char **argv)

    show_banner(argc, argv, options);

-    sch = sch_alloc();
-    if (!sch) {
-        ret = AVERROR(ENOMEM);
-        goto finish;
-    }
-
    /* parse options and open all input/output files */
-    ret = ffmpeg_parse_options(argc, argv, sch);
+    ret = ffmpeg_parse_options(argc, argv);
    if (ret < 0)
        goto finish;

@@ -972,7 +1328,7 @@ int main(int argc, char **argv)
    }

    current_time = ti = get_benchmark_time_stamps();
-    ret = transcode(sch);
+    ret = transcode(&err_rate_exceeded);
    if (ret >= 0 && do_benchmark) {
        int64_t utime, stime, rtime;
        current_time = get_benchmark_time_stamps();
@@ -984,16 +1340,13 @@ int main(int argc, char **argv)
               utime / 1000000.0, stime / 1000000.0, rtime / 1000000.0);
    }

-    ret = received_nb_signals                 ? 255 :
-          (ret == FFMPEG_ERROR_RATE_EXCEEDED) ?  69 : ret;
+    ret = received_nb_signals ? 255 :
+          err_rate_exceeded   ?  69 : ret;

 finish:
    if (ret == AVERROR_EXIT)
        ret = 0;

    ffmpeg_cleanup(ret);
-
-    sch_free(&sch);
-
    return ret;
 }
@@ -27,7 +27,6 @@
 #include <signal.h>

 #include "cmdutils.h"
-#include "ffmpeg_sched.h"
 #include "sync_queue.h"

 #include "libavformat/avformat.h"
@@ -51,16 +50,15 @@
 #include "libswresample/swresample.h"

 // deprecated features
+#define FFMPEG_OPT_PSNR 1
+#define FFMPEG_OPT_MAP_CHANNEL 1
+#define FFMPEG_OPT_MAP_SYNC 1
+#define FFMPEG_ROTATION_METADATA 1
 #define FFMPEG_OPT_QPHIST 1
 #define FFMPEG_OPT_ADRIFT_THRESHOLD 1
 #define FFMPEG_OPT_ENC_TIME_BASE_NUM 1
 #define FFMPEG_OPT_TOP 1
 #define FFMPEG_OPT_FORCE_KF_SOURCE_NO_DROP 1
-#define FFMPEG_OPT_VSYNC_DROP 1
-#define FFMPEG_OPT_VSYNC 1
-#define FFMPEG_OPT_FILTER_SCRIPT 1
-
-#define FFMPEG_ERROR_RATE_EXCEEDED FFERRTAG('E', 'R', 'E', 'D')

 enum VideoSyncMethod {
    VSYNC_AUTO = -1,
@@ -68,9 +66,7 @@ enum VideoSyncMethod {
    VSYNC_CFR,
    VSYNC_VFR,
    VSYNC_VSCFR,
-#if FFMPEG_OPT_VSYNC_DROP
    VSYNC_DROP,
-#endif
 };

 enum EncTimeBase {
@@ -84,28 +80,6 @@ enum HWAccelID {
    HWACCEL_GENERIC,
 };

-enum FrameOpaque {
-    FRAME_OPAQUE_SUB_HEARTBEAT = 1,
-    FRAME_OPAQUE_EOF,
-    FRAME_OPAQUE_SEND_COMMAND,
-};
-
-enum PacketOpaque {
-    PKT_OPAQUE_SUB_HEARTBEAT = 1,
-    PKT_OPAQUE_FIX_SUB_DURATION,
-};
-
-enum LatencyProbe {
-    LATENCY_PROBE_DEMUX,
-    LATENCY_PROBE_DEC_PRE,
-    LATENCY_PROBE_DEC_POST,
-    LATENCY_PROBE_FILTER_PRE,
-    LATENCY_PROBE_FILTER_POST,
-    LATENCY_PROBE_ENC_PRE,
-    LATENCY_PROBE_ENC_POST,
-    LATENCY_PROBE_NB,
-};
-
 typedef struct HWDevice {
    const char *name;
    enum AVHWDeviceType type;
@@ -120,6 +94,19 @@ typedef struct StreamMap {
    char *linklabel;       /* name of an output link, for mapping lavfi outputs */
 } StreamMap;

+#if FFMPEG_OPT_MAP_CHANNEL
+typedef struct {
+    int  file_idx,  stream_idx,  channel_idx; // input
+    int ofile_idx, ostream_idx;               // output
+} AudioChannelMap;
+#endif
+
+typedef struct DemuxPktData {
+    // estimated dts in AV_TIME_BASE_Q,
+    // to be used when real dts is missing
+    int64_t dts_est;
+} DemuxPktData;
+
 typedef struct OptionsContext {
    OptionGroup *g;

@@ -129,14 +116,22 @@ typedef struct OptionsContext {
    int seek_timestamp;
    const char *format;

-    SpecifierOptList codec_names;
-    SpecifierOptList audio_ch_layouts;
-    SpecifierOptList audio_channels;
-    SpecifierOptList audio_sample_rate;
-    SpecifierOptList frame_rates;
-    SpecifierOptList max_frame_rates;
-    SpecifierOptList frame_sizes;
-    SpecifierOptList frame_pix_fmts;
+    SpecifierOpt *codec_names;
+    int        nb_codec_names;
+    SpecifierOpt *audio_ch_layouts;
+    int        nb_audio_ch_layouts;
+    SpecifierOpt *audio_channels;
+    int        nb_audio_channels;
+    SpecifierOpt *audio_sample_rate;
+    int        nb_audio_sample_rate;
+    SpecifierOpt *frame_rates;
+    int        nb_frame_rates;
+    SpecifierOpt *max_frame_rates;
+    int        nb_max_frame_rates;
+    SpecifierOpt *frame_sizes;
+    int        nb_frame_sizes;
+    SpecifierOpt *frame_pix_fmts;
+    int        nb_frame_pix_fmts;

    /* input options */
    int64_t input_ts_offset;
@@ -149,16 +144,26 @@ typedef struct OptionsContext {
    int input_sync_ref;
    int find_stream_info;

-    SpecifierOptList ts_scale;
-    SpecifierOptList dump_attachment;
-    SpecifierOptList hwaccels;
-    SpecifierOptList hwaccel_devices;
-    SpecifierOptList hwaccel_output_formats;
-    SpecifierOptList autorotate;
+    SpecifierOpt *ts_scale;
+    int        nb_ts_scale;
+    SpecifierOpt *dump_attachment;
+    int        nb_dump_attachment;
+    SpecifierOpt *hwaccels;
+    int        nb_hwaccels;
+    SpecifierOpt *hwaccel_devices;
+    int        nb_hwaccel_devices;
+    SpecifierOpt *hwaccel_output_formats;
+    int        nb_hwaccel_output_formats;
+    SpecifierOpt *autorotate;
+    int        nb_autorotate;

    /* output options */
    StreamMap *stream_maps;
    int     nb_stream_maps;
+#if FFMPEG_OPT_MAP_CHANNEL
+    AudioChannelMap *audio_channel_maps; /* one info entry per -map_channel */
+    int           nb_audio_channel_maps; /* number of (valid) -map_channel settings */
+#endif
    const char **attachments;
    int       nb_attachments;

@@ -181,88 +186,106 @@ typedef struct OptionsContext {
    // keys are stream indices
    AVDictionary *streamid;

-    SpecifierOptList metadata;
-    SpecifierOptList max_frames;
-    SpecifierOptList bitstream_filters;
-    SpecifierOptList codec_tags;
-    SpecifierOptList sample_fmts;
-    SpecifierOptList qscale;
-    SpecifierOptList forced_key_frames;
-    SpecifierOptList fps_mode;
-    SpecifierOptList force_fps;
-    SpecifierOptList frame_aspect_ratios;
-    SpecifierOptList display_rotations;
-    SpecifierOptList display_hflips;
-    SpecifierOptList display_vflips;
-    SpecifierOptList rc_overrides;
-    SpecifierOptList intra_matrices;
-    SpecifierOptList inter_matrices;
-    SpecifierOptList chroma_intra_matrices;
+    SpecifierOpt *metadata;
+    int        nb_metadata;
+    SpecifierOpt *max_frames;
+    int        nb_max_frames;
+    SpecifierOpt *bitstream_filters;
+    int        nb_bitstream_filters;
+    SpecifierOpt *codec_tags;
+    int        nb_codec_tags;
+    SpecifierOpt *sample_fmts;
+    int        nb_sample_fmts;
+    SpecifierOpt *qscale;
+    int        nb_qscale;
+    SpecifierOpt *forced_key_frames;
+    int        nb_forced_key_frames;
+    SpecifierOpt *fps_mode;
+    int        nb_fps_mode;
+    SpecifierOpt *force_fps;
+    int        nb_force_fps;
+    SpecifierOpt *frame_aspect_ratios;
+    int        nb_frame_aspect_ratios;
+    SpecifierOpt *display_rotations;
+    int        nb_display_rotations;
+    SpecifierOpt *display_hflips;
+    int        nb_display_hflips;
+    SpecifierOpt *display_vflips;
+    int        nb_display_vflips;
+    SpecifierOpt *rc_overrides;
+    int        nb_rc_overrides;
+    SpecifierOpt *intra_matrices;
+    int        nb_intra_matrices;
+    SpecifierOpt *inter_matrices;
+    int        nb_inter_matrices;
+    SpecifierOpt *chroma_intra_matrices;
+    int        nb_chroma_intra_matrices;
 #if FFMPEG_OPT_TOP
-    SpecifierOptList top_field_first;
+    SpecifierOpt *top_field_first;
+    int        nb_top_field_first;
 #endif
-    SpecifierOptList metadata_map;
-    SpecifierOptList presets;
-    SpecifierOptList copy_initial_nonkeyframes;
-    SpecifierOptList copy_prior_start;
-    SpecifierOptList filters;
-#if FFMPEG_OPT_FILTER_SCRIPT
-    SpecifierOptList filter_scripts;
-#endif
-    SpecifierOptList reinit_filters;
-    SpecifierOptList fix_sub_duration;
-    SpecifierOptList fix_sub_duration_heartbeat;
-    SpecifierOptList canvas_sizes;
-    SpecifierOptList pass;
-    SpecifierOptList passlogfiles;
-    SpecifierOptList max_muxing_queue_size;
-    SpecifierOptList muxing_queue_data_threshold;
-    SpecifierOptList guess_layout_max;
-    SpecifierOptList apad;
-    SpecifierOptList discard;
-    SpecifierOptList disposition;
-    SpecifierOptList program;
-    SpecifierOptList stream_groups;
-    SpecifierOptList time_bases;
-    SpecifierOptList enc_time_bases;
-    SpecifierOptList autoscale;
-    SpecifierOptList bits_per_raw_sample;
-    SpecifierOptList enc_stats_pre;
-    SpecifierOptList enc_stats_post;
-    SpecifierOptList mux_stats;
-    SpecifierOptList enc_stats_pre_fmt;
-    SpecifierOptList enc_stats_post_fmt;
-    SpecifierOptList mux_stats_fmt;
+    SpecifierOpt *metadata_map;
+    int        nb_metadata_map;
+    SpecifierOpt *presets;
+    int        nb_presets;
+    SpecifierOpt *copy_initial_nonkeyframes;
+    int        nb_copy_initial_nonkeyframes;
+    SpecifierOpt *copy_prior_start;
+    int        nb_copy_prior_start;
+    SpecifierOpt *filters;
+    int        nb_filters;
+    SpecifierOpt *filter_scripts;
+    int        nb_filter_scripts;
+    SpecifierOpt *reinit_filters;
+    int        nb_reinit_filters;
+    SpecifierOpt *fix_sub_duration;
+    int        nb_fix_sub_duration;
+    SpecifierOpt *fix_sub_duration_heartbeat;
+    int        nb_fix_sub_duration_heartbeat;
+    SpecifierOpt *canvas_sizes;
+    int        nb_canvas_sizes;
+    SpecifierOpt *pass;
+    int        nb_pass;
+    SpecifierOpt *passlogfiles;
+    int        nb_passlogfiles;
+    SpecifierOpt *max_muxing_queue_size;
+    int        nb_max_muxing_queue_size;
+    SpecifierOpt *muxing_queue_data_threshold;
+    int        nb_muxing_queue_data_threshold;
+    SpecifierOpt *guess_layout_max;
+    int        nb_guess_layout_max;
+    SpecifierOpt *apad;
+    int        nb_apad;
+    SpecifierOpt *discard;
+    int        nb_discard;
+    SpecifierOpt *disposition;
+    int        nb_disposition;
+    SpecifierOpt *program;
+    int        nb_program;
+    SpecifierOpt *time_bases;
+    int        nb_time_bases;
+    SpecifierOpt *enc_time_bases;
+    int        nb_enc_time_bases;
+    SpecifierOpt *autoscale;
+    int        nb_autoscale;
+    SpecifierOpt *bits_per_raw_sample;
+    int        nb_bits_per_raw_sample;
+    SpecifierOpt *enc_stats_pre;
+    int        nb_enc_stats_pre;
+    SpecifierOpt *enc_stats_post;
+    int        nb_enc_stats_post;
+    SpecifierOpt *mux_stats;
+    int        nb_mux_stats;
+    SpecifierOpt *enc_stats_pre_fmt;
+    int        nb_enc_stats_pre_fmt;
+    SpecifierOpt *enc_stats_post_fmt;
+    int        nb_enc_stats_post_fmt;
+    SpecifierOpt *mux_stats_fmt;
+    int        nb_mux_stats_fmt;
+
+    int depth;
 } OptionsContext;

-enum IFilterFlags {
-    IFILTER_FLAG_AUTOROTATE     = (1 << 0),
-    IFILTER_FLAG_REINIT         = (1 << 1),
-    IFILTER_FLAG_CFR            = (1 << 2),
-};
-
-typedef struct InputFilterOptions {
-    int64_t             trim_start_us;
-    int64_t             trim_end_us;
-
-    uint8_t            *name;
-
-    /* When IFILTER_FLAG_CFR is set, the stream is guaranteed to be CFR with
-     * this framerate.
-     *
-     * Otherwise, this is an estimate that should not be relied upon to be
-     * accurate */
-    AVRational          framerate;
-
-    int                 sub2video_width;
-    int                 sub2video_height;
-
-    // a combination of IFILTER_FLAG_*
-    unsigned            flags;
-
-    AVFrame            *fallback;
-} InputFilterOptions;
-
 typedef struct InputFilter {
    struct FilterGraph *graph;
    uint8_t            *name;
@@ -279,103 +302,73 @@ typedef struct OutputFilter {

    enum AVMediaType     type;

-    atomic_uint_least64_t nb_frames_dup;
-    atomic_uint_least64_t nb_frames_drop;
+    /* pts of the last frame received from this filter, in AV_TIME_BASE_Q */
+    int64_t last_pts;
+
+    uint64_t nb_frames_dup;
+    uint64_t nb_frames_drop;
 } OutputFilter;

 typedef struct FilterGraph {
    const AVClass *class;
    int            index;

+    AVFilterGraph *graph;
+
    InputFilter   **inputs;
    int          nb_inputs;
    OutputFilter **outputs;
    int         nb_outputs;
 } FilterGraph;

-enum DecoderFlags {
-    DECODER_FLAG_FIX_SUB_DURATION = (1 << 0),
-    // input timestamps are unreliable (guessed by demuxer)
-    DECODER_FLAG_TS_UNRELIABLE    = (1 << 1),
-    // decoder should override timestamps by fixed framerate
-    // from DecoderOpts.framerate
-    DECODER_FLAG_FRAMERATE_FORCED = (1 << 2),
-#if FFMPEG_OPT_TOP
-    DECODER_FLAG_TOP_FIELD_FIRST  = (1 << 3),
-#endif
-    DECODER_FLAG_SEND_END_TS      = (1 << 4),
-};
-
-typedef struct DecoderOpts {
-    int                         flags;
-
-    char                       *name;
-    void                       *log_parent;
-
-    const AVCodec              *codec;
-    const AVCodecParameters    *par;
-
-    /* hwaccel options */
-    enum HWAccelID              hwaccel_id;
-    enum AVHWDeviceType         hwaccel_device_type;
-    char                       *hwaccel_device;
-    enum AVPixelFormat          hwaccel_output_format;
-
-    AVRational                  time_base;
-
-    // Either forced (when DECODER_FLAG_FRAMERATE_FORCED is set) or
-    // estimated (otherwise) video framerate.
-    AVRational                  framerate;
-} DecoderOpts;
-
-typedef struct Decoder {
-    const AVClass   *class;
-
-    enum AVMediaType type;
-
-    const uint8_t   *subtitle_header;
-    int              subtitle_header_size;
-
-    // number of frames/samples retrieved from the decoder
-    uint64_t         frames_decoded;
-    uint64_t         samples_decoded;
-    uint64_t         decode_errors;
-} Decoder;
+typedef struct Decoder Decoder;

 typedef struct InputStream {
-    const AVClass        *class;
+    const AVClass *class;

-    /* parent source */
-    struct InputFile     *file;
+    int file_index;
+    int index;

-    int                   index;
-
-    AVStream             *st;
-    int                   user_set_discard;
+    AVStream *st;
+    int discard;             /* true if stream data should be discarded */
+    int user_set_discard;
+    int decoding_needed;     /* non zero if the packets must be decoded in 'raw_fifo', see DECODING_FOR_* */
+#define DECODING_FOR_OST    1
+#define DECODING_FOR_FILTER 2

    /**
     * Codec parameters - to be used by the decoding/streamcopy code.
     * st->codecpar should not be accessed, because it may be modified
     * concurrently by the demuxing thread.
     */
-    AVCodecParameters    *par;
-    Decoder              *decoder;
-    const AVCodec        *dec;
+    AVCodecParameters *par;
+    Decoder *decoder;
+    AVCodecContext *dec_ctx;
+    const AVCodec *dec;
+    const AVCodecDescriptor *codec_desc;

-    /* framerate forced with -r */
-    AVRational            framerate;
+    AVRational framerate_guessed;
+
+    int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */
+
+    AVDictionary *decoder_opts;
+    AVRational framerate;               /* framerate forced with -r */
 #if FFMPEG_OPT_TOP
-    int                   top_field_first;
+    int top_field_first;
 #endif

-    int                   autorotate;
+    int autorotate;

-    int                   fix_sub_duration;
+    int fix_sub_duration;
+
+    struct sub2video {
+        int w, h;
+    } sub2video;

    /* decoded data from this stream goes into all those filters
     * currently video and audio only */
-    InputFilter         **filters;
-    int                nb_filters;
+    InputFilter **filters;
+    int        nb_filters;

    /*
     * Output targets that do not go through lavfi, i.e. subtitles or
@@ -384,29 +377,61 @@ typedef struct InputStream {
     */
    struct OutputStream **outputs;
    int                nb_outputs;
+
+    int reinit_filters;
+
+    /* hwaccel options */
+    enum HWAccelID hwaccel_id;
+    enum AVHWDeviceType hwaccel_device_type;
+    char  *hwaccel_device;
+    enum AVPixelFormat hwaccel_output_format;
+
+    /* stats */
+    // number of frames/samples retrieved from the decoder
+    uint64_t frames_decoded;
+    uint64_t samples_decoded;
+    uint64_t decode_errors;
 } InputStream;

-typedef struct InputFile {
-    const AVClass   *class;
+typedef struct LastFrameDuration {
+    int     stream_idx;
+    int64_t duration;
+} LastFrameDuration;

-    int              index;
+typedef struct InputFile {
+    const AVClass *class;
+
+    int index;
+
+    // input format has no timestamps
+    int format_nots;

    AVFormatContext *ctx;
-    int64_t          input_ts_offset;
-    int              input_sync_ref;
+    int eof_reached;      /* true if eof reached */
+    int eagain;           /* true if last read attempt returned EAGAIN */
+    int64_t input_ts_offset;
+    int input_sync_ref;
    /**
     * Effective format start time based on enabled streams.
     */
-    int64_t          start_time_effective;
-    int64_t          ts_offset;
-    /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
-    int64_t          start_time;
+    int64_t start_time_effective;
+    int64_t ts_offset;
+    int64_t start_time;   /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
+    int64_t recording_time;

    /* streams that ffmpeg is aware of;
     * there may be extra streams in ctx that are not mapped to an InputStream
     * if new streams appear dynamically during demuxing */
-    InputStream    **streams;
-    int           nb_streams;
+    InputStream **streams;
+    int        nb_streams;
+
+    float readrate;
+    int accurate_seek;
+
+    /* when looping the input file, this queue is used by decoders to report
+     * the last frame duration back to the demuxer thread */
+    AVThreadMessageQueue *audio_duration_queue;
+    int                   audio_duration_queue_size;
 } InputFile;

 enum forced_keyframes_const {
@@ -440,7 +465,6 @@ enum EncStatsType {
    ENC_STATS_PKT_SIZE,
    ENC_STATS_BITRATE,
    ENC_STATS_AVG_BITRATE,
-    ENC_STATS_KEYFRAME,
 };

 typedef struct EncStatsComponent {
@@ -455,9 +479,6 @@ typedef struct EncStats {
    int              nb_components;

    AVIOContext        *io;
-
-    pthread_mutex_t     lock;
-    int                 lock_initialized;
 } EncStats;

 extern const char *const forced_keyframes_const_names[];
@@ -497,9 +518,7 @@ typedef struct OutputStream {

    enum AVMediaType type;

-    /* parent muxer */
-    struct OutputFile *file;
-
+    int file_index;          /* file index */
    int index;               /* stream index in the output file */

    /**
@@ -514,6 +533,8 @@ typedef struct OutputStream {
    InputStream *ist;

    AVStream *st;            /* stream in the output file */
+    /* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */
+    int64_t last_mux_dts;

    AVRational enc_timebase;

@@ -528,15 +549,27 @@ typedef struct OutputStream {
    int force_fps;
 #if FFMPEG_OPT_TOP
    int top_field_first;
+#endif
+#if FFMPEG_ROTATION_METADATA
+    int rotate_overridden;
 #endif
    int autoscale;
    int bitexact;
    int bits_per_raw_sample;
+#if FFMPEG_ROTATION_METADATA
+    double rotate_override_value;
+#endif

    AVRational frame_aspect_ratio;

    KeyframeForceCtx kf;

+    /* audio only */
+#if FFMPEG_OPT_MAP_CHANNEL
+    int *audio_channels_map;             /* list of the channels id to pick from the source stream */
+    int audio_channels_mapped;           /* number of channels in audio_channels_map */
+#endif
+
    char *logfile_prefix;
    FILE *logfile;

@@ -546,8 +579,15 @@ typedef struct OutputStream {
    AVDictionary *sws_dict;
    AVDictionary *swr_opts;
    char *apad;
+    OSTFinished finished;        /* no more packets should be written for this stream */
+    int unavailable;                     /* true if the steram is unavailable (possibly temporarily) */

-    char *attachment_filename;
+    // init_output_stream() has been called for this stream
+    // The encoder and the bitstream filters have been initialized and the stream
+    // parameters are set in the AVStream.
+    int initialized;
+
+    const char *attachment_filename;

    int keep_pix_fmt;

@@ -559,7 +599,10 @@ typedef struct OutputStream {
    uint64_t samples_encoded;

    /* packet quality factor */
-    atomic_int quality;
+    int quality;
+
+    int sq_idx_encode;
+    int sq_idx_mux;

    EncStats enc_stats_pre;
    EncStats enc_stats_post;
@@ -582,6 +625,8 @@ typedef struct OutputFile {
    OutputStream **streams;
    int         nb_streams;

+    SyncQueue *sq_encode;
+
    int64_t recording_time;  ///< desired length of the resulting file in microseconds == AV_TIME_BASE units
    int64_t start_time;      ///< start time in microseconds == AV_TIME_BASE units

@@ -591,10 +636,6 @@ typedef struct OutputFile {

 // optionally attached as opaque_ref to decoded AVFrames
 typedef struct FrameData {
-    // demuxer-estimated dts in AV_TIME_BASE_Q,
-    // to be used when real dts is missing
-    int64_t dts_est;
-
    // properties that come from the decoder
    struct {
        uint64_t   frame_num;
@@ -606,10 +647,6 @@ typedef struct FrameData {
    AVRational frame_rate_filter;

    int        bits_per_raw_sample;
-
-    int64_t wallclock[LATENCY_PROBE_NB];
-
-    AVCodecParameters *par_enc;
 } FrameData;

 extern InputFile   **input_files;
@@ -621,11 +658,8 @@ extern int         nb_output_files;
 extern FilterGraph **filtergraphs;
 extern int        nb_filtergraphs;

-// standalone decoders (not tied to demuxed streams)
-extern Decoder     **decoders;
-extern int        nb_decoders;
-
 extern char *vstats_filename;
+extern char *sdp_filename;

 extern float dts_delta_threshold;
 extern float dts_error_threshold;
@@ -658,7 +692,7 @@ extern const AVIOInterruptCB int_cb;
 extern const OptionDef options[];
 extern HWDevice *filter_hw_device;

-extern atomic_uint nb_output_dumped;
+extern unsigned nb_output_dumped;

 extern int ignore_unknown_streams;
 extern int copy_unknown_streams;
@@ -667,6 +701,10 @@ extern int recast_media;

 extern FILE *vstats_file;

+#if FFMPEG_OPT_PSNR
+extern int do_psnr;
+#endif
+
 void term_init(void);
 void term_exit(void);

@@ -676,16 +714,20 @@ void remove_avoptions(AVDictionary **a, AVDictionary *b);
 int check_avoptions(AVDictionary *m);

 int assert_file_overwrite(const char *filename);
+char *file_read(const char *filename);
 AVDictionary *strip_specifiers(const AVDictionary *dict);
 int find_codec(void *logctx, const char *name,
               enum AVMediaType type, int encoder, const AVCodec **codec);
 int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global);

+int check_filter_outputs(void);
 int filtergraph_is_simple(const FilterGraph *fg);
 int init_simple_filtergraph(InputStream *ist, OutputStream *ost,
-                            char *graph_desc,
-                            Scheduler *sch, unsigned sch_idx_enc);
-int fg_finalise_bindings(FilterGraph *fg);
+                            char *graph_desc);
+int init_complex_filtergraph(FilterGraph *fg);
+
+int copy_av_subtitle(AVSubtitle *dst, const AVSubtitle *src);
+int subtitle_wrap_frame(AVFrame *frame, AVSubtitle *subtitle, int copy);

 /**
 * Get our axiliary frame data attached to the frame, allocating it
@@ -693,13 +735,19 @@ int fg_finalise_bindings(FilterGraph *fg);
 */
 FrameData *frame_data(AVFrame *frame);

-const FrameData *frame_data_c(AVFrame *frame);
+int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference);
+int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb);
+int ifilter_sub2video(InputFilter *ifilter, const AVFrame *frame);
+void ifilter_sub2video_heartbeat(InputFilter *ifilter, int64_t pts, AVRational tb);

-FrameData       *packet_data  (AVPacket *pkt);
-const FrameData *packet_data_c(AVPacket *pkt);
+/**
+ * Set up fallback filtering parameters from a decoder context. They will only
+ * be used if no frames are ever sent on this input, otherwise the actual
+ * parameters are taken from the frame.
+ */
+int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec);

-int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost,
-                     unsigned sched_idx_enc);
+int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost);

 /**
 * Create a new filtergraph in the global filtergraph list.
@@ -707,14 +755,31 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost,
 * @param graph_desc Graph description; an av_malloc()ed string, filtergraph
 *                   takes ownership of it.
 */
-int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch);
+int fg_create(FilterGraph **pfg, char *graph_desc);

 void fg_free(FilterGraph **pfg);

+/**
+ * Perform a step of transcoding for the specified filter graph.
+ *
+ * @param[in]  graph     filter graph to consider
+ * @param[out] best_ist  input stream where a frame would allow to continue
+ * @return  0 for success, <0 for error
+ */
+int fg_transcode_step(FilterGraph *graph, InputStream **best_ist);
+
 void fg_send_command(FilterGraph *fg, double time, const char *target,
                     const char *command, const char *arg, int all_filters);

-int ffmpeg_parse_options(int argc, char **argv, Scheduler *sch);
+/**
+ * Get and encode new output from specified filtergraph, without causing
+ * activity.
+ *
+ * @return  0 for success, <0 for severe errors
+ */
+int reap_filters(FilterGraph *fg, int flush);
+
+int ffmpeg_parse_options(int argc, char **argv);

 void enc_stats_write(OutputStream *ost, EncStats *es,
                     const AVFrame *frame, const AVPacket *pkt,
@@ -735,39 +800,29 @@ void hw_device_free_all(void);
 */
 AVBufferRef *hw_device_for_filter(void);

-/**
- * Create a standalone decoder.
- */
-int dec_create(const OptionsContext *o, const char *arg, Scheduler *sch);
+int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input);

-/**
- * @param dec_opts Dictionary filled with decoder options. Its ownership
- *                 is transferred to the decoder.
- * @param param_out If non-NULL, media properties after opening the decoder
- *                  are written here.
- *
- * @retval ">=0" non-negative scheduler index on success
- * @retval "<0"  an error code on failure
- */
-int dec_init(Decoder **pdec, Scheduler *sch,
-             AVDictionary **dec_opts, const DecoderOpts *o,
-             AVFrame *param_out);
+int dec_open(InputStream *ist);
 void dec_free(Decoder **pdec);

-/*
- * Called by filters to connect decoder's output to given filtergraph input.
+/**
+ * Submit a packet for decoding
 *
- * @param opts filtergraph input options, to be filled by this function
+ * When pkt==NULL and no_eof=0, there will be no more input. Flush decoders and
+ * mark all downstreams as finished.
+ *
+ * When pkt==NULL and no_eof=1, the stream was reset (e.g. after a seek). Flush
+ * decoders and await further input.
 */
-int dec_filter_add(Decoder *dec, InputFilter *ifilter, InputFilterOptions *opts);
+int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof);

-int enc_alloc(Encoder **penc, const AVCodec *codec,
-              Scheduler *sch, unsigned sch_idx);
+int enc_alloc(Encoder **penc, const AVCodec *codec);
 void enc_free(Encoder **penc);

-int enc_open(void *opaque, const AVFrame *frame);
-
-int enc_loopback(Encoder *enc);
+int enc_open(OutputStream *ost, const AVFrame *frame);
+int enc_subtitle(OutputFile *of, OutputStream *ost, const AVSubtitle *sub);
+int enc_frame(OutputStream *ost, AVFrame *frame);
+int enc_flush(void);

 /*
 * Initialize muxing state for the given stream, should be called
@@ -777,19 +832,37 @@ int enc_loopback(Encoder *enc);
 */
 int of_stream_init(OutputFile *of, OutputStream *ost);
 int of_write_trailer(OutputFile *of);
-int of_open(const OptionsContext *o, const char *filename, Scheduler *sch);
+int of_open(const OptionsContext *o, const char *filename);
 void of_free(OutputFile **pof);

 void of_enc_stats_close(void);

+int of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt);
+
+/**
+ * @param dts predicted packet dts in AV_TIME_BASE_Q
+ */
+int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts);
+
 int64_t of_filesize(OutputFile *of);

-int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch);
+int ifile_open(const OptionsContext *o, const char *filename);
 void ifile_close(InputFile **f);

+/**
+ * Get next input packet from the demuxer.
+ *
+ * @param pkt the packet is written here when this function returns 0
+ * @return
+ * - 0 when a packet has been read successfully
+ * - 1 when stream end was reached, but the stream is looped;
+ *     caller should flush decoders and read from this demuxer again
+ * - a negative error code on failure
+ */
+int ifile_get_packet(InputFile *f, AVPacket **pkt);
+
 int ist_output_add(InputStream *ist, OutputStream *ost);
-int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple,
-                   InputFilterOptions *opts);
+int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple);

 /**
 * Find an unused input stream of given type.
@@ -804,8 +877,23 @@ InputStream *ist_iter(InputStream *prev);
 * pass NULL to start iteration */
 OutputStream *ost_iter(OutputStream *prev);

+void close_output_stream(OutputStream *ost);
+int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt);
+int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts);
 void update_benchmark(const char *fmt, ...);

+/**
+ * Merge two return codes - return one of the error codes if at least one of
+ * them was negative, 0 otherwise.
+ */
+static inline int err_merge(int err0, int err1)
+{
+    // prefer "real" errors over EOF
+    if ((err0 >= 0 || err0 == AVERROR_EOF) && err1 < 0)
+        return err1;
+    return (err0 < 0) ? err0 : FFMIN(err1, 0);
+}
+
 #define SPECIFIER_OPT_FMT_str  "%s"
 #define SPECIFIER_OPT_FMT_i    "%i"
 #define SPECIFIER_OPT_FMT_i64  "%"PRId64
@@ -813,41 +901,58 @@ void update_benchmark(const char *fmt, ...);
 #define SPECIFIER_OPT_FMT_f    "%f"
 #define SPECIFIER_OPT_FMT_dbl  "%lf"

-#define WARN_MULTIPLE_OPT_USAGE(optname, type, idx, st)\
+#define WARN_MULTIPLE_OPT_USAGE(name, type, so, st)\
 {\
    char namestr[128] = "";\
-    const SpecifierOpt *so = &o->optname.opt[idx];\
    const char *spec = so->specifier && so->specifier[0] ? so->specifier : "";\
-    snprintf(namestr, sizeof(namestr), "-%s", o->optname.opt_canon->name);\
-    if (o->optname.opt_canon->flags & OPT_HAS_ALT) {\
-        const char * const *names_alt = o->optname.opt_canon->u1.names_alt;\
-        for (int _i = 0; names_alt[_i]; _i++)\
-            av_strlcatf(namestr, sizeof(namestr), "/-%s", names_alt[_i]);\
-    }\
+    for (int _i = 0; opt_name_##name[_i]; _i++)\
+        av_strlcatf(namestr, sizeof(namestr), "-%s%s", opt_name_##name[_i], opt_name_##name[_i+1] ? (opt_name_##name[_i+2] ? ", " : " or ") : "");\
    av_log(NULL, AV_LOG_WARNING, "Multiple %s options specified for stream %d, only the last option '-%s%s%s "SPECIFIER_OPT_FMT_##type"' will be used.\n",\
-           namestr, st->index, o->optname.opt_canon->name, spec[0] ? ":" : "", spec, so->u.type);\
+           namestr, st->index, opt_name_##name[0], spec[0] ? ":" : "", spec, so->u.type);\
 }

 #define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
 {\
-    int _ret, _matches = 0, _match_idx;\
-    for (int _i = 0; _i < o->name.nb_opt; _i++) {\
-        char *spec = o->name.opt[_i].specifier;\
+    int _ret, _matches = 0;\
+    SpecifierOpt *so;\
+    for (int _i = 0; _i < o->nb_ ## name; _i++) {\
+        char *spec = o->name[_i].specifier;\
        if ((_ret = check_stream_specifier(fmtctx, st, spec)) > 0) {\
-            outvar = o->name.opt[_i].u.type;\
-            _match_idx = _i;\
+            outvar = o->name[_i].u.type;\
+            so = &o->name[_i];\
            _matches++;\
        } else if (_ret < 0)\
            return _ret;\
    }\
-    if (_matches > 1 && o->name.opt_canon)\
-       WARN_MULTIPLE_OPT_USAGE(name, type, _match_idx, st);\
+    if (_matches > 1)\
+       WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\
 }

-const char *opt_match_per_type_str(const SpecifierOptList *sol,
-                                   char mediatype);
+#define MATCH_PER_TYPE_OPT(name, type, outvar, fmtctx, mediatype)\
+{\
+    int i;\
+    for (i = 0; i < o->nb_ ## name; i++) {\
+        char *spec = o->name[i].specifier;\
+        if (!strcmp(spec, mediatype))\
+            outvar = o->name[i].u.type;\
+    }\
+}

-int muxer_thread(void *arg);
-int encoder_thread(void *arg);
+extern const char * const opt_name_codec_names[];
+extern const char * const opt_name_codec_tags[];
+extern const char * const opt_name_frame_rates[];
+#if FFMPEG_OPT_TOP
+extern const char * const opt_name_top_field_first[];
+#endif
+
+static inline void pkt_move(void *dst, void *src)
+{
+    av_packet_move_ref(dst, src);
+}
+
+static inline void frame_move(void *dst, void *src)
+{
+    av_frame_move_ref(dst, src);
+}

 #endif /* FFTOOLS_FFMPEG_H */
@@ -20,8 +20,6 @@
 #include <stdint.h>

 #include "ffmpeg.h"
-#include "ffmpeg_utils.h"
-#include "thread_queue.h"

 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
@@ -34,7 +32,6 @@
 #include "libavutil/log.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/rational.h"
-#include "libavutil/time.h"
 #include "libavutil/timestamp.h"

 #include "libavcodec/avcodec.h"
@@ -42,6 +39,11 @@
 #include "libavformat/avformat.h"

 struct Encoder {
+    AVFrame *sq_frame;
+
+    // packet for receiving encoded output
+    AVPacket *pkt;
+
    // combined size of all the packets received from the encoder
    uint64_t data_size;

@@ -49,18 +51,8 @@ struct Encoder {
    uint64_t packets_encoded;

    int opened;
-    int attach_par;
-
-    Scheduler      *sch;
-    unsigned        sch_idx;
 };

-// data that is local to the decoder thread and not visible outside of it
-typedef struct EncoderThread {
-    AVFrame *frame;
-    AVPacket  *pkt;
-} EncoderThread;
-
 void enc_free(Encoder **penc)
 {
    Encoder *enc = *penc;
@@ -68,11 +60,14 @@ void enc_free(Encoder **penc)
    if (!enc)
        return;

+    av_frame_free(&enc->sq_frame);
+
+    av_packet_free(&enc->pkt);
+
    av_freep(penc);
 }

-int enc_alloc(Encoder **penc, const AVCodec *codec,
-              Scheduler *sch, unsigned sch_idx)
+int enc_alloc(Encoder **penc, const AVCodec *codec)
 {
    Encoder *enc;

@@ -82,18 +77,23 @@ int enc_alloc(Encoder **penc, const AVCodec *codec,
    if (!enc)
        return AVERROR(ENOMEM);

-    enc->sch     = sch;
-    enc->sch_idx = sch_idx;
+    enc->pkt = av_packet_alloc();
+    if (!enc->pkt)
+        goto fail;

    *penc = enc;

    return 0;
+fail:
+    enc_free(&enc);
+    return AVERROR(ENOMEM);
 }

 static int hw_device_setup_for_encode(OutputStream *ost, AVBufferRef *frames_ref)
 {
    const AVCodecHWConfig *config;
    HWDevice *dev = NULL;
+    int i;

    if (frames_ref &&
        ((AVHWFramesContext*)frames_ref->data)->format ==
@@ -103,7 +103,7 @@ static int hw_device_setup_for_encode(OutputStream *ost, AVBufferRef *frames_ref
        frames_ref = NULL;
    }

-    for (int i = 0;; i++) {
+    for (i = 0;; i++) {
        config = avcodec_get_hw_config(ost->enc_ctx->codec, i);
        if (!config)
            break;
@@ -165,17 +165,15 @@ static int set_encoder_id(OutputFile *of, OutputStream *ost)
    return 0;
 }

-int enc_open(void *opaque, const AVFrame *frame)
+int enc_open(OutputStream *ost, const AVFrame *frame)
 {
-    OutputStream *ost = opaque;
    InputStream *ist = ost->ist;
    Encoder              *e = ost->enc;
    AVCodecContext *enc_ctx = ost->enc_ctx;
-    Decoder            *dec;
+    AVCodecContext *dec_ctx = NULL;
    const AVCodec      *enc = enc_ctx->codec;
-    OutputFile          *of = ost->file;
+    OutputFile      *of = output_files[ost->file_index];
    FrameData *fd;
-    int frame_samples = 0;
    int ret;

    if (e->opened)
@@ -189,12 +187,13 @@ int enc_open(void *opaque, const AVFrame *frame)
        fd = (FrameData*)frame->opaque_ref->data;
    }

-    ret = set_encoder_id(of, ost);
+    ret = set_encoder_id(output_files[ost->file_index], ost);
    if (ret < 0)
        return ret;

-    if (ist)
-        dec = ist->decoder;
+    if (ist) {
+        dec_ctx = ist->dec_ctx;
+    }

    // the timebase is chosen by filtering code
    if (ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO) {
@@ -205,9 +204,6 @@ int enc_open(void *opaque, const AVFrame *frame)

    switch (enc_ctx->codec_type) {
    case AVMEDIA_TYPE_AUDIO:
-        av_assert0(frame->format != AV_SAMPLE_FMT_NONE &&
-                   frame->sample_rate > 0 &&
-                   frame->ch_layout.nb_channels > 0);
        enc_ctx->sample_fmt     = frame->format;
        enc_ctx->sample_rate    = frame->sample_rate;
        ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout);
@@ -222,9 +218,6 @@ int enc_open(void *opaque, const AVFrame *frame)
        break;

    case AVMEDIA_TYPE_VIDEO: {
-        av_assert0(frame->format != AV_PIX_FMT_NONE &&
-                   frame->width > 0 &&
-                   frame->height > 0);
        enc_ctx->width  = frame->width;
        enc_ctx->height = frame->height;
        enc_ctx->sample_aspect_ratio = ost->st->sample_aspect_ratio =
@@ -246,21 +239,6 @@ int enc_open(void *opaque, const AVFrame *frame)
        enc_ctx->colorspace             = frame->colorspace;
        enc_ctx->chroma_sample_location = frame->chroma_location;

-        for (int i = 0; i < frame->nb_side_data; i++) {
-            ret = av_frame_side_data_clone(
-                &enc_ctx->decoded_side_data, &enc_ctx->nb_decoded_side_data,
-                frame->side_data[i], AV_FRAME_SIDE_DATA_FLAG_UNIQUE);
-            if (ret < 0) {
-                av_frame_side_data_free(
-                    &enc_ctx->decoded_side_data,
-                    &enc_ctx->nb_decoded_side_data);
-                av_log(NULL, AV_LOG_ERROR,
-                        "failed to configure video encoder: %s!\n",
-                        av_err2str(ret));
-                return ret;
-            }
-        }
-
        if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) ||
            (frame->flags & AV_FRAME_FLAG_INTERLACED)
 #if FFMPEG_OPT_TOP
@@ -293,16 +271,14 @@ int enc_open(void *opaque, const AVFrame *frame)
            enc_ctx->width     = ost->ist->par->width;
            enc_ctx->height    = ost->ist->par->height;
        }
-
-        av_assert0(dec);
-        if (dec->subtitle_header) {
+        if (dec_ctx && dec_ctx->subtitle_header) {
            /* ASS code assumes this buffer is null terminated so add extra byte. */
-            enc_ctx->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
+            enc_ctx->subtitle_header = av_mallocz(dec_ctx->subtitle_header_size + 1);
            if (!enc_ctx->subtitle_header)
                return AVERROR(ENOMEM);
-            memcpy(enc_ctx->subtitle_header, dec->subtitle_header,
-                   dec->subtitle_header_size);
-            enc_ctx->subtitle_header_size = dec->subtitle_header_size;
+            memcpy(enc_ctx->subtitle_header, dec_ctx->subtitle_header,
+                   dec_ctx->subtitle_header_size);
+            enc_ctx->subtitle_header_size = dec_ctx->subtitle_header_size;
        }

        break;
@@ -341,8 +317,17 @@ int enc_open(void *opaque, const AVFrame *frame)

    e->opened = 1;

-    if (ost->enc_ctx->frame_size)
-        frame_samples = ost->enc_ctx->frame_size;
+    if (ost->sq_idx_encode >= 0) {
+        e->sq_frame = av_frame_alloc();
+        if (!e->sq_frame)
+            return AVERROR(ENOMEM);
+    }
+
+    if (ost->enc_ctx->frame_size) {
+        av_assert0(ost->sq_idx_encode >= 0);
+        sq_frame_samples(output_files[ost->file_index]->sq_encode,
+                         ost->sq_idx_encode, ost->enc_ctx->frame_size);
+    }

    ret = check_avoptions(ost->encoder_opts);
    if (ret < 0)
@@ -368,7 +353,8 @@ int enc_open(void *opaque, const AVFrame *frame)
     * global side data.
     */
    if (ist) {
-        for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) {
+        int i;
+        for (i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) {
            AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i];
            if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) {
                AVPacketSideData *sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data,
@@ -391,34 +377,36 @@ int enc_open(void *opaque, const AVFrame *frame)
    if (ret < 0)
        return ret;

-    return frame_samples;
+    return 0;
 }

 static int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb)
 {
-    OutputFile *of = ost->file;
+    OutputFile *of = output_files[ost->file_index];

    if (of->recording_time != INT64_MAX &&
        av_compare_ts(ts, tb, of->recording_time, AV_TIME_BASE_Q) >= 0) {
+        close_output_stream(ost);
        return 0;
    }
    return 1;
 }

-static int do_subtitle_out(OutputFile *of, OutputStream *ost, const AVSubtitle *sub,
-                           AVPacket *pkt)
+int enc_subtitle(OutputFile *of, OutputStream *ost, const AVSubtitle *sub)
 {
    Encoder *e = ost->enc;
    int subtitle_out_max_size = 1024 * 1024;
    int subtitle_out_size, nb, i, ret;
    AVCodecContext *enc;
+    AVPacket *pkt = e->pkt;
    int64_t pts;

    if (sub->pts == AV_NOPTS_VALUE) {
        av_log(ost, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
        return exit_on_error ? AVERROR(EINVAL) : 0;
    }
-    if ((of->start_time != AV_NOPTS_VALUE && sub->pts < of->start_time))
+    if (ost->finished ||
+        (of->start_time != AV_NOPTS_VALUE && sub->pts < of->start_time))
        return 0;

    enc = ost->enc_ctx;
@@ -435,13 +423,13 @@ static int do_subtitle_out(OutputFile *of, OutputStream *ost, const AVSubtitle *

    /* shift timestamp to honor -ss and make check_recording_time() work with -t */
    pts = sub->pts;
-    if (of->start_time != AV_NOPTS_VALUE)
-        pts -= of->start_time;
+    if (output_files[ost->file_index]->start_time != AV_NOPTS_VALUE)
+        pts -= output_files[ost->file_index]->start_time;
    for (i = 0; i < nb; i++) {
        AVSubtitle local_sub = *sub;

        if (!check_recording_time(ost, pts, AV_TIME_BASE_Q))
-            return AVERROR_EOF;
+            return 0;

        ret = av_new_packet(pkt, subtitle_out_max_size);
        if (ret < 0)
@@ -482,11 +470,9 @@ static int do_subtitle_out(OutputFile *of, OutputStream *ost, const AVSubtitle *
        }
        pkt->dts = pkt->pts;

-        ret = sch_enc_send(e->sch, e->sch_idx, pkt);
-        if (ret < 0) {
-            av_packet_unref(pkt);
+        ret = of_output_packet(of, ost, pkt);
+        if (ret < 0)
            return ret;
-        }
    }

    return 0;
@@ -504,22 +490,20 @@ void enc_stats_write(OutputStream *ost, EncStats *es,
    AVRational  tbi = (AVRational){ 0, 1};
    int64_t    ptsi = INT64_MAX;

-    const FrameData *fd;
+    const FrameData *fd = NULL;

-    if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) {
+    if (frame ? frame->opaque_ref : pkt->opaque_ref) {
        fd   = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data);
        tbi  = fd->dec.tb;
        ptsi = fd->dec.pts;
    }

-    pthread_mutex_lock(&es->lock);
-
    for (size_t i = 0; i < es->nb_components; i++) {
        const EncStatsComponent *c = &es->components[i];

        switch (c->type) {
        case ENC_STATS_LITERAL:         avio_write (io, c->str,     c->str_len);                    continue;
-        case ENC_STATS_FILE_IDX:        avio_printf(io, "%d",       ost->file->index);              continue;
+        case ENC_STATS_FILE_IDX:        avio_printf(io, "%d",       ost->file_index);               continue;
        case ENC_STATS_STREAM_IDX:      avio_printf(io, "%d",       ost->index);                    continue;
        case ENC_STATS_TIMEBASE:        avio_printf(io, "%d/%d",    tb.num, tb.den);                continue;
        case ENC_STATS_TIMEBASE_IN:     avio_printf(io, "%d/%d",    tbi.num, tbi.den);              continue;
@@ -543,8 +527,6 @@ void enc_stats_write(OutputStream *ost, EncStats *es,
            case ENC_STATS_DTS:         avio_printf(io, "%"PRId64,  pkt->dts);                      continue;
            case ENC_STATS_DTS_TIME:    avio_printf(io, "%g",       pkt->dts * av_q2d(tb));         continue;
            case ENC_STATS_PKT_SIZE:    avio_printf(io, "%d",       pkt->size);                     continue;
-            case ENC_STATS_KEYFRAME:    avio_write(io, (pkt->flags & AV_PKT_FLAG_KEY) ?
-                                                       "K" : "N", 1);                               continue;
            case ENC_STATS_BITRATE: {
                double duration = FFMAX(pkt->duration, 1) * av_q2d(tb);
                avio_printf(io, "%g",  8.0 * pkt->size / duration);
@@ -561,8 +543,6 @@ void enc_stats_write(OutputStream *ost, EncStats *es,
    }
    avio_w8(io, '\n');
    avio_flush(io);
-
-    pthread_mutex_unlock(&es->lock);
 }

 static inline double psnr(double d)
@@ -580,13 +560,10 @@ static int update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_
    int64_t frame_number;
    double ti1, bitrate, avg_bitrate;
    double psnr_val = -1;
-    int quality;

-    quality        = sd ? AV_RL32(sd) : -1;
+    ost->quality   = sd ? AV_RL32(sd) : -1;
    pict_type      = sd ? sd[4] : AV_PICTURE_TYPE_NONE;

-    atomic_store(&ost->quality, quality);
-
    if ((enc->flags & AV_CODEC_FLAG_PSNR) && sd && sd[5]) {
        // FIXME the scaling assumes 8bit
        double error = AV_RL64(sd + 8) / (enc->width * enc->height * 255.0 * 255.0);
@@ -609,11 +586,10 @@ static int update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_
    frame_number = e->packets_encoded;
    if (vstats_version <= 1) {
        fprintf(vstats_file, "frame= %5"PRId64" q= %2.1f ", frame_number,
-                quality / (float)FF_QP2LAMBDA);
+                ost->quality / (float)FF_QP2LAMBDA);
    } else  {
-        fprintf(vstats_file, "out= %2d st= %2d frame= %5"PRId64" q= %2.1f ",
-                ost->file->index, ost->index, frame_number,
-                quality / (float)FF_QP2LAMBDA);
+        fprintf(vstats_file, "out= %2d st= %2d frame= %5"PRId64" q= %2.1f ", ost->file_index, ost->index, frame_number,
+                ost->quality / (float)FF_QP2LAMBDA);
    }

    if (psnr_val >= 0)
@@ -627,30 +603,23 @@ static int update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_

    bitrate     = (pkt->size * 8) / av_q2d(enc->time_base) / 1000.0;
    avg_bitrate = (double)(e->data_size * 8) / ti1 / 1000.0;
-    fprintf(vstats_file, "s_size= %8.0fKiB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
+    fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
           (double)e->data_size / 1024, ti1, bitrate, avg_bitrate);
    fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(pict_type));

    return 0;
 }

-static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame,
-                        AVPacket *pkt)
+static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
 {
    Encoder            *e = ost->enc;
    AVCodecContext   *enc = ost->enc_ctx;
+    AVPacket         *pkt = e->pkt;
    const char *type_desc = av_get_media_type_string(enc->codec_type);
    const char    *action = frame ? "encode" : "flush";
    int ret;

    if (frame) {
-        FrameData *fd = frame_data(frame);
-
-        if (!fd)
-            return AVERROR(ENOMEM);
-
-        fd->wallclock[LATENCY_PROBE_ENC_PRE] = av_gettime_relative();
-
        if (ost->enc_stats_pre.io)
            enc_stats_write(ost, &ost->enc_stats_pre, frame, NULL,
                            ost->frames_encoded);
@@ -680,13 +649,11 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame,
    }

    while (1) {
-        FrameData *fd;
-
        av_packet_unref(pkt);

        ret = avcodec_receive_packet(enc, pkt);
        update_benchmark("%s_%s %d.%d", action, type_desc,
-                         of->index, ost->index);
+                         ost->file_index, ost->index);

        pkt->time_base = enc->time_base;

@@ -697,31 +664,14 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame,
        if (ret == AVERROR(EAGAIN)) {
            av_assert0(frame); // should never happen during flushing
            return 0;
+        } else if (ret == AVERROR_EOF) {
+            ret = of_output_packet(of, ost, NULL);
+            return ret < 0 ? ret : AVERROR_EOF;
        } else if (ret < 0) {
-            if (ret != AVERROR_EOF)
-                av_log(ost, AV_LOG_ERROR, "%s encoding failed\n", type_desc);
+            av_log(ost, AV_LOG_ERROR, "%s encoding failed\n", type_desc);
            return ret;
        }

-        fd = packet_data(pkt);
-        if (!fd)
-            return AVERROR(ENOMEM);
-        fd->wallclock[LATENCY_PROBE_ENC_POST] = av_gettime_relative();
-
-        // attach stream parameters to first packet if requested
-        avcodec_parameters_free(&fd->par_enc);
-        if (e->attach_par && !e->packets_encoded) {
-            fd->par_enc = avcodec_parameters_alloc();
-            if (!fd->par_enc)
-                return AVERROR(ENOMEM);
-
-            ret = avcodec_parameters_from_context(fd->par_enc, enc);
-            if (ret < 0)
-                return ret;
-        }
-
-        pkt->flags |= AV_PKT_FLAG_TRUSTED;
-
        if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
            ret = update_video_stats(ost, pkt, !!vstats_filename);
            if (ret < 0)
@@ -742,31 +692,103 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame,
                   av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base));
        }

+        if ((ret = trigger_fix_sub_duration_heartbeat(ost, pkt)) < 0) {
+            av_log(NULL, AV_LOG_ERROR,
+                   "Subtitle heartbeat logic failed in %s! (%s)\n",
+                   __func__, av_err2str(ret));
+            return ret;
+        }
+
        e->data_size += pkt->size;

        e->packets_encoded++;

-        ret = sch_enc_send(e->sch, e->sch_idx, pkt);
-        if (ret < 0) {
-            av_packet_unref(pkt);
+        ret = of_output_packet(of, ost, pkt);
+        if (ret < 0)
            return ret;
-        }
    }

    av_assert0(0);
 }

+static int submit_encode_frame(OutputFile *of, OutputStream *ost,
+                               AVFrame *frame)
+{
+    Encoder *e = ost->enc;
+    int ret;
+
+    if (ost->sq_idx_encode < 0)
+        return encode_frame(of, ost, frame);
+
+    if (frame) {
+        ret = av_frame_ref(e->sq_frame, frame);
+        if (ret < 0)
+            return ret;
+        frame = e->sq_frame;
+    }
+
+    ret = sq_send(of->sq_encode, ost->sq_idx_encode,
+                  SQFRAME(frame));
+    if (ret < 0) {
+        if (frame)
+            av_frame_unref(frame);
+        if (ret != AVERROR_EOF)
+            return ret;
+    }
+
+    while (1) {
+        AVFrame *enc_frame = e->sq_frame;
+
+        ret = sq_receive(of->sq_encode, ost->sq_idx_encode,
+                               SQFRAME(enc_frame));
+        if (ret == AVERROR_EOF) {
+            enc_frame = NULL;
+        } else if (ret < 0) {
+            return (ret == AVERROR(EAGAIN)) ? 0 : ret;
+        }
+
+        ret = encode_frame(of, ost, enc_frame);
+        if (enc_frame)
+            av_frame_unref(enc_frame);
+        if (ret < 0) {
+            if (ret == AVERROR_EOF)
+                close_output_stream(ost);
+            return ret;
+        }
+    }
+}
+
+static int do_audio_out(OutputFile *of, OutputStream *ost,
+                        AVFrame *frame)
+{
+    AVCodecContext *enc = ost->enc_ctx;
+    int ret;
+
+    if (!(enc->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE) &&
+        enc->ch_layout.nb_channels != frame->ch_layout.nb_channels) {
+        av_log(ost, AV_LOG_ERROR,
+               "Audio channel count changed and encoder does not support parameter changes\n");
+        return 0;
+    }
+
+    if (!check_recording_time(ost, frame->pts, frame->time_base))
+        return 0;
+
+    ret = submit_encode_frame(of, ost, frame);
+    return (ret < 0 && ret != AVERROR_EOF) ? ret : 0;
+}
+
 static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf,
-                                          const AVFrame *frame)
+                                          AVRational tb, const AVFrame *in_picture)
 {
    double pts_time;

    if (kf->ref_pts == AV_NOPTS_VALUE)
-        kf->ref_pts = frame->pts;
+        kf->ref_pts = in_picture->pts;

-    pts_time = (frame->pts - kf->ref_pts) * av_q2d(frame->time_base);
+    pts_time = (in_picture->pts - kf->ref_pts) * av_q2d(tb);
    if (kf->index < kf->nb_pts &&
-        av_compare_ts(frame->pts, frame->time_base, kf->pts[kf->index], AV_TIME_BASE_Q) >= 0) {
+        av_compare_ts(in_picture->pts, tb, kf->pts[kf->index], AV_TIME_BASE_Q) >= 0) {
        kf->index++;
        goto force_keyframe;
    } else if (kf->pexpr) {
@@ -791,7 +813,7 @@ static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf,
            kf->expr_const_values[FKF_N_FORCED]     += 1;
            goto force_keyframe;
        }
-    } else if (kf->type == KF_FORCE_SOURCE && (frame->flags & AV_FRAME_FLAG_KEY)) {
+    } else if (kf->type == KF_FORCE_SOURCE && (in_picture->flags & AV_FRAME_FLAG_KEY)) {
        goto force_keyframe;
    }

@@ -802,165 +824,65 @@ force_keyframe:
    return AV_PICTURE_TYPE_I;
 }

-static int frame_encode(OutputStream *ost, AVFrame *frame, AVPacket *pkt)
+/* May modify/reset frame */
+static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *in_picture)
 {
-    OutputFile *of = ost->file;
-    enum AVMediaType type = ost->type;
+    int ret;
+    AVCodecContext *enc = ost->enc_ctx;

-    if (type == AVMEDIA_TYPE_SUBTITLE) {
-        const AVSubtitle *subtitle = frame && frame->buf[0] ?
-                                     (AVSubtitle*)frame->buf[0]->data : NULL;
+    if (!check_recording_time(ost, in_picture->pts, ost->enc_ctx->time_base))
+        return 0;

-        // no flushing for subtitles
-        return subtitle && subtitle->num_rects ?
-               do_subtitle_out(of, ost, subtitle, pkt) : 0;
-    }
-
-    if (frame) {
-        if (!check_recording_time(ost, frame->pts, frame->time_base))
-            return AVERROR_EOF;
-
-        if (type == AVMEDIA_TYPE_VIDEO) {
-            frame->quality   = ost->enc_ctx->global_quality;
-            frame->pict_type = forced_kf_apply(ost, &ost->kf, frame);
+    in_picture->quality = enc->global_quality;
+    in_picture->pict_type = forced_kf_apply(ost, &ost->kf, enc->time_base, in_picture);

 #if FFMPEG_OPT_TOP
-            if (ost->top_field_first >= 0) {
-                frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
-                frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * (!!ost->top_field_first);
-            }
+    if (ost->top_field_first >= 0) {
+        in_picture->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
+        in_picture->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * (!!ost->top_field_first);
+    }
 #endif
-        } else {
-            if (!(ost->enc_ctx->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE) &&
-                ost->enc_ctx->ch_layout.nb_channels != frame->ch_layout.nb_channels) {
-                av_log(ost, AV_LOG_ERROR,
-                       "Audio channel count changed and encoder does not support parameter changes\n");
-                return 0;
-            }
-        }
+
+    ret = submit_encode_frame(of, ost, in_picture);
+    return (ret == AVERROR_EOF) ? 0 : ret;
+}
+
+int enc_frame(OutputStream *ost, AVFrame *frame)
+{
+    OutputFile *of = output_files[ost->file_index];
+    int ret;
+
+    ret = enc_open(ost, frame);
+    if (ret < 0)
+        return ret;
+
+    return ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO ?
+           do_video_out(of, ost, frame) : do_audio_out(of, ost, frame);
+}
+
+int enc_flush(void)
+{
+    int ret;
+
+    for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
+        OutputFile      *of = output_files[ost->file_index];
+        if (ost->sq_idx_encode >= 0)
+            sq_send(of->sq_encode, ost->sq_idx_encode, SQFRAME(NULL));
    }

-    return encode_frame(of, ost, frame, pkt);
-}
+    for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
+        Encoder          *e = ost->enc;
+        AVCodecContext *enc = ost->enc_ctx;
+        OutputFile      *of = output_files[ost->file_index];

-static void enc_thread_set_name(const OutputStream *ost)
-{
-    char name[16];
-    snprintf(name, sizeof(name), "enc%d:%d:%s", ost->file->index, ost->index,
-             ost->enc_ctx->codec->name);
-    ff_thread_setname(name);
-}
+        if (!enc || !e->opened ||
+            (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != AVMEDIA_TYPE_AUDIO))
+            continue;

-static void enc_thread_uninit(EncoderThread *et)
-{
-    av_packet_free(&et->pkt);
-    av_frame_free(&et->frame);
-
-    memset(et, 0, sizeof(*et));
-}
-
-static int enc_thread_init(EncoderThread *et)
-{
-    memset(et, 0, sizeof(*et));
-
-    et->frame = av_frame_alloc();
-    if (!et->frame)
-        goto fail;
-
-    et->pkt = av_packet_alloc();
-    if (!et->pkt)
-        goto fail;
+        ret = submit_encode_frame(of, ost, NULL);
+        if (ret != AVERROR_EOF)
+            return ret;
+    }

    return 0;
-
-fail:
-    enc_thread_uninit(et);
-    return AVERROR(ENOMEM);
-}
-
-int encoder_thread(void *arg)
-{
-    OutputStream *ost = arg;
-    Encoder        *e = ost->enc;
-    EncoderThread et;
-    int ret = 0, input_status = 0;
-    int name_set = 0;
-
-    ret = enc_thread_init(&et);
-    if (ret < 0)
-        goto finish;
-
-    /* Open the subtitle encoders immediately. AVFrame-based encoders
-     * are opened through a callback from the scheduler once they get
-     * their first frame
-     *
-     * N.B.: because the callback is called from a different thread,
-     * enc_ctx MUST NOT be accessed before sch_enc_receive() returns
-     * for the first time for audio/video. */
-    if (ost->type != AVMEDIA_TYPE_VIDEO && ost->type != AVMEDIA_TYPE_AUDIO) {
-        ret = enc_open(ost, NULL);
-        if (ret < 0)
-            goto finish;
-    }
-
-    while (!input_status) {
-        input_status = sch_enc_receive(e->sch, e->sch_idx, et.frame);
-        if (input_status < 0) {
-            if (input_status == AVERROR_EOF) {
-                av_log(ost, AV_LOG_VERBOSE, "Encoder thread received EOF\n");
-                if (e->opened)
-                    break;
-
-                av_log(ost, AV_LOG_ERROR, "Could not open encoder before EOF\n");
-                ret = AVERROR(EINVAL);
-            } else {
-                av_log(ost, AV_LOG_ERROR, "Error receiving a frame for encoding: %s\n",
-                       av_err2str(ret));
-                ret = input_status;
-            }
-            goto finish;
-        }
-
-        if (!name_set) {
-            enc_thread_set_name(ost);
-            name_set = 1;
-        }
-
-        ret = frame_encode(ost, et.frame, et.pkt);
-
-        av_packet_unref(et.pkt);
-        av_frame_unref(et.frame);
-
-        if (ret < 0) {
-            if (ret == AVERROR_EOF)
-                av_log(ost, AV_LOG_VERBOSE, "Encoder returned EOF, finishing\n");
-            else
-                av_log(ost, AV_LOG_ERROR, "Error encoding a frame: %s\n",
-                       av_err2str(ret));
-            break;
-        }
-    }
-
-    // flush the encoder
-    if (ret == 0 || ret == AVERROR_EOF) {
-        ret = frame_encode(ost, NULL, et.pkt);
-        if (ret < 0 && ret != AVERROR_EOF)
-            av_log(ost, AV_LOG_ERROR, "Error flushing encoder: %s\n",
-                   av_err2str(ret));
-    }
-
-    // EOF is normal thread termination
-    if (ret == AVERROR_EOF)
-        ret = 0;
-
-finish:
-    enc_thread_uninit(&et);
-
-    return ret;
-}
-
-int enc_loopback(Encoder *enc)
-{
-    enc->attach_par = 1;
-    return enc->sch_idx;
 }
@@ -297,6 +297,48 @@ void hw_device_free_all(void)
    nb_hw_devices = 0;
 }

+int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input)
+{
+    InputStream *ist = avctx->opaque;
+    AVFrame *output = NULL;
+    enum AVPixelFormat output_format = ist->hwaccel_output_format;
+    int err;
+
+    if (input->format == output_format) {
+        // Nothing to do.
+        return 0;
+    }
+
+    output = av_frame_alloc();
+    if (!output)
+        return AVERROR(ENOMEM);
+
+    output->format = output_format;
+
+    err = av_hwframe_transfer_data(output, input, 0);
+    if (err < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to "
+               "output frame: %d.\n", err);
+        goto fail;
+    }
+
+    err = av_frame_copy_props(output, input);
+    if (err < 0) {
+        av_frame_unref(output);
+        goto fail;
+    }
+
+    av_frame_unref(input);
+    av_frame_move_ref(input, output);
+    av_frame_free(&output);
+
+    return 0;
+
+fail:
+    av_frame_free(&output);
+    return err;
+}
+
 AVBufferRef *hw_device_for_filter(void)
 {
    // Pick the last hardware device if the user doesn't pick the device for
@@ -22,26 +22,23 @@

 #include "ffmpeg.h"
 #include "ffmpeg_mux.h"
-#include "ffmpeg_utils.h"
+#include "objpool.h"
 #include "sync_queue.h"
+#include "thread_queue.h"

-#include "libavutil/avstring.h"
 #include "libavutil/fifo.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
-#include "libavutil/time.h"
 #include "libavutil/timestamp.h"
+#include "libavutil/thread.h"

 #include "libavcodec/packet.h"

 #include "libavformat/avformat.h"
 #include "libavformat/avio.h"

-typedef struct MuxThreadContext {
-    AVPacket *pkt;
-    AVPacket *fix_sub_duration_pkt;
-} MuxThreadContext;
+int want_sdp = 1;

 static Muxer *mux_from_of(OutputFile *of)
 {
@@ -61,88 +58,23 @@ static int64_t filesize(AVIOContext *pb)
    return ret;
 }

-static void mux_log_debug_ts(OutputStream *ost, const AVPacket *pkt)
+static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt)
 {
-    static const char *desc[] = {
-        [LATENCY_PROBE_DEMUX]       = "demux",
-        [LATENCY_PROBE_DEC_PRE]     = "decode",
-        [LATENCY_PROBE_DEC_POST]    = "decode",
-        [LATENCY_PROBE_FILTER_PRE]  = "filter",
-        [LATENCY_PROBE_FILTER_POST] = "filter",
-        [LATENCY_PROBE_ENC_PRE]     = "encode",
-        [LATENCY_PROBE_ENC_POST]    = "encode",
-        [LATENCY_PROBE_NB]          = "mux",
-    };
+    MuxStream *ms = ms_from_ost(ost);
+    AVFormatContext *s = mux->fc;
+    int64_t fs;
+    uint64_t frame_num;
+    int ret;

-    char latency[512];
-
-    *latency = 0;
-    if (pkt->opaque_ref) {
-        const FrameData *fd = (FrameData*)pkt->opaque_ref->data;
-        int64_t         now = av_gettime_relative();
-        int64_t       total = INT64_MIN;
-
-        int next;
-
-        for (unsigned i = 0; i < FF_ARRAY_ELEMS(fd->wallclock); i = next) {
-            int64_t val = fd->wallclock[i];
-
-            next = i + 1;
-
-            if (val == INT64_MIN)
-                continue;
-
-            if (total == INT64_MIN) {
-                total = now - val;
-                snprintf(latency, sizeof(latency), "total:%gms", total / 1e3);
-            }
-
-            // find the next valid entry
-            for (; next <= FF_ARRAY_ELEMS(fd->wallclock); next++) {
-                int64_t val_next = (next == FF_ARRAY_ELEMS(fd->wallclock)) ?
-                                   now : fd->wallclock[next];
-                int64_t diff;
-
-                if (val_next == INT64_MIN)
-                    continue;
-                diff = val_next - val;
-
-                // print those stages that take at least 5% of total
-                if (100. * diff > 5. * total) {
-                    av_strlcat(latency, ", ", sizeof(latency));
-
-                    if (!strcmp(desc[i], desc[next]))
-                        av_strlcat(latency, desc[i], sizeof(latency));
-                    else
-                        av_strlcatf(latency, sizeof(latency), "%s-%s:",
-                                    desc[i], desc[next]);
-
-                    av_strlcatf(latency, sizeof(latency), " %gms/%d%%",
-                                diff / 1e3, (int)(100. * diff / total));
-                }
-
-                break;
-            }
-
-        }
+    fs = filesize(s->pb);
+    atomic_store(&mux->last_filesize, fs);
+    if (fs >= mux->limit_filesize) {
+        ret = AVERROR_EOF;
+        goto fail;
    }

-    av_log(ost, AV_LOG_INFO, "muxer <- pts:%s pts_time:%s dts:%s dts_time:%s "
-           "duration:%s duration_time:%s size:%d latency(%s)\n",
-           av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ost->st->time_base),
-           av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ost->st->time_base),
-           av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ost->st->time_base),
-           pkt->size, *latency ? latency : "N/A");
-}
-
-static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt)
-{
-    OutputStream *ost = &ms->ost;
-
-#if FFMPEG_OPT_VSYNC_DROP
    if (ost->type == AVMEDIA_TYPE_VIDEO && ost->vsync_method == VSYNC_DROP)
        pkt->pts = pkt->dts = AV_NOPTS_VALUE;
-#endif

    // rescale timestamps to the stream timebase
    if (ost->type == AVMEDIA_TYPE_AUDIO && !ost->enc) {
@@ -163,12 +95,13 @@ static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt)
        av_packet_rescale_ts(pkt, pkt->time_base, ost->st->time_base);
    pkt->time_base = ost->st->time_base;

-    if (!(mux->fc->oformat->flags & AVFMT_NOTIMESTAMPS)) {
+    if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
        if (pkt->dts != AV_NOPTS_VALUE &&
            pkt->pts != AV_NOPTS_VALUE &&
            pkt->dts > pkt->pts) {
-            av_log(ost, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64", replacing by guess\n",
-                   pkt->dts, pkt->pts);
+            av_log(s, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64" in output stream %d:%d, replacing by guess\n",
+                   pkt->dts, pkt->pts,
+                   ost->file_index, ost->st->index);
            pkt->pts =
            pkt->dts = pkt->pts + pkt->dts + ms->last_mux_dts + 1
                     - FFMIN3(pkt->pts, pkt->dts, ms->last_mux_dts + 1)
@@ -177,19 +110,20 @@ static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt)
        if ((ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO || ost->type == AVMEDIA_TYPE_SUBTITLE) &&
            pkt->dts != AV_NOPTS_VALUE &&
            ms->last_mux_dts != AV_NOPTS_VALUE) {
-            int64_t max = ms->last_mux_dts + !(mux->fc->oformat->flags & AVFMT_TS_NONSTRICT);
+            int64_t max = ms->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
            if (pkt->dts < max) {
                int loglevel = max - pkt->dts > 2 || ost->type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG;
                if (exit_on_error)
                    loglevel = AV_LOG_ERROR;
-                av_log(ost, loglevel, "Non-monotonic DTS; "
-                       "previous: %"PRId64", current: %"PRId64"; ",
-                       ms->last_mux_dts, pkt->dts);
+                av_log(s, loglevel, "Non-monotonic DTS in output stream "
+                       "%d:%d; previous: %"PRId64", current: %"PRId64"; ",
+                       ost->file_index, ost->st->index, ms->last_mux_dts, pkt->dts);
                if (exit_on_error) {
-                    return AVERROR(EINVAL);
+                    ret = AVERROR(EINVAL);
+                    goto fail;
                }

-                av_log(ost, loglevel, "changing to %"PRId64". This may result "
+                av_log(s, loglevel, "changing to %"PRId64". This may result "
                       "in incorrect timestamps in the output file.\n",
                       max);
                if (pkt->pts >= pkt->dts)
@@ -200,36 +134,22 @@ static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt)
    }
    ms->last_mux_dts = pkt->dts;

-    if (debug_ts)
-        mux_log_debug_ts(ost, pkt);
-
-    return 0;
-}
-
-static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt)
-{
-    MuxStream *ms = ms_from_ost(ost);
-    AVFormatContext *s = mux->fc;
-    int64_t fs;
-    uint64_t frame_num;
-    int ret;
-
-    fs = filesize(s->pb);
-    atomic_store(&mux->last_filesize, fs);
-    if (fs >= mux->limit_filesize) {
-        ret = AVERROR_EOF;
-        goto fail;
-    }
-
-    ret = mux_fixup_ts(mux, ms, pkt);
-    if (ret < 0)
-        goto fail;
-
    ms->data_size_mux += pkt->size;
    frame_num = atomic_fetch_add(&ost->packets_written, 1);

    pkt->stream_index = ost->index;

+    if (debug_ts) {
+        av_log(ost, AV_LOG_INFO, "muxer <- type:%s "
+                "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s size:%d\n",
+                av_get_media_type_string(ost->type),
+                av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ost->st->time_base),
+                av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ost->st->time_base),
+                av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ost->st->time_base),
+                pkt->size
+              );
+    }
+
    if (ms->stats.io)
        enc_stats_write(ost, &ms->stats, NULL, pkt, frame_num);

@@ -247,12 +167,12 @@ fail:
    return ret;
 }

-static int sync_queue_process(Muxer *mux, MuxStream *ms, AVPacket *pkt, int *stream_eof)
+static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int *stream_eof)
 {
    OutputFile *of = &mux->of;

-    if (ms->sq_idx_mux >= 0) {
-        int ret = sq_send(mux->sq_mux, ms->sq_idx_mux, SQPKT(pkt));
+    if (ost->sq_idx_mux >= 0) {
+        int ret = sq_send(mux->sq_mux, ost->sq_idx_mux, SQPKT(pkt));
        if (ret < 0) {
            if (ret == AVERROR_EOF)
                *stream_eof = 1;
@@ -277,47 +197,166 @@ static int sync_queue_process(Muxer *mux, MuxStream *ms, AVPacket *pkt, int *str
                return ret;
        }
    } else if (pkt)
-        return write_packet(mux, &ms->ost, pkt);
+        return write_packet(mux, ost, pkt);

    return 0;
 }

-static int of_streamcopy(OutputFile *of, OutputStream *ost, AVPacket *pkt);
-
-/* apply the output bitstream filters */
-static int mux_packet_filter(Muxer *mux, MuxThreadContext *mt,
-                             OutputStream *ost, AVPacket *pkt, int *stream_eof)
+static void thread_set_name(OutputFile *of)
 {
+    char name[16];
+    snprintf(name, sizeof(name), "mux%d:%s", of->index, of->format->name);
+    ff_thread_setname(name);
+}
+
+static void *muxer_thread(void *arg)
+{
+    Muxer     *mux = arg;
+    OutputFile *of = &mux->of;
+    AVPacket  *pkt = NULL;
+    int        ret = 0;
+
+    pkt = av_packet_alloc();
+    if (!pkt) {
+        ret = AVERROR(ENOMEM);
+        goto finish;
+    }
+
+    thread_set_name(of);
+
+    while (1) {
+        OutputStream *ost;
+        int stream_idx, stream_eof = 0;
+
+        ret = tq_receive(mux->tq, &stream_idx, pkt);
+        if (stream_idx < 0) {
+            av_log(mux, AV_LOG_VERBOSE, "All streams finished\n");
+            ret = 0;
+            break;
+        }
+
+        ost = of->streams[stream_idx];
+        ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof);
+        av_packet_unref(pkt);
+        if (ret == AVERROR_EOF) {
+            if (stream_eof) {
+                tq_receive_finish(mux->tq, stream_idx);
+            } else {
+                av_log(mux, AV_LOG_VERBOSE, "Muxer returned EOF\n");
+                ret = 0;
+                break;
+            }
+        } else if (ret < 0) {
+            av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n");
+            break;
+        }
+    }
+
+finish:
+    av_packet_free(&pkt);
+
+    for (unsigned int i = 0; i < mux->fc->nb_streams; i++)
+        tq_receive_finish(mux->tq, i);
+
+    av_log(mux, AV_LOG_VERBOSE, "Terminating muxer thread\n");
+
+    return (void*)(intptr_t)ret;
+}
+
+static int thread_submit_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt)
+{
+    int ret = 0;
+
+    if (!pkt || ost->finished & MUXER_FINISHED)
+        goto finish;
+
+    ret = tq_send(mux->tq, ost->index, pkt);
+    if (ret < 0)
+        goto finish;
+
+    return 0;
+
+finish:
+    if (pkt)
+        av_packet_unref(pkt);
+
+    ost->finished |= MUXER_FINISHED;
+    tq_send_finish(mux->tq, ost->index);
+    return ret == AVERROR_EOF ? 0 : ret;
+}
+
+static int queue_packet(OutputStream *ost, AVPacket *pkt)
+{
+    MuxStream *ms = ms_from_ost(ost);
+    AVPacket *tmp_pkt = NULL;
+    int ret;
+
+    if (!av_fifo_can_write(ms->muxing_queue)) {
+        size_t cur_size = av_fifo_can_read(ms->muxing_queue);
+        size_t pkt_size = pkt ? pkt->size : 0;
+        unsigned int are_we_over_size =
+            (ms->muxing_queue_data_size + pkt_size) > ms->muxing_queue_data_threshold;
+        size_t limit    = are_we_over_size ? ms->max_muxing_queue_size : SIZE_MAX;
+        size_t new_size = FFMIN(2 * cur_size, limit);
+
+        if (new_size <= cur_size) {
+            av_log(ost, AV_LOG_ERROR,
+                   "Too many packets buffered for output stream %d:%d.\n",
+                   ost->file_index, ost->st->index);
+            return AVERROR(ENOSPC);
+        }
+        ret = av_fifo_grow2(ms->muxing_queue, new_size - cur_size);
+        if (ret < 0)
+            return ret;
+    }
+
+    if (pkt) {
+        ret = av_packet_make_refcounted(pkt);
+        if (ret < 0)
+            return ret;
+
+        tmp_pkt = av_packet_alloc();
+        if (!tmp_pkt)
+            return AVERROR(ENOMEM);
+
+        av_packet_move_ref(tmp_pkt, pkt);
+        ms->muxing_queue_data_size += tmp_pkt->size;
+    }
+    av_fifo_write(ms->muxing_queue, &tmp_pkt, 1);
+
+    return 0;
+}
+
+static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost)
+{
+    int ret;
+
+    if (mux->tq) {
+        return thread_submit_packet(mux, ost, pkt);
+    } else {
+        /* the muxer is not initialized yet, buffer the packet */
+        ret = queue_packet(ost, pkt);
+        if (ret < 0) {
+            if (pkt)
+                av_packet_unref(pkt);
+            return ret;
+        }
+    }
+
+    return 0;
+}
+
+int of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt)
+{
+    Muxer *mux = mux_from_of(of);
    MuxStream *ms = ms_from_ost(ost);
    const char *err_msg;
    int ret = 0;

-    if (pkt && !ost->enc) {
-        ret = of_streamcopy(&mux->of, ost, pkt);
-        if (ret == AVERROR(EAGAIN))
-            return 0;
-        else if (ret == AVERROR_EOF) {
-            av_packet_unref(pkt);
-            pkt = NULL;
-            ret = 0;
-            *stream_eof = 1;
-        } else if (ret < 0)
-            goto fail;
-    }
-
-    // emit heartbeat for -fix_sub_duration;
-    // we are only interested in heartbeats on on random access points.
-    if (pkt && (pkt->flags & AV_PKT_FLAG_KEY)) {
-        mt->fix_sub_duration_pkt->opaque    = (void*)(intptr_t)PKT_OPAQUE_FIX_SUB_DURATION;
-        mt->fix_sub_duration_pkt->pts       = pkt->pts;
-        mt->fix_sub_duration_pkt->time_base = pkt->time_base;
-
-        ret = sch_mux_sub_heartbeat(mux->sch, mux->sch_idx, ms->sch_idx,
-                                    mt->fix_sub_duration_pkt);
-        if (ret < 0)
-            goto fail;
-    }
+    if (pkt && pkt->dts != AV_NOPTS_VALUE)
+        ost->last_mux_dts = av_rescale_q(pkt->dts, pkt->time_base, AV_TIME_BASE_Q);

+    /* apply the output bitstream filters */
    if (ms->bsf_ctx) {
        int bsf_eof = 0;

@@ -337,184 +376,178 @@ static int mux_packet_filter(Muxer *mux, MuxThreadContext *mt,
            else if (ret == AVERROR_EOF)
                bsf_eof = 1;
            else if (ret < 0) {
-                av_log(ost, AV_LOG_ERROR,
-                       "Error applying bitstream filters to a packet: %s",
-                       av_err2str(ret));
-                if (exit_on_error)
-                    return ret;
-                continue;
+                err_msg = "applying bitstream filters to a packet";
+                goto fail;
            }

            if (!bsf_eof)
                ms->bsf_pkt->time_base = ms->bsf_ctx->time_base_out;

-            ret = sync_queue_process(mux, ms, bsf_eof ? NULL : ms->bsf_pkt, stream_eof);
+            ret = submit_packet(mux, bsf_eof ? NULL : ms->bsf_pkt, ost);
            if (ret < 0)
                goto mux_fail;
        }
-        *stream_eof = 1;
    } else {
-        ret = sync_queue_process(mux, ms, pkt, stream_eof);
+        ret = submit_packet(mux, pkt, ost);
        if (ret < 0)
            goto mux_fail;
    }

-    return *stream_eof ? AVERROR_EOF : 0;
+    return 0;

 mux_fail:
    err_msg = "submitting a packet to the muxer";

 fail:
-    if (ret != AVERROR_EOF)
-        av_log(ost, AV_LOG_ERROR, "Error %s: %s\n", err_msg, av_err2str(ret));
-    return ret;
+    av_log(ost, AV_LOG_ERROR, "Error %s\n", err_msg);
+    return exit_on_error ? ret : 0;
 }

-static void thread_set_name(OutputFile *of)
-{
-    char name[16];
-    snprintf(name, sizeof(name), "mux%d:%s", of->index, of->format->name);
-    ff_thread_setname(name);
-}
-
-static void mux_thread_uninit(MuxThreadContext *mt)
-{
-    av_packet_free(&mt->pkt);
-    av_packet_free(&mt->fix_sub_duration_pkt);
-
-    memset(mt, 0, sizeof(*mt));
-}
-
-static int mux_thread_init(MuxThreadContext *mt)
-{
-    memset(mt, 0, sizeof(*mt));
-
-    mt->pkt = av_packet_alloc();
-    if (!mt->pkt)
-        goto fail;
-
-    mt->fix_sub_duration_pkt = av_packet_alloc();
-    if (!mt->fix_sub_duration_pkt)
-        goto fail;
-
-    return 0;
-
-fail:
-    mux_thread_uninit(mt);
-    return AVERROR(ENOMEM);
-}
-
-int muxer_thread(void *arg)
-{
-    Muxer     *mux = arg;
-    OutputFile *of = &mux->of;
-
-    MuxThreadContext mt;
-
-    int        ret = 0;
-
-    ret = mux_thread_init(&mt);
-    if (ret < 0)
-        goto finish;
-
-    thread_set_name(of);
-
-    while (1) {
-        OutputStream *ost;
-        int stream_idx, stream_eof = 0;
-
-        ret = sch_mux_receive(mux->sch, of->index, mt.pkt);
-        stream_idx = mt.pkt->stream_index;
-        if (stream_idx < 0) {
-            av_log(mux, AV_LOG_VERBOSE, "All streams finished\n");
-            ret = 0;
-            break;
-        }
-
-        ost = of->streams[mux->sch_stream_idx[stream_idx]];
-        mt.pkt->stream_index = ost->index;
-        mt.pkt->flags       &= ~AV_PKT_FLAG_TRUSTED;
-
-        ret = mux_packet_filter(mux, &mt, ost, ret < 0 ? NULL : mt.pkt, &stream_eof);
-        av_packet_unref(mt.pkt);
-        if (ret == AVERROR_EOF) {
-            if (stream_eof) {
-                sch_mux_receive_finish(mux->sch, of->index, stream_idx);
-            } else {
-                av_log(mux, AV_LOG_VERBOSE, "Muxer returned EOF\n");
-                ret = 0;
-                break;
-            }
-        } else if (ret < 0) {
-            av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n");
-            break;
-        }
-    }
-
-finish:
-    mux_thread_uninit(&mt);
-
-    return ret;
-}
-
-static int of_streamcopy(OutputFile *of, OutputStream *ost, AVPacket *pkt)
+int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
 {
+    OutputFile *of = output_files[ost->file_index];
    MuxStream  *ms = ms_from_ost(ost);
-    FrameData  *fd = pkt->opaque_ref ? (FrameData*)pkt->opaque_ref->data : NULL;
-    int64_t      dts = fd ? fd->dts_est : AV_NOPTS_VALUE;
    int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
    int64_t ts_offset;
+    AVPacket *opkt = ms->pkt;
+    int ret;
+
+    av_packet_unref(opkt);

    if (of->recording_time != INT64_MAX &&
        dts >= of->recording_time + start_time)
-        return AVERROR_EOF;
+        pkt = NULL;
+
+    // EOF: flush output bitstream filters.
+    if (!pkt)
+        return of_output_packet(of, ost, NULL);

    if (!ms->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) &&
        !ms->copy_initial_nonkeyframes)
-        return AVERROR(EAGAIN);
+        return 0;

    if (!ms->streamcopy_started) {
        if (!ms->copy_prior_start &&
            (pkt->pts == AV_NOPTS_VALUE ?
             dts < ms->ts_copy_start :
             pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base)))
-            return AVERROR(EAGAIN);
+            return 0;

        if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time)
-            return AVERROR(EAGAIN);
+            return 0;
    }

-    ts_offset = av_rescale_q(start_time, AV_TIME_BASE_Q, pkt->time_base);
+    ret = av_packet_ref(opkt, pkt);
+    if (ret < 0)
+        return ret;
+
+    ts_offset = av_rescale_q(start_time, AV_TIME_BASE_Q, opkt->time_base);

    if (pkt->pts != AV_NOPTS_VALUE)
-        pkt->pts -= ts_offset;
+        opkt->pts -= ts_offset;

    if (pkt->dts == AV_NOPTS_VALUE) {
-        pkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, pkt->time_base);
+        opkt->dts = av_rescale_q(dts, AV_TIME_BASE_Q, opkt->time_base);
    } else if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
-        pkt->pts = pkt->dts - ts_offset;
+        opkt->pts = opkt->dts - ts_offset;
+    }
+    opkt->dts -= ts_offset;
+
+    {
+        int ret = trigger_fix_sub_duration_heartbeat(ost, pkt);
+        if (ret < 0) {
+            av_log(NULL, AV_LOG_ERROR,
+                   "Subtitle heartbeat logic failed in %s! (%s)\n",
+                   __func__, av_err2str(ret));
+            return ret;
+        }
    }

-    pkt->dts -= ts_offset;
+    ret = of_output_packet(of, ost, opkt);
+    if (ret < 0)
+        return ret;

    ms->streamcopy_started = 1;

    return 0;
 }

-int print_sdp(const char *filename);
+static int thread_stop(Muxer *mux)
+{
+    void *ret;

-int print_sdp(const char *filename)
+    if (!mux || !mux->tq)
+        return 0;
+
+    for (unsigned int i = 0; i < mux->fc->nb_streams; i++)
+        tq_send_finish(mux->tq, i);
+
+    pthread_join(mux->thread, &ret);
+
+    tq_free(&mux->tq);
+
+    return (int)(intptr_t)ret;
+}
+
+static int thread_start(Muxer *mux)
+{
+    AVFormatContext *fc = mux->fc;
+    ObjPool *op;
+    int ret;
+
+    op = objpool_alloc_packets();
+    if (!op)
+        return AVERROR(ENOMEM);
+
+    mux->tq = tq_alloc(fc->nb_streams, mux->thread_queue_size, op, pkt_move);
+    if (!mux->tq) {
+        objpool_free(&op);
+        return AVERROR(ENOMEM);
+    }
+
+    ret = pthread_create(&mux->thread, NULL, muxer_thread, (void*)mux);
+    if (ret) {
+        tq_free(&mux->tq);
+        return AVERROR(ret);
+    }
+
+    /* flush the muxing queues */
+    for (int i = 0; i < fc->nb_streams; i++) {
+        OutputStream *ost = mux->of.streams[i];
+        MuxStream     *ms = ms_from_ost(ost);
+        AVPacket *pkt;
+
+        while (av_fifo_read(ms->muxing_queue, &pkt, 1) >= 0) {
+            ret = thread_submit_packet(mux, ost, pkt);
+            if (pkt) {
+                ms->muxing_queue_data_size -= pkt->size;
+                av_packet_free(&pkt);
+            }
+            if (ret < 0)
+                return ret;
+        }
+    }
+
+    return 0;
+}
+
+static int print_sdp(void)
 {
    char sdp[16384];
-    int j = 0, ret;
+    int i;
+    int j, ret;
    AVIOContext *sdp_pb;
    AVFormatContext **avc;

+    for (i = 0; i < nb_output_files; i++) {
+        if (!mux_from_of(output_files[i])->header_written)
+            return 0;
+    }
+
    avc = av_malloc_array(nb_output_files, sizeof(*avc));
    if (!avc)
        return AVERROR(ENOMEM);
-    for (int i = 0; i < nb_output_files; i++) {
+    for (i = 0, j = 0; i < nb_output_files; i++) {
        if (!strcmp(output_files[i]->format->name, "rtp")) {
            avc[j] = mux_from_of(output_files[i])->fc;
            j++;
@@ -531,31 +564,40 @@ int print_sdp(const char *filename)
    if (ret < 0)
        goto fail;

-    if (!filename) {
+    if (!sdp_filename) {
        printf("SDP:\n%s\n", sdp);
        fflush(stdout);
    } else {
-        ret = avio_open2(&sdp_pb, filename, AVIO_FLAG_WRITE, &int_cb, NULL);
+        ret = avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL);
        if (ret < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", filename);
+            av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
            goto fail;
        }

        avio_print(sdp_pb, sdp);
        avio_closep(&sdp_pb);
+        av_freep(&sdp_filename);
    }

+    // SDP successfully written, allow muxer threads to start
+    ret = 1;
+
 fail:
    av_freep(&avc);
    return ret;
 }

-int mux_check_init(void *arg)
+int mux_check_init(Muxer *mux)
 {
-    Muxer     *mux = arg;
    OutputFile *of = &mux->of;
    AVFormatContext *fc = mux->fc;
-    int ret;
+    int ret, i;
+
+    for (i = 0; i < fc->nb_streams; i++) {
+        OutputStream *ost = of->streams[i];
+        if (!ost->initialized)
+            return 0;
+    }

    ret = avformat_write_header(fc, &mux->opts);
    if (ret < 0) {
@@ -567,7 +609,27 @@ int mux_check_init(void *arg)
    mux->header_written = 1;

    av_dump_format(fc, of->index, fc->url, 1);
-    atomic_fetch_add(&nb_output_dumped, 1);
+    nb_output_dumped++;
+
+    if (sdp_filename || want_sdp) {
+        ret = print_sdp();
+        if (ret < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error writing the SDP.\n");
+            return ret;
+        } else if (ret == 1) {
+            /* SDP is written only after all the muxers are ready, so now we
+             * start ALL the threads */
+            for (i = 0; i < nb_output_files; i++) {
+                ret = thread_start(mux_from_of(output_files[i]));
+                if (ret < 0)
+                    return ret;
+            }
+        }
+    } else {
+        ret = thread_start(mux_from_of(of));
+        if (ret < 0)
+            return ret;
+    }

    return 0;
 }
@@ -624,10 +686,9 @@ int of_stream_init(OutputFile *of, OutputStream *ost)
                                         ost->st->time_base);
    }

-    if (ms->sch_idx >= 0)
-        return sch_mux_stream_ready(mux->sch, of->index, ms->sch_idx);
+    ost->initialized = 1;

-    return 0;
+    return mux_check_init(mux);
 }

 static int check_written(OutputFile *of)
@@ -725,8 +786,8 @@ static void mux_final_stats(Muxer *mux)
    }

    av_log(of, AV_LOG_INFO,
-           "video:%1.0fKiB audio:%1.0fKiB subtitle:%1.0fKiB other streams:%1.0fKiB "
-           "global headers:%1.0fKiB muxing overhead: %s\n",
+           "video:%1.0fkB audio:%1.0fkB subtitle:%1.0fkB other streams:%1.0fkB "
+           "global headers:%1.0fkB muxing overhead: %s\n",
           video_size    / 1024.0,
           audio_size    / 1024.0,
           subtitle_size / 1024.0,
@@ -741,13 +802,15 @@ int of_write_trailer(OutputFile *of)
    AVFormatContext *fc = mux->fc;
    int ret, mux_result = 0;

-    if (!mux->header_written) {
+    if (!mux->tq) {
        av_log(mux, AV_LOG_ERROR,
               "Nothing was written into output file, because "
               "at least one of its streams received no packets.\n");
        return AVERROR(EINVAL);
    }

+    mux_result = thread_stop(mux);
+
    ret = av_write_trailer(fc);
    if (ret < 0) {
        av_log(mux, AV_LOG_ERROR, "Error writing trailer: %s\n", av_err2str(ret));
@@ -773,17 +836,6 @@ int of_write_trailer(OutputFile *of)
    return mux_result;
 }

-static void enc_stats_uninit(EncStats *es)
-{
-    for (int i = 0; i < es->nb_components; i++)
-        av_freep(&es->components[i].str);
-    av_freep(&es->components);
-
-    if (es->lock_initialized)
-        pthread_mutex_destroy(&es->lock);
-    es->lock_initialized = 0;
-}
-
 static void ost_free(OutputStream **post)
 {
    OutputStream *ost = *post;
@@ -803,6 +855,13 @@ static void ost_free(OutputStream **post)
        ost->logfile = NULL;
    }

+    if (ms->muxing_queue) {
+        AVPacket *pkt;
+        while (av_fifo_read(ms->muxing_queue, &pkt, 1) >= 0)
+            av_packet_free(&pkt);
+        av_fifo_freep2(&ms->muxing_queue);
+    }
+
    avcodec_parameters_free(&ost->par_in);

    av_bsf_free(&ms->bsf_ctx);
@@ -817,7 +876,10 @@ static void ost_free(OutputStream **post)
    av_freep(&ost->logfile_prefix);
    av_freep(&ost->apad);

-    av_freep(&ost->attachment_filename);
+#if FFMPEG_OPT_MAP_CHANNEL
+    av_freep(&ost->audio_channels_map);
+    ost->audio_channels_mapped = 0;
+#endif

    av_dict_free(&ost->sws_dict);
    av_dict_free(&ost->swr_opts);
@@ -826,9 +888,17 @@ static void ost_free(OutputStream **post)
        av_freep(&ost->enc_ctx->stats_in);
    avcodec_free_context(&ost->enc_ctx);

-    enc_stats_uninit(&ost->enc_stats_pre);
-    enc_stats_uninit(&ost->enc_stats_post);
-    enc_stats_uninit(&ms->stats);
+    for (int i = 0; i < ost->enc_stats_pre.nb_components; i++)
+        av_freep(&ost->enc_stats_pre.components[i].str);
+    av_freep(&ost->enc_stats_pre.components);
+
+    for (int i = 0; i < ost->enc_stats_post.nb_components; i++)
+        av_freep(&ost->enc_stats_post.components[i].str);
+    av_freep(&ost->enc_stats_post.components);
+
+    for (int i = 0; i < ms->stats.nb_components; i++)
+        av_freep(&ms->stats.components[i].str);
+    av_freep(&ms->stats.components);

    av_freep(post);
 }
@@ -856,14 +926,15 @@ void of_free(OutputFile **pof)
        return;
    mux = mux_from_of(of);

+    thread_stop(mux);
+
+    sq_free(&of->sq_encode);
    sq_free(&mux->sq_mux);

    for (int i = 0; i < of->nb_streams; i++)
        ost_free(&of->streams[i]);
    av_freep(&of->streams);

-    av_freep(&mux->sch_stream_idx);
-
    av_dict_free(&mux->opts);

    av_packet_free(&mux->sq_pkt);
@@ -24,7 +24,7 @@
 #include <stdatomic.h>
 #include <stdint.h>

-#include "ffmpeg_sched.h"
+#include "thread_queue.h"

 #include "libavformat/avformat.h"

@@ -32,78 +32,88 @@

 #include "libavutil/dict.h"
 #include "libavutil/fifo.h"
+#include "libavutil/thread.h"

 typedef struct MuxStream {
-    OutputStream    ost;
+    OutputStream ost;

    // name used for logging
-    char            log_name[32];
+    char log_name[32];

-    AVBSFContext   *bsf_ctx;
-    AVPacket       *bsf_pkt;
+    /* the packets are buffered here until the muxer is ready to be initialized */
+    AVFifo *muxing_queue;

-    AVPacket       *pkt;
+    AVBSFContext *bsf_ctx;
+    AVPacket     *bsf_pkt;

-    EncStats        stats;
+    AVPacket     *pkt;

-    int             sch_idx;
-    int             sch_idx_enc;
-    int             sch_idx_src;
+    EncStats stats;

-    int             sq_idx_mux;
+    int64_t max_frames;

-    int64_t         max_frames;
+    /*
+     * The size of the AVPackets' buffers in queue.
+     * Updated when a packet is either pushed or pulled from the queue.
+     */
+    size_t muxing_queue_data_size;
+
+    int max_muxing_queue_size;
+
+    /* Threshold after which max_muxing_queue_size will be in effect */
+    size_t muxing_queue_data_threshold;

    // timestamp from which the streamcopied streams should start,
    // in AV_TIME_BASE_Q;
    // everything before it should be discarded
-    int64_t         ts_copy_start;
+    int64_t ts_copy_start;

    /* dts of the last packet sent to the muxer, in the stream timebase
     * used for making up missing dts values */
-    int64_t         last_mux_dts;
+    int64_t last_mux_dts;

-    int64_t         stream_duration;
-    AVRational      stream_duration_tb;
+    int64_t    stream_duration;
+    AVRational stream_duration_tb;

    // state for av_rescale_delta() call for audio in write_packet()
-    int64_t         ts_rescale_delta_last;
+    int64_t ts_rescale_delta_last;

    // combined size of all the packets sent to the muxer
-    uint64_t        data_size_mux;
+    uint64_t data_size_mux;

-    int             copy_initial_nonkeyframes;
-    int             copy_prior_start;
-    int             streamcopy_started;
+    int copy_initial_nonkeyframes;
+    int copy_prior_start;
+    int streamcopy_started;
 } MuxStream;

 typedef struct Muxer {
-    OutputFile              of;
+    OutputFile of;

    // name used for logging
-    char                    log_name[32];
+    char log_name[32];

-    AVFormatContext        *fc;
+    AVFormatContext *fc;

-    Scheduler              *sch;
-    unsigned                sch_idx;
+    pthread_t    thread;
+    ThreadQueue *tq;

-    // OutputStream indices indexed by scheduler stream indices
-    int                    *sch_stream_idx;
-    int                  nb_sch_stream_idx;
+    AVDictionary *opts;

-    AVDictionary           *opts;
+    int thread_queue_size;

    /* filesize limit expressed in bytes */
-    int64_t                 limit_filesize;
-    atomic_int_least64_t    last_filesize;
-    int                     header_written;
+    int64_t limit_filesize;
+    atomic_int_least64_t last_filesize;
+    int header_written;

-    SyncQueue              *sq_mux;
-    AVPacket               *sq_pkt;
+    SyncQueue *sq_mux;
+    AVPacket *sq_pkt;
 } Muxer;

-int mux_check_init(void *arg);
+/* whether we want to print an SDP, set in of_open() */
+extern int want_sdp;
+
+int mux_check_init(Muxer *mux);

 static MuxStream *ms_from_ost(OutputStream *ost)
 {
@@ -1,489 +0,0 @@
-/*
- * Inter-thread scheduling/synchronization.
- * Copyright (c) 2023 Anton Khirnov
- *
- * 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 FFTOOLS_FFMPEG_SCHED_H
-#define FFTOOLS_FFMPEG_SCHED_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "ffmpeg_utils.h"
-
-/*
- * This file contains the API for the transcode scheduler.
- *
- * Overall architecture of the transcoding process involves instances of the
- * following components:
- * - demuxers, each containing any number of demuxed streams; demuxed packets
- *   belonging to some stream are sent to any number of decoders (transcoding)
- *   and/or muxers (streamcopy);
- * - decoders, which receive encoded packets from some demuxed stream or
- *   encoder, decode them, and send decoded frames to any number of filtergraph
- *   inputs (audio/video) or encoders (subtitles);
- * - filtergraphs, each containing zero or more inputs (0 in case the
- *   filtergraph contains a lavfi source filter), and one or more outputs; the
- *   inputs and outputs need not have matching media types;
- *   each filtergraph input receives decoded frames from some decoder;
- *   filtered frames from each output are sent to some encoder;
- * - encoders, which receive decoded frames from some decoder (subtitles) or
- *   some filtergraph output (audio/video), encode them, and send encoded
- *   packets to any number of muxed streams or decoders;
- * - muxers, each containing any number of muxed streams; each muxed stream
- *   receives encoded packets from some demuxed stream (streamcopy) or some
- *   encoder (transcoding); those packets are interleaved and written out by the
- *   muxer.
- *
- * There must be at least one muxer instance, otherwise the transcode produces
- * no output and is meaningless. Otherwise, in a generic transcoding scenario
- * there may be arbitrary number of instances of any of the above components,
- * interconnected in various ways.
- *
- * The code tries to keep all the output streams across all the muxers in sync
- * (i.e. at the same DTS), which is accomplished by varying the rates at which
- * packets are read from different demuxers and lavfi sources. Note that the
- * degree of control we have over synchronization is fundamentally limited - if
- * some demuxed streams in the same input are interleaved at different rates
- * than that at which they are to be muxed (e.g. because an input file is badly
- * interleaved, or the user changed their speed by mismatching amounts), then
- * there will be increasing amounts of buffering followed by eventual
- * transcoding failure.
- *
- * N.B. 1: there are meaningful transcode scenarios with no demuxers, e.g.
- * - encoding and muxing output from filtergraph(s) that have no inputs;
- * - creating a file that contains nothing but attachments and/or metadata.
- *
- * N.B. 2: a filtergraph output could, in principle, feed multiple encoders, but
- * this is unnecessary because the (a)split filter provides the same
- * functionality.
- *
- * The scheduler, in the above model, is the master object that oversees and
- * facilitates the transcoding process. The basic idea is that all instances
- * of the abovementioned components communicate only with the scheduler and not
- * with each other. The scheduler is then the single place containing the
- * knowledge about the whole transcoding pipeline.
- */
-
-struct AVFrame;
-struct AVPacket;
-
-typedef struct Scheduler Scheduler;
-
-enum SchedulerNodeType {
-    SCH_NODE_TYPE_NONE = 0,
-    SCH_NODE_TYPE_DEMUX,
-    SCH_NODE_TYPE_MUX,
-    SCH_NODE_TYPE_DEC,
-    SCH_NODE_TYPE_ENC,
-    SCH_NODE_TYPE_FILTER_IN,
-    SCH_NODE_TYPE_FILTER_OUT,
-};
-
-typedef struct SchedulerNode {
-    enum SchedulerNodeType  type;
-    unsigned                idx;
-    unsigned                idx_stream;
-} SchedulerNode;
-
-typedef int (*SchThreadFunc)(void *arg);
-
-#define SCH_DSTREAM(file, stream)                           \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_DEMUX,           \
-                     .idx = file, .idx_stream = stream }
-#define SCH_MSTREAM(file, stream)                           \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_MUX,             \
-                     .idx = file, .idx_stream = stream }
-#define SCH_DEC(decoder)                                    \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_DEC,             \
-                    .idx = decoder }
-#define SCH_ENC(encoder)                                    \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_ENC,             \
-                    .idx = encoder }
-#define SCH_FILTER_IN(filter, input)                        \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_FILTER_IN,       \
-                     .idx = filter, .idx_stream = input }
-#define SCH_FILTER_OUT(filter, output)                      \
-    (SchedulerNode){ .type = SCH_NODE_TYPE_FILTER_OUT,      \
-                     .idx = filter, .idx_stream = output }
-
-Scheduler *sch_alloc(void);
-void sch_free(Scheduler **sch);
-
-int sch_start(Scheduler *sch);
-int sch_stop(Scheduler *sch, int64_t *finish_ts);
-
-/**
- * Wait until transcoding terminates or the specified timeout elapses.
- *
- * @param timeout_us Amount of time in microseconds after which this function
- *                   will timeout.
- * @param transcode_ts Current transcode timestamp in AV_TIME_BASE_Q, for
- *                     informational purposes only.
- *
- * @retval 0 waiting timed out, transcoding is not finished
- * @retval 1 transcoding is finished
- */
-int sch_wait(Scheduler *sch, uint64_t timeout_us, int64_t *transcode_ts);
-
-/**
- * Add a demuxer to the scheduler.
- *
- * @param func Function executed as the demuxer task.
- * @param ctx Demuxer state; will be passed to func and used for logging.
- *
- * @retval ">=0" Index of the newly-created demuxer.
- * @retval "<0"  Error code.
- */
-int sch_add_demux(Scheduler *sch, SchThreadFunc func, void *ctx);
-/**
- * Add a demuxed stream for a previously added demuxer.
- *
- * @param demux_idx index previously returned by sch_add_demux()
- *
- * @retval ">=0" Index of the newly-created demuxed stream.
- * @retval "<0"  Error code.
- */
-int sch_add_demux_stream(Scheduler *sch, unsigned demux_idx);
-
-/**
- * Add a decoder to the scheduler.
- *
- * @param func Function executed as the decoder task.
- * @param ctx Decoder state; will be passed to func and used for logging.
- * @param send_end_ts The decoder will return an end timestamp after flush packets
- *                    are delivered to it. See documentation for
- *                    sch_dec_receive() for more details.
- *
- * @retval ">=0" Index of the newly-created decoder.
- * @retval "<0"  Error code.
- */
-int sch_add_dec(Scheduler *sch, SchThreadFunc func, void *ctx,
-                int send_end_ts);
-
-/**
- * Add a filtergraph to the scheduler.
- *
- * @param nb_inputs Number of filtergraph inputs.
- * @param nb_outputs number of filtergraph outputs
- * @param func Function executed as the filtering task.
- * @param ctx Filter state; will be passed to func and used for logging.
- *
- * @retval ">=0" Index of the newly-created filtergraph.
- * @retval "<0"  Error code.
- */
-int sch_add_filtergraph(Scheduler *sch, unsigned nb_inputs, unsigned nb_outputs,
-                        SchThreadFunc func, void *ctx);
-
-/**
- * Add a muxer to the scheduler.
- *
- * Note that muxer thread startup is more complicated than for other components,
- * because
- * - muxer streams fed by audio/video encoders become initialized dynamically at
- *   runtime, after those encoders receive their first frame and initialize
- *   themselves, followed by calling sch_mux_stream_ready()
- * - the header can be written after all the streams for a muxer are initialized
- * - we may need to write an SDP, which must happen
- *      - AFTER all the headers are written
- *      - BEFORE any packets are written by any muxer
- *      - with all the muxers quiescent
- * To avoid complicated muxer-thread synchronization dances, we postpone
- * starting the muxer threads until after the SDP is written. The sequence of
- * events is then as follows:
- * - After sch_mux_stream_ready() is called for all the streams in a given muxer,
- *   the header for that muxer is written (care is taken that headers for
- *   different muxers are not written concurrently, since they write file
- *   information to stderr). If SDP is not wanted, the muxer thread then starts
- *   and muxing begins.
- * - When SDP _is_ wanted, no muxer threads start until the header for the last
- *   muxer is written. After that, the SDP is written, after which all the muxer
- *   threads are started at once.
- *
- * In order for the above to work, the scheduler needs to be able to invoke
- * just writing the header, which is the reason the init parameter exists.
- *
- * @param func Function executed as the muxing task.
- * @param init Callback that is called to initialize the muxer and write the
- *             header. Called after sch_mux_stream_ready() is called for all the
- *             streams in the muxer.
- * @param ctx Muxer state; will be passed to func/init and used for logging.
- * @param sdp_auto Determines automatic SDP writing - see sch_sdp_filename().
- * @param thread_queue_size number of packets that can be buffered before
- *                          sending to the muxer blocks
- *
- * @retval ">=0" Index of the newly-created muxer.
- * @retval "<0"  Error code.
- */
-int sch_add_mux(Scheduler *sch, SchThreadFunc func, int (*init)(void *),
-                void *ctx, int sdp_auto, unsigned thread_queue_size);
-
-/**
- * Default size of a packet thread queue.  For muxing this can be overridden by
- * the thread_queue_size option as passed to a call to sch_add_mux().
- */
-#define DEFAULT_PACKET_THREAD_QUEUE_SIZE 8
-
-/**
- * Default size of a frame thread queue.
- */
-#define DEFAULT_FRAME_THREAD_QUEUE_SIZE 8
-
-/**
- * Add a muxed stream for a previously added muxer.
- *
- * @param mux_idx index previously returned by sch_add_mux()
- *
- * @retval ">=0" Index of the newly-created muxed stream.
- * @retval "<0"  Error code.
- */
-int sch_add_mux_stream(Scheduler *sch, unsigned mux_idx);
-
-/**
- * Configure limits on packet buffering performed before the muxer task is
- * started.
- *
- * @param mux_idx index previously returned by sch_add_mux()
- * @param stream_idx_idx index previously returned by sch_add_mux_stream()
- * @param data_threshold Total size of the buffered packets' data after which
- *                       max_packets applies.
- * @param max_packets maximum Maximum number of buffered packets after
- *                            data_threshold is reached.
- */
-void sch_mux_stream_buffering(Scheduler *sch, unsigned mux_idx, unsigned stream_idx,
-                              size_t data_threshold, int max_packets);
-
-/**
- * Signal to the scheduler that the specified muxed stream is initialized and
- * ready. Muxing is started once all the streams are ready.
- */
-int sch_mux_stream_ready(Scheduler *sch, unsigned mux_idx, unsigned stream_idx);
-
-/**
- * Set the file path for the SDP.
- *
- * The SDP is written when either of the following is true:
- * - this function is called at least once
- * - sdp_auto=1 is passed to EVERY call of sch_add_mux()
- */
-int sch_sdp_filename(Scheduler *sch, const char *sdp_filename);
-
-/**
- * Add an encoder to the scheduler.
- *
- * @param func Function executed as the encoding task.
- * @param ctx Encoder state; will be passed to func and used for logging.
- * @param open_cb This callback, if specified, will be called when the first
- *                frame is obtained for this encoder. For audio encoders with a
- *                fixed frame size (which use a sync queue in the scheduler to
- *                rechunk frames), it must return that frame size on success.
- *                Otherwise (non-audio, variable frame size) it should return 0.
- *
- * @retval ">=0" Index of the newly-created encoder.
- * @retval "<0"  Error code.
- */
-int sch_add_enc(Scheduler *sch, SchThreadFunc func, void *ctx,
-                int (*open_cb)(void *func_arg, const struct AVFrame *frame));
-
-/**
- * Add an pre-encoding sync queue to the scheduler.
- *
- * @param buf_size_us Sync queue buffering size, passed to sq_alloc().
- * @param logctx Logging context for the sync queue. passed to sq_alloc().
- *
- * @retval ">=0" Index of the newly-created sync queue.
- * @retval "<0"  Error code.
- */
-int sch_add_sq_enc(Scheduler *sch, uint64_t buf_size_us, void *logctx);
-int sch_sq_add_enc(Scheduler *sch, unsigned sq_idx, unsigned enc_idx,
-                   int limiting, uint64_t max_frames);
-
-int sch_connect(Scheduler *sch, SchedulerNode src, SchedulerNode dst);
-
-enum DemuxSendFlags {
-    /**
-     * Treat the packet as an EOF for SCH_NODE_TYPE_MUX destinations
-     * send normally to other types.
-     */
-    DEMUX_SEND_STREAMCOPY_EOF = (1 << 0),
-};
-
-/**
- * Called by demuxer tasks to communicate with their downstreams. The following
- * may be sent:
- * - a demuxed packet for the stream identified by pkt->stream_index;
- * - demuxer discontinuity/reset (e.g. after a seek) - this is signalled by an
- *   empty packet with stream_index=-1.
- *
- * @param demux_idx demuxer index
- * @param pkt A demuxed packet to send.
- *            When flushing (i.e. pkt->stream_index=-1 on entry to this
- *            function), on successful return pkt->pts/pkt->time_base will be
- *            set to the maximum end timestamp of any decoded audio stream, or
- *            AV_NOPTS_VALUE if no decoded audio streams are present.
- *
- * @retval "non-negative value" success
- * @retval AVERROR_EOF all consumers for the stream are done
- * @retval AVERROR_EXIT all consumers are done, should terminate demuxing
- * @retval "anoter negative error code" other failure
- */
-int sch_demux_send(Scheduler *sch, unsigned demux_idx, struct AVPacket *pkt,
-                   unsigned flags);
-
-/**
- * Called by decoder tasks to receive a packet for decoding.
- *
- * @param dec_idx decoder index
- * @param pkt Input packet will be written here on success.
- *
- *            An empty packet signals that the decoder should be flushed, but
- *            more packets will follow (e.g. after seeking). When a decoder
- *            created with send_end_ts=1 receives a flush packet, it must write
- *            the end timestamp of the stream after flushing to
- *            pkt->pts/time_base on the next call to this function (if any).
- *
- * @retval "non-negative value" success
- * @retval AVERROR_EOF no more packets will arrive, should terminate decoding
- * @retval "another negative error code" other failure
- */
-int sch_dec_receive(Scheduler *sch, unsigned dec_idx, struct AVPacket *pkt);
-
-/**
- * Called by decoder tasks to send a decoded frame downstream.
- *
- * @param dec_idx Decoder index previously returned by sch_add_dec().
- * @param frame Decoded frame; on success it is consumed and cleared by this
- *              function
- *
- * @retval ">=0" success
- * @retval AVERROR_EOF all consumers are done, should terminate decoding
- * @retval "another negative error code" other failure
- */
-int sch_dec_send(Scheduler *sch, unsigned dec_idx, struct AVFrame *frame);
-
-/**
- * Called by filtergraph tasks to obtain frames for filtering. Will wait for a
- * frame to become available and return it in frame.
- *
- * Filtergraphs that contain lavfi sources and do not currently require new
- * input frames should call this function as a means of rate control - then
- * in_idx should be set equal to nb_inputs on entry to this function.
- *
- * @param fg_idx Filtergraph index previously returned by sch_add_filtergraph().
- * @param[in,out] in_idx On input contains the index of the input on which a frame
- *                       is most desired. May be set to nb_inputs to signal that
- *                       the filtergraph does not need more input currently.
- *
- *                       On success, will be replaced with the input index of
- *                       the actually returned frame or EOF timestamp.
- *
- * @retval ">=0" Frame data or EOF timestamp was delivered into frame, in_idx
- *               contains the index of the input it belongs to.
- * @retval AVERROR(EAGAIN) No frame was returned, the filtergraph should
- *                         resume filtering. May only be returned when
- *                         in_idx=nb_inputs on entry to this function.
- * @retval AVERROR_EOF No more frames will arrive, should terminate filtering.
- */
-int sch_filter_receive(Scheduler *sch, unsigned fg_idx,
-                       unsigned *in_idx, struct AVFrame *frame);
-/**
- * Called by filter tasks to signal that a filter input will no longer accept input.
- *
- * @param fg_idx Filtergraph index previously returned from sch_add_filtergraph().
- * @param in_idx Index of the input to finish.
- */
-void sch_filter_receive_finish(Scheduler *sch, unsigned fg_idx, unsigned in_idx);
-
-/**
- * Called by filtergraph tasks to send a filtered frame or EOF to consumers.
- *
- * @param fg_idx Filtergraph index previously returned by sch_add_filtergraph().
- * @param out_idx Index of the output which produced the frame.
- * @param frame The frame to send to consumers. When NULL, signals that no more
- *              frames will be produced for the specified output. When non-NULL,
- *              the frame is consumed and cleared by this function on success.
- *
- * @retval "non-negative value" success
- * @retval AVERROR_EOF all consumers are done
- * @retval "anoter negative error code" other failure
- */
-int sch_filter_send(Scheduler *sch, unsigned fg_idx, unsigned out_idx,
-                    struct AVFrame *frame);
-
-int sch_filter_command(Scheduler *sch, unsigned fg_idx, struct AVFrame *frame);
-
-/**
- * Called by encoder tasks to obtain frames for encoding. Will wait for a frame
- * to become available and return it in frame.
- *
- * @param enc_idx Encoder index previously returned by sch_add_enc().
- * @param frame   Newly-received frame will be stored here on success. Must be
- *                clean on entrance to this function.
- *
- * @retval 0 A frame was successfully delivered into frame.
- * @retval AVERROR_EOF No more frames will be delivered, the encoder should
- *                     flush everything and terminate.
- *
- */
-int sch_enc_receive(Scheduler *sch, unsigned enc_idx, struct AVFrame *frame);
-
-/**
- * Called by encoder tasks to send encoded packets downstream.
- *
- * @param enc_idx Encoder index previously returned by sch_add_enc().
- * @param pkt     An encoded packet; it will be consumed and cleared by this
- *                function on success.
- *
- * @retval 0     success
- * @retval "<0"  Error code.
- */
-int sch_enc_send   (Scheduler *sch, unsigned enc_idx, struct AVPacket *pkt);
-
-/**
- * Called by muxer tasks to obtain packets for muxing. Will wait for a packet
- * for any muxed stream to become available and return it in pkt.
- *
- * @param mux_idx Muxer index previously returned by sch_add_mux().
- * @param pkt     Newly-received packet will be stored here on success. Must be
- *                clean on entrance to this function.
- *
- * @retval 0 A packet was successfully delivered into pkt. Its stream_index
- *           corresponds to a stream index previously returned from
- *           sch_add_mux_stream().
- * @retval AVERROR_EOF When pkt->stream_index is non-negative, this signals that
- *                     no more packets will be delivered for this stream index.
- *                     Otherwise this indicates that no more packets will be
- *                     delivered for any stream and the muxer should therefore
- *                     flush everything and terminate.
- */
-int sch_mux_receive(Scheduler *sch, unsigned mux_idx, struct AVPacket *pkt);
-
-/**
- * Called by muxer tasks to signal that a stream will no longer accept input.
- *
- * @param stream_idx Stream index previously returned from sch_add_mux_stream().
- */
-void sch_mux_receive_finish(Scheduler *sch, unsigned mux_idx, unsigned stream_idx);
-
-int sch_mux_sub_heartbeat_add(Scheduler *sch, unsigned mux_idx, unsigned stream_idx,
-                              unsigned dec_idx);
-int sch_mux_sub_heartbeat(Scheduler *sch, unsigned mux_idx, unsigned stream_idx,
-                          const AVPacket *pkt);
-
-#endif /* FFTOOLS_FFMPEG_SCHED_H */
@@ -1,56 +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 FFTOOLS_FFMPEG_UTILS_H
-#define FFTOOLS_FFMPEG_UTILS_H
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/frame.h"
-#include "libavutil/rational.h"
-
-#include "libavcodec/packet.h"
-
-typedef struct Timestamp {
-    int64_t    ts;
-    AVRational tb;
-} Timestamp;
-
-/**
- * Merge two return codes - return one of the error codes if at least one of
- * them was negative, 0 otherwise.
- * Currently just picks the first one, eventually we might want to do something
- * more sophisticated, like sorting them by priority.
- */
-static inline int err_merge(int err0, int err1)
-{
-    return (err0 < 0) ? err0 : FFMIN(err1, 0);
-}
-
-static inline void pkt_move(void *dst, void *src)
-{
-    av_packet_move_ref(dst, src);
-}
-
-static inline void frame_move(void *dst, void *src)
-{
-    av_frame_move_ref(dst, src);
-}
-
-#endif // FFTOOLS_FFMPEG_UTILS_H
@@ -58,7 +58,6 @@
 #include <SDL_thread.h>

 #include "cmdutils.h"
-#include "ffplay_renderer.h"
 #include "opt_common.h"

 const char program_name[] = "ffplay";
@@ -351,9 +350,6 @@ static char *afilters = NULL;
 static int autorotate = 1;
 static int find_stream_info = 1;
 static int filter_nbthreads = 0;
-static int enable_vulkan = 0;
-static char *vulkan_params = NULL;
-static const char *hwaccel = NULL;

 /* current context */
 static int is_full_screen;
@@ -366,8 +362,6 @@ static SDL_Renderer *renderer;
 static SDL_RendererInfo renderer_info = {0};
 static SDL_AudioDeviceID audio_dev;

-static VkRenderer *vk_renderer;
-
 static const struct TextureFormatEntry {
    enum AVPixelFormat format;
    int texture_fmt;
@@ -400,10 +394,7 @@ static int opt_add_vfilter(void *optctx, const char *opt, const char *arg)
    if (ret < 0)
        return ret;

-    vfilters_list[nb_vfilters - 1] = av_strdup(arg);
-    if (!vfilters_list[nb_vfilters - 1])
-        return AVERROR(ENOMEM);
-
+    vfilters_list[nb_vfilters - 1] = arg;
    return 0;
 }

@@ -940,13 +931,6 @@ static int upload_texture(SDL_Texture **tex, AVFrame *frame)
    return ret;
 }

-static enum AVColorSpace sdl_supported_color_spaces[] = {
-    AVCOL_SPC_BT709,
-    AVCOL_SPC_BT470BG,
-    AVCOL_SPC_SMPTE170M,
-    AVCOL_SPC_UNSPECIFIED,
-};
-
 static void set_sdl_yuv_conversion_mode(AVFrame *frame)
 {
 #if SDL_VERSION_ATLEAST(2,0,8)
@@ -970,11 +954,6 @@ static void video_image_display(VideoState *is)
    SDL_Rect rect;

    vp = frame_queue_peek_last(&is->pictq);
-    if (vk_renderer) {
-        vk_renderer_display(vk_renderer, vp->frame);
-        return;
-    }
-
    if (is->subtitle_st) {
        if (frame_queue_nb_remaining(&is->subpq) > 0) {
            sp = frame_queue_peek(&is->subpq);
@@ -1310,18 +1289,10 @@ static void do_exit(VideoState *is)
    }
    if (renderer)
        SDL_DestroyRenderer(renderer);
-    if (vk_renderer)
-        vk_renderer_destroy(vk_renderer);
    if (window)
        SDL_DestroyWindow(window);
    uninit_opts();
-    for (int i = 0; i < nb_vfilters; i++)
-        av_freep(&vfilters_list[i]);
    av_freep(&vfilters_list);
-    av_freep(&video_codec_name);
-    av_freep(&audio_codec_name);
-    av_freep(&subtitle_codec_name);
-    av_freep(&input_filename);
    avformat_network_deinit();
    if (show_status)
        printf("\n");
@@ -1731,14 +1702,16 @@ display:

            av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
            av_bprintf(&buf,
-                      "%7.2f %s:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB \r",
+                      "%7.2f %s:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
                      get_master_clock(is),
                      (is->audio_st && is->video_st) ? "A-V" : (is->video_st ? "M-V" : (is->audio_st ? "M-A" : "   ")),
                      av_diff,
                      is->frame_drops_early + is->frame_drops_late,
                      aqsize / 1024,
                      vqsize / 1024,
-                      sqsize);
+                      sqsize,
+                      is->video_st ? is->viddec.avctx->pts_correction_num_faulty_dts : 0,
+                      is->video_st ? is->viddec.avctx->pts_correction_num_faulty_pts : 0);

            if (show_status == 1 && AV_LOG_INFO > av_log_get_level())
                fprintf(stderr, "%s", buf.str);
@@ -1872,10 +1845,6 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
    const AVDictionaryEntry *e = NULL;
    int nb_pix_fmts = 0;
    int i, j;
-    AVBufferSrcParameters *par = av_buffersrc_parameters_alloc();
-
-    if (!par)
-        return AVERROR(ENOMEM);

    for (i = 0; i < renderer_info.num_texture_formats; i++) {
        for (j = 0; j < FF_ARRAY_ELEMS(sdl_texture_format_map) - 1; j++) {
@@ -1899,12 +1868,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
    graph->scale_sws_opts = av_strdup(sws_flags_str);

    snprintf(buffersrc_args, sizeof(buffersrc_args),
-             "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d:"
-             "colorspace=%d:range=%d",
+             "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
             frame->width, frame->height, frame->format,
             is->video_st->time_base.num, is->video_st->time_base.den,
-             codecpar->sample_aspect_ratio.num, FFMAX(codecpar->sample_aspect_ratio.den, 1),
-             frame->colorspace, frame->color_range);
+             codecpar->sample_aspect_ratio.num, FFMAX(codecpar->sample_aspect_ratio.den, 1));
    if (fr.num && fr.den)
        av_strlcatf(buffersrc_args, sizeof(buffersrc_args), ":frame_rate=%d/%d", fr.num, fr.den);

@@ -1913,10 +1880,6 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
                                            "ffplay_buffer", buffersrc_args, NULL,
                                            graph)) < 0)
        goto fail;
-    par->hw_frames_ctx = frame->hw_frames_ctx;
-    ret = av_buffersrc_parameters_set(filt_src, par);
-    if (ret < 0)
-        goto fail;

    ret = avfilter_graph_create_filter(&filt_out,
                                       avfilter_get_by_name("buffersink"),
@@ -1926,9 +1889,6 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c

    if ((ret = av_opt_set_int_list(filt_out, "pix_fmts", pix_fmts,  AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN)) < 0)
        goto fail;
-    if (!vk_renderer &&
-        (ret = av_opt_set_int_list(filt_out, "color_spaces", sdl_supported_color_spaces,  AVCOL_SPC_UNSPECIFIED, AV_OPT_SEARCH_CHILDREN)) < 0)
-        goto fail;

    last_filter = filt_out;

@@ -1957,11 +1917,11 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
        if (sd)
            displaymatrix = (int32_t *)sd->data;
        if (!displaymatrix) {
-            const AVPacketSideData *psd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
-                                                                  is->video_st->codecpar->nb_coded_side_data,
-                                                                  AV_PKT_DATA_DISPLAYMATRIX);
-            if (psd)
-                displaymatrix = (int32_t *)psd->data;
+            const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data,
+                                                                 is->video_st->codecpar->nb_coded_side_data,
+                                                                 AV_PKT_DATA_DISPLAYMATRIX);
+            if (sd)
+                displaymatrix = (int32_t *)sd->data;
        }
        theta = get_rotation(displaymatrix);

@@ -1986,7 +1946,6 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
    is->out_video_filter = filt_out;

 fail:
-    av_freep(&par);
    return ret;
 }

@@ -2394,12 +2353,13 @@ static int audio_decode_frame(VideoState *is)
        av_channel_layout_compare(&af->frame->ch_layout, &is->audio_src.ch_layout) ||
        af->frame->sample_rate   != is->audio_src.freq           ||
        (wanted_nb_samples       != af->frame->nb_samples && !is->swr_ctx)) {
+        int ret;
        swr_free(&is->swr_ctx);
-        swr_alloc_set_opts2(&is->swr_ctx,
+        ret = swr_alloc_set_opts2(&is->swr_ctx,
                            &is->audio_tgt.ch_layout, is->audio_tgt.fmt, is->audio_tgt.freq,
                            &af->frame->ch_layout, af->frame->format, af->frame->sample_rate,
                            0, NULL);
-        if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
+        if (ret < 0 || swr_init(is->swr_ctx) < 0) {
            av_log(NULL, AV_LOG_ERROR,
                   "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
                    af->frame->sample_rate, av_get_sample_fmt_name(af->frame->format), af->frame->ch_layout.nb_channels,
@@ -2589,37 +2549,6 @@ static int audio_open(void *opaque, AVChannelLayout *wanted_channel_layout, int
    return spec.size;
 }

-static int create_hwaccel(AVBufferRef **device_ctx)
-{
-    enum AVHWDeviceType type;
-    int ret;
-    AVBufferRef *vk_dev;
-
-    *device_ctx = NULL;
-
-    if (!hwaccel)
-        return 0;
-
-    type = av_hwdevice_find_type_by_name(hwaccel);
-    if (type == AV_HWDEVICE_TYPE_NONE)
-        return AVERROR(ENOTSUP);
-
-    ret = vk_renderer_get_hw_dev(vk_renderer, &vk_dev);
-    if (ret < 0)
-        return ret;
-
-    ret = av_hwdevice_ctx_create_derived(device_ctx, type, vk_dev, 0);
-    if (!ret)
-        return 0;
-
-    if (ret != AVERROR(ENOSYS))
-        return ret;
-
-    av_log(NULL, AV_LOG_WARNING, "Derive %s from vulkan not supported.\n", hwaccel);
-    ret = av_hwdevice_ctx_create(device_ctx, type, NULL, NULL, 0);
-    return ret;
-}
-
 /* open a given stream. Return 0 if OK */
 static int stream_component_open(VideoState *is, int stream_index)
 {
@@ -2687,12 +2616,6 @@ static int stream_component_open(VideoState *is, int stream_index)

    av_dict_set(&opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY);

-    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-        ret = create_hwaccel(&avctx->hw_device_ctx);
-        if (ret < 0)
-            goto fail;
-    }
-
    if ((ret = avcodec_open2(avctx, codec, &opts)) < 0) {
        goto fail;
    }
@@ -3527,8 +3450,6 @@ static void event_loop(VideoState *cur_stream)
                        SDL_DestroyTexture(cur_stream->vis_texture);
                        cur_stream->vis_texture = NULL;
                    }
-                    if (vk_renderer)
-                        vk_renderer_resize(vk_renderer, screen_width, screen_height);
                case SDL_WINDOWEVENT_EXPOSED:
                    cur_stream->force_refresh = 1;
            }
@@ -3546,7 +3467,7 @@ static void event_loop(VideoState *cur_stream)
 static int opt_width(void *optctx, const char *opt, const char *arg)
 {
    double num;
-    int ret = parse_number(opt, arg, OPT_TYPE_INT64, 1, INT_MAX, &num);
+    int ret = parse_number(opt, arg, OPT_INT64, 1, INT_MAX, &num);
    if (ret < 0)
        return ret;

@@ -3557,7 +3478,7 @@ static int opt_width(void *optctx, const char *opt, const char *arg)
 static int opt_height(void *optctx, const char *opt, const char *arg)
 {
    double num;
-    int ret = parse_number(opt, arg, OPT_TYPE_INT64, 1, INT_MAX, &num);
+    int ret = parse_number(opt, arg, OPT_INT64, 1, INT_MAX, &num);
    if (ret < 0)
        return ret;

@@ -3598,7 +3519,7 @@ static int opt_show_mode(void *optctx, const char *opt, const char *arg)

    if (show_mode == SHOW_MODE_NONE) {
        double num;
-        int ret = parse_number(opt, arg, OPT_TYPE_INT, 0, SHOW_MODE_NB-1, &num);
+        int ret = parse_number(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1, &num);
        if (ret < 0)
            return ret;
        show_mode = num;
@@ -3616,9 +3537,7 @@ static int opt_input_file(void *optctx, const char *filename)
    }
    if (!strcmp(filename, "-"))
        filename = "fd:";
-    input_filename = av_strdup(filename);
-    if (!input_filename)
-        return AVERROR(ENOMEM);
+    input_filename = filename;

    return 0;
 }
@@ -3626,7 +3545,6 @@ static int opt_input_file(void *optctx, const char *filename)
 static int opt_codec(void *optctx, const char *opt, const char *arg)
 {
   const char *spec = strchr(opt, ':');
-   const char **name;
   if (!spec) {
       av_log(NULL, AV_LOG_ERROR,
              "No media specifier was specified in '%s' in option '%s'\n",
@@ -3634,75 +3552,68 @@ static int opt_codec(void *optctx, const char *opt, const char *arg)
       return AVERROR(EINVAL);
   }
   spec++;
-
   switch (spec[0]) {
-   case 'a' : name = &audio_codec_name;    break;
-   case 's' : name = &subtitle_codec_name; break;
-   case 'v' : name = &video_codec_name;    break;
+   case 'a' :    audio_codec_name = arg; break;
+   case 's' : subtitle_codec_name = arg; break;
+   case 'v' :    video_codec_name = arg; break;
   default:
       av_log(NULL, AV_LOG_ERROR,
              "Invalid media specifier '%s' in option '%s'\n", spec, opt);
       return AVERROR(EINVAL);
   }
-
-   av_freep(name);
-   *name = av_strdup(arg);
-   return *name ? 0 : AVERROR(ENOMEM);
+   return 0;
 }

 static int dummy;

 static const OptionDef options[] = {
    CMDUTILS_COMMON_OPTIONS
-    { "x",                  OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_width }, "force displayed width", "width" },
-    { "y",                  OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_height }, "force displayed height", "height" },
-    { "fs",                 OPT_TYPE_BOOL,            0, { &is_full_screen }, "force full screen" },
-    { "an",                 OPT_TYPE_BOOL,            0, { &audio_disable }, "disable audio" },
-    { "vn",                 OPT_TYPE_BOOL,            0, { &video_disable }, "disable video" },
-    { "sn",                 OPT_TYPE_BOOL,            0, { &subtitle_disable }, "disable subtitling" },
-    { "ast",                OPT_TYPE_STRING, OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_specifier" },
-    { "vst",                OPT_TYPE_STRING, OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_specifier" },
-    { "sst",                OPT_TYPE_STRING, OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_specifier" },
-    { "ss",                 OPT_TYPE_TIME,            0, { &start_time }, "seek to a given position in seconds", "pos" },
-    { "t",                  OPT_TYPE_TIME,            0, { &duration }, "play  \"duration\" seconds of audio/video", "duration" },
-    { "bytes",              OPT_TYPE_INT,             0, { &seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
-    { "seek_interval",      OPT_TYPE_FLOAT,           0, { &seek_interval }, "set seek interval for left/right keys, in seconds", "seconds" },
-    { "nodisp",             OPT_TYPE_BOOL,            0, { &display_disable }, "disable graphical display" },
-    { "noborder",           OPT_TYPE_BOOL,            0, { &borderless }, "borderless window" },
-    { "alwaysontop",        OPT_TYPE_BOOL,            0, { &alwaysontop }, "window always on top" },
-    { "volume",             OPT_TYPE_INT,             0, { &startup_volume}, "set startup volume 0=min 100=max", "volume" },
-    { "f",                  OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_format }, "force format", "fmt" },
-    { "stats",              OPT_TYPE_BOOL,   OPT_EXPERT, { &show_status }, "show status", "" },
-    { "fast",               OPT_TYPE_BOOL,   OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" },
-    { "genpts",             OPT_TYPE_BOOL,   OPT_EXPERT, { &genpts }, "generate pts", "" },
-    { "drp",                OPT_TYPE_INT,    OPT_EXPERT, { &decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
-    { "lowres",             OPT_TYPE_INT,    OPT_EXPERT, { &lowres }, "", "" },
-    { "sync",               OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
-    { "autoexit",           OPT_TYPE_BOOL,   OPT_EXPERT, { &autoexit }, "exit at the end", "" },
-    { "exitonkeydown",      OPT_TYPE_BOOL,   OPT_EXPERT, { &exit_on_keydown }, "exit on key down", "" },
-    { "exitonmousedown",    OPT_TYPE_BOOL,   OPT_EXPERT, { &exit_on_mousedown }, "exit on mouse down", "" },
-    { "loop",               OPT_TYPE_INT,    OPT_EXPERT, { &loop }, "set number of times the playback shall be looped", "loop count" },
-    { "framedrop",          OPT_TYPE_BOOL,   OPT_EXPERT, { &framedrop }, "drop frames when cpu is too slow", "" },
-    { "infbuf",             OPT_TYPE_BOOL,   OPT_EXPERT, { &infinite_buffer }, "don't limit the input buffer size (useful with realtime streams)", "" },
-    { "window_title",       OPT_TYPE_STRING,          0, { &window_title }, "set window title", "window title" },
-    { "left",               OPT_TYPE_INT,    OPT_EXPERT, { &screen_left }, "set the x position for the left of the window", "x pos" },
-    { "top",                OPT_TYPE_INT,    OPT_EXPERT, { &screen_top }, "set the y position for the top of the window", "y pos" },
-    { "vf",                 OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_add_vfilter }, "set video filters", "filter_graph" },
-    { "af",                 OPT_TYPE_STRING,          0, { &afilters }, "set audio filters", "filter_graph" },
-    { "rdftspeed",          OPT_TYPE_INT, OPT_AUDIO | OPT_EXPERT, { &rdftspeed }, "rdft speed", "msecs" },
-    { "showmode",           OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
-    { "i",                  OPT_TYPE_BOOL,            0, { &dummy}, "read specified file", "input_file"},
-    { "codec",              OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" },
-    { "acodec",             OPT_TYPE_STRING, OPT_EXPERT, {    &audio_codec_name }, "force audio decoder",    "decoder_name" },
-    { "scodec",             OPT_TYPE_STRING, OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" },
-    { "vcodec",             OPT_TYPE_STRING, OPT_EXPERT, {    &video_codec_name }, "force video decoder",    "decoder_name" },
-    { "autorotate",         OPT_TYPE_BOOL,            0, { &autorotate }, "automatically rotate video", "" },
-    { "find_stream_info",   OPT_TYPE_BOOL, OPT_INPUT | OPT_EXPERT, { &find_stream_info },
+    { "x", HAS_ARG, { .func_arg = opt_width }, "force displayed width", "width" },
+    { "y", HAS_ARG, { .func_arg = opt_height }, "force displayed height", "height" },
+    { "fs", OPT_BOOL, { &is_full_screen }, "force full screen" },
+    { "an", OPT_BOOL, { &audio_disable }, "disable audio" },
+    { "vn", OPT_BOOL, { &video_disable }, "disable video" },
+    { "sn", OPT_BOOL, { &subtitle_disable }, "disable subtitling" },
+    { "ast", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_specifier" },
+    { "vst", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_specifier" },
+    { "sst", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_specifier" },
+    { "ss", HAS_ARG | OPT_TIME, { &start_time }, "seek to a given position in seconds", "pos" },
+    { "t",  HAS_ARG | OPT_TIME, { &duration }, "play  \"duration\" seconds of audio/video", "duration" },
+    { "bytes", OPT_INT | HAS_ARG, { &seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
+    { "seek_interval", OPT_FLOAT | HAS_ARG, { &seek_interval }, "set seek interval for left/right keys, in seconds", "seconds" },
+    { "nodisp", OPT_BOOL, { &display_disable }, "disable graphical display" },
+    { "noborder", OPT_BOOL, { &borderless }, "borderless window" },
+    { "alwaysontop", OPT_BOOL, { &alwaysontop }, "window always on top" },
+    { "volume", OPT_INT | HAS_ARG, { &startup_volume}, "set startup volume 0=min 100=max", "volume" },
+    { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" },
+    { "stats", OPT_BOOL | OPT_EXPERT, { &show_status }, "show status", "" },
+    { "fast", OPT_BOOL | OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" },
+    { "genpts", OPT_BOOL | OPT_EXPERT, { &genpts }, "generate pts", "" },
+    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { &decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
+    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { &lowres }, "", "" },
+    { "sync", HAS_ARG | OPT_EXPERT, { .func_arg = opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
+    { "autoexit", OPT_BOOL | OPT_EXPERT, { &autoexit }, "exit at the end", "" },
+    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { &exit_on_keydown }, "exit on key down", "" },
+    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { &exit_on_mousedown }, "exit on mouse down", "" },
+    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { &loop }, "set number of times the playback shall be looped", "loop count" },
+    { "framedrop", OPT_BOOL | OPT_EXPERT, { &framedrop }, "drop frames when cpu is too slow", "" },
+    { "infbuf", OPT_BOOL | OPT_EXPERT, { &infinite_buffer }, "don't limit the input buffer size (useful with realtime streams)", "" },
+    { "window_title", OPT_STRING | HAS_ARG, { &window_title }, "set window title", "window title" },
+    { "left", OPT_INT | HAS_ARG | OPT_EXPERT, { &screen_left }, "set the x position for the left of the window", "x pos" },
+    { "top", OPT_INT | HAS_ARG | OPT_EXPERT, { &screen_top }, "set the y position for the top of the window", "y pos" },
+    { "vf", OPT_EXPERT | HAS_ARG, { .func_arg = opt_add_vfilter }, "set video filters", "filter_graph" },
+    { "af", OPT_STRING | HAS_ARG, { &afilters }, "set audio filters", "filter_graph" },
+    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { &rdftspeed }, "rdft speed", "msecs" },
+    { "showmode", HAS_ARG, { .func_arg = opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
+    { "i", OPT_BOOL, { &dummy}, "read specified file", "input_file"},
+    { "codec", HAS_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" },
+    { "acodec", HAS_ARG | OPT_STRING | OPT_EXPERT, {    &audio_codec_name }, "force audio decoder",    "decoder_name" },
+    { "scodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" },
+    { "vcodec", HAS_ARG | OPT_STRING | OPT_EXPERT, {    &video_codec_name }, "force video decoder",    "decoder_name" },
+    { "autorotate", OPT_BOOL, { &autorotate }, "automatically rotate video", "" },
+    { "find_stream_info", OPT_BOOL | OPT_INPUT | OPT_EXPERT, { &find_stream_info },
        "read and decode the streams to fill missing information with heuristics" },
-    { "filter_threads",     OPT_TYPE_INT,    OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" },
-    { "enable_vulkan",      OPT_TYPE_BOOL,            0, { &enable_vulkan }, "enable vulkan renderer" },
-    { "vulkan_params",      OPT_TYPE_STRING, OPT_EXPERT, { &vulkan_params }, "vulkan configuration using a list of key=value pairs separated by ':'" },
-    { "hwaccel",            OPT_TYPE_STRING, OPT_EXPERT, { &hwaccel }, "use HW accelerated decoding" },
+    { "filter_threads", HAS_ARG | OPT_INT | OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" },
    { NULL, },
 };

@@ -3717,8 +3628,8 @@ void show_help_default(const char *opt, const char *arg)
 {
    av_log_set_callback(log_callback_help);
    show_usage();
-    show_help_options(options, "Main options:", 0, OPT_EXPERT);
-    show_help_options(options, "Advanced options:", OPT_EXPERT, 0);
+    show_help_options(options, "Main options:", 0, OPT_EXPERT, 0);
+    show_help_options(options, "Advanced options:", OPT_EXPERT, 0, 0);
    printf("\n");
    show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
@@ -3817,40 +3728,9 @@ int main(int argc, char **argv)
 #ifdef SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
        SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
 #endif
-        if (hwaccel && !enable_vulkan) {
-            av_log(NULL, AV_LOG_INFO, "Enable vulkan renderer to support hwaccel %s\n", hwaccel);
-            enable_vulkan = 1;
-        }
-        if (enable_vulkan) {
-            vk_renderer = vk_get_renderer();
-            if (vk_renderer) {
-#if SDL_VERSION_ATLEAST(2, 0, 6)
-                flags |= SDL_WINDOW_VULKAN;
-#endif
-            } else {
-                av_log(NULL, AV_LOG_WARNING, "Doesn't support vulkan renderer, fallback to SDL renderer\n");
-                enable_vulkan = 0;
-            }
-        }
        window = SDL_CreateWindow(program_name, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, default_width, default_height, flags);
        SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
-        if (!window) {
-            av_log(NULL, AV_LOG_FATAL, "Failed to create window: %s", SDL_GetError());
-            do_exit(NULL);
-        }
-
-        if (vk_renderer) {
-            AVDictionary *dict = NULL;
-
-            if (vulkan_params)
-                av_dict_parse_string(&dict, vulkan_params, "=", ":", 0);
-            ret = vk_renderer_create(vk_renderer, window, dict);
-            av_dict_free(&dict);
-            if (ret < 0) {
-                av_log(NULL, AV_LOG_FATAL, "Failed to create vulkan renderer, %s\n", av_err2str(ret));
-                do_exit(NULL);
-            }
-        } else {
+        if (window) {
            renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
            if (!renderer) {
                av_log(NULL, AV_LOG_WARNING, "Failed to initialize a hardware accelerated renderer: %s\n", SDL_GetError());
@@ -3860,10 +3740,10 @@ int main(int argc, char **argv)
                if (!SDL_GetRendererInfo(renderer, &renderer_info))
                    av_log(NULL, AV_LOG_VERBOSE, "Initialized %s renderer.\n", renderer_info.name);
            }
-            if (!renderer || !renderer_info.num_texture_formats) {
-                av_log(NULL, AV_LOG_FATAL, "Failed to create window or renderer: %s", SDL_GetError());
-                do_exit(NULL);
-            }
+        }
+        if (!window || !renderer || !renderer_info.num_texture_formats) {
+            av_log(NULL, AV_LOG_FATAL, "Failed to create window or renderer: %s", SDL_GetError());
+            do_exit(NULL);
        }
    }

@@ -1,835 +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
- */
-
-#define VK_NO_PROTOTYPES
-#define VK_ENABLE_BETA_EXTENSIONS
-
-#include "config.h"
-#include "ffplay_renderer.h"
-
-#if (SDL_VERSION_ATLEAST(2, 0, 6) && CONFIG_LIBPLACEBO)
-/* Get PL_API_VER */
-#include <libplacebo/config.h>
-#define HAVE_VULKAN_RENDERER (PL_API_VER >= 278)
-#else
-#define HAVE_VULKAN_RENDERER 0
-#endif
-
-#if HAVE_VULKAN_RENDERER
-
-#if defined(_WIN32) && !defined(VK_USE_PLATFORM_WIN32_KHR)
-#define VK_USE_PLATFORM_WIN32_KHR
-#endif
-
-#include <libplacebo/vulkan.h>
-#include <libplacebo/utils/frame_queue.h>
-#include <libplacebo/utils/libav.h>
-#include <SDL_vulkan.h>
-
-#include "libavutil/bprint.h"
-
-#endif
-
-struct VkRenderer {
-    const AVClass *class;
-
-    int (*create)(VkRenderer *renderer, SDL_Window *window, AVDictionary *dict);
-
-    int (*get_hw_dev)(VkRenderer *renderer, AVBufferRef **dev);
-
-    int (*display)(VkRenderer *renderer, AVFrame *frame);
-
-    int (*resize)(VkRenderer *renderer, int width, int height);
-
-    void (*destroy)(VkRenderer *renderer);
-};
-
-#if HAVE_VULKAN_RENDERER
-
-typedef struct RendererContext {
-    VkRenderer api;
-
-    // Can be NULL when vulkan instance is created by avutil
-    pl_vk_inst placebo_instance;
-    pl_vulkan placebo_vulkan;
-    pl_swapchain swapchain;
-    VkSurfaceKHR vk_surface;
-    pl_renderer renderer;
-    pl_tex tex[4];
-
-    pl_log vk_log;
-
-    AVBufferRef *hw_device_ref;
-    AVBufferRef *hw_frame_ref;
-    enum AVPixelFormat *transfer_formats;
-    AVHWFramesConstraints *constraints;
-
-    PFN_vkGetInstanceProcAddr get_proc_addr;
-    // This field is a copy from pl_vk_inst->instance or hw_device_ref instance.
-    VkInstance inst;
-
-    AVFrame *vk_frame;
-} RendererContext;
-
-static void vk_log_cb(void *log_priv, enum pl_log_level level,
-                      const char *msg)
-{
-    static const int level_map[] = {
-            AV_LOG_QUIET,
-            AV_LOG_FATAL,
-            AV_LOG_ERROR,
-            AV_LOG_WARNING,
-            AV_LOG_INFO,
-            AV_LOG_DEBUG,
-            AV_LOG_TRACE,
-    };
-
-    if (level > 0 && level < FF_ARRAY_ELEMS(level_map))
-        av_log(log_priv, level_map[level], "%s\n", msg);
-}
-
-// Should keep sync with optional_device_exts inside hwcontext_vulkan.c
-static const char *optional_device_exts[] = {
-    /* Misc or required by other extensions */
-    VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME,
-    VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME,
-    VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME,
-    VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME,
-    VK_EXT_PHYSICAL_DEVICE_DRM_EXTENSION_NAME,
-    VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME,
-    VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME,
-
-    /* Imports/exports */
-    VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,
-    VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME,
-    VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME,
-    VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
-    VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME,
-#ifdef _WIN32
-    VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME,
-    VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME,
-#endif
-
-    /* Video encoding/decoding */
-    VK_KHR_VIDEO_QUEUE_EXTENSION_NAME,
-    VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,
-    VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME,
-    VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME,
-    "VK_MESA_video_decode_av1",
-};
-
-static inline int enable_debug(const AVDictionary *opt)
-{
-    AVDictionaryEntry *entry = av_dict_get(opt, "debug", NULL, 0);
-    int debug = entry && strtol(entry->value, NULL, 10);
-    return debug;
-}
-
-static void hwctx_lock_queue(void *priv, uint32_t qf, uint32_t qidx)
-{
-    AVHWDeviceContext *avhwctx = priv;
-    const AVVulkanDeviceContext *hwctx = avhwctx->hwctx;
-    hwctx->lock_queue(avhwctx, qf, qidx);
-}
-
-static void hwctx_unlock_queue(void *priv, uint32_t qf, uint32_t qidx)
-{
-    AVHWDeviceContext *avhwctx = priv;
-    const AVVulkanDeviceContext *hwctx = avhwctx->hwctx;
-    hwctx->unlock_queue(avhwctx, qf, qidx);
-}
-
-static int add_instance_extension(const char **ext, unsigned num_ext,
-                                  const AVDictionary *opt,
-                                  AVDictionary **dict)
-{
-    const char *inst_ext_key = "instance_extensions";
-    AVDictionaryEntry *entry;
-    AVBPrint buf;
-    char *ext_list = NULL;
-    int ret;
-
-    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
-    for (int i = 0; i < num_ext; i++) {
-        if (i)
-            av_bprintf(&buf, "+%s", ext[i]);
-        else
-            av_bprintf(&buf, "%s", ext[i]);
-    }
-
-    entry = av_dict_get(opt, inst_ext_key, NULL, 0);
-    if (entry && entry->value && entry->value[0]) {
-        if (num_ext)
-            av_bprintf(&buf, "+");
-        av_bprintf(&buf, "%s", entry->value);
-    }
-
-    ret = av_bprint_finalize(&buf, &ext_list);
-    if (ret < 0)
-        return ret;
-    return av_dict_set(dict, inst_ext_key, ext_list, AV_DICT_DONT_STRDUP_VAL);
-}
-
-static int add_device_extension(const AVDictionary *opt,
-                                AVDictionary **dict)
-{
-    const char *dev_ext_key = "device_extensions";
-    AVDictionaryEntry *entry;
-    AVBPrint buf;
-    char *ext_list = NULL;
-    int ret;
-
-    av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
-    av_bprintf(&buf, "%s", VK_KHR_SWAPCHAIN_EXTENSION_NAME);
-    for (int i = 0; i < pl_vulkan_num_recommended_extensions; i++)
-        av_bprintf(&buf, "+%s", pl_vulkan_recommended_extensions[i]);
-
-    entry = av_dict_get(opt, dev_ext_key, NULL, 0);
-    if (entry && entry->value && entry->value[0])
-        av_bprintf(&buf, "+%s", entry->value);
-
-    ret = av_bprint_finalize(&buf, &ext_list);
-    if (ret < 0)
-        return ret;
-    return av_dict_set(dict, dev_ext_key, ext_list, AV_DICT_DONT_STRDUP_VAL);
-}
-
-static const char *select_device(const AVDictionary *opt)
-{
-    const AVDictionaryEntry *entry;
-
-    entry = av_dict_get(opt, "device", NULL, 0);
-    if (entry)
-        return entry->value;
-    return NULL;
-}
-
-static int create_vk_by_hwcontext(VkRenderer *renderer,
-                                  const char **ext, unsigned num_ext,
-                                  const AVDictionary *opt)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    AVHWDeviceContext *dev;
-    AVVulkanDeviceContext *hwctx;
-    AVDictionary *dict = NULL;
-    int ret;
-
-    ret = add_instance_extension(ext, num_ext, opt, &dict);
-    if (ret < 0)
-        return ret;
-    ret = add_device_extension(opt, &dict);
-    if (ret) {
-        av_dict_free(&dict);
-        return ret;
-    }
-
-    ret = av_hwdevice_ctx_create(&ctx->hw_device_ref, AV_HWDEVICE_TYPE_VULKAN,
-                                 select_device(opt), dict, 0);
-    av_dict_free(&dict);
-    if (ret < 0)
-        return ret;
-
-    dev = (AVHWDeviceContext *) ctx->hw_device_ref->data;
-    hwctx = dev->hwctx;
-
-    // There is no way to pass SDL GetInstanceProcAddr to hwdevice.
-    // Check the result and return error if they don't match.
-    if (hwctx->get_proc_addr != SDL_Vulkan_GetVkGetInstanceProcAddr()) {
-        av_log(renderer, AV_LOG_ERROR,
-               "hwdevice and SDL use different get_proc_addr. "
-               "Try -vulkan_params create_by_placebo=1\n");
-        return AVERROR_PATCHWELCOME;
-    }
-
-    ctx->get_proc_addr = hwctx->get_proc_addr;
-    ctx->inst = hwctx->inst;
-    ctx->placebo_vulkan = pl_vulkan_import(ctx->vk_log,
-        pl_vulkan_import_params(
-            .instance = hwctx->inst,
-            .get_proc_addr = hwctx->get_proc_addr,
-            .phys_device = hwctx->phys_dev,
-            .device         = hwctx->act_dev,
-            .extensions     = hwctx->enabled_dev_extensions,
-            .num_extensions = hwctx->nb_enabled_dev_extensions,
-            .features       = &hwctx->device_features,
-            .lock_queue     = hwctx_lock_queue,
-            .unlock_queue   = hwctx_unlock_queue,
-            .queue_ctx      = dev,
-            .queue_graphics = {
-                .index = hwctx->queue_family_index,
-                .count = hwctx->nb_graphics_queues,
-            },
-            .queue_compute = {
-                .index = hwctx->queue_family_comp_index,
-                .count = hwctx->nb_comp_queues,
-            },
-            .queue_transfer = {
-                .index = hwctx->queue_family_tx_index,
-                .count = hwctx->nb_tx_queues,
-            },
-        ));
-    if (!ctx->placebo_vulkan)
-        return AVERROR_EXTERNAL;
-
-    return 0;
-}
-
-static void placebo_lock_queue(struct AVHWDeviceContext *dev_ctx,
-                       uint32_t queue_family, uint32_t index)
-{
-    RendererContext *ctx = dev_ctx->user_opaque;
-    pl_vulkan vk = ctx->placebo_vulkan;
-    vk->lock_queue(vk, queue_family, index);
-}
-
-static void placebo_unlock_queue(struct AVHWDeviceContext *dev_ctx,
-                         uint32_t queue_family,
-                         uint32_t index)
-{
-    RendererContext *ctx = dev_ctx->user_opaque;
-    pl_vulkan vk = ctx->placebo_vulkan;
-    vk->unlock_queue(vk, queue_family, index);
-}
-
-static int get_decode_queue(VkRenderer *renderer, int *index, int *count)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    VkQueueFamilyProperties *queue_family_prop = NULL;
-    uint32_t num_queue_family_prop = 0;
-    PFN_vkGetPhysicalDeviceQueueFamilyProperties get_queue_family_prop;
-    PFN_vkGetInstanceProcAddr get_proc_addr = ctx->get_proc_addr;
-
-    *index = -1;
-    *count = 0;
-    get_queue_family_prop = (PFN_vkGetPhysicalDeviceQueueFamilyProperties)
-            get_proc_addr(ctx->placebo_instance->instance,
-                          "vkGetPhysicalDeviceQueueFamilyProperties");
-    get_queue_family_prop(ctx->placebo_vulkan->phys_device,
-                          &num_queue_family_prop, NULL);
-    if (!num_queue_family_prop)
-        return AVERROR_EXTERNAL;
-
-    queue_family_prop = av_calloc(num_queue_family_prop,
-                                  sizeof(*queue_family_prop));
-    if (!queue_family_prop)
-        return AVERROR(ENOMEM);
-
-    get_queue_family_prop(ctx->placebo_vulkan->phys_device,
-                          &num_queue_family_prop,
-                          queue_family_prop);
-
-    for (int i = 0; i < num_queue_family_prop; i++) {
-        if (queue_family_prop[i].queueFlags & VK_QUEUE_VIDEO_DECODE_BIT_KHR) {
-            *index = i;
-            *count = queue_family_prop[i].queueCount;
-            break;
-        }
-    }
-    av_free(queue_family_prop);
-
-    return 0;
-}
-
-static int create_vk_by_placebo(VkRenderer *renderer,
-                                const char **ext, unsigned num_ext,
-                                const AVDictionary *opt)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    AVHWDeviceContext *device_ctx;
-    AVVulkanDeviceContext *vk_dev_ctx;
-    int decode_index;
-    int decode_count;
-    int ret;
-
-    ctx->get_proc_addr = SDL_Vulkan_GetVkGetInstanceProcAddr();
-
-    ctx->placebo_instance = pl_vk_inst_create(ctx->vk_log, pl_vk_inst_params(
-            .get_proc_addr = ctx->get_proc_addr,
-            .debug = enable_debug(opt),
-            .extensions = ext,
-            .num_extensions = num_ext
-    ));
-    if (!ctx->placebo_instance) {
-        return AVERROR_EXTERNAL;
-    }
-    ctx->inst = ctx->placebo_instance->instance;
-
-    ctx->placebo_vulkan = pl_vulkan_create(ctx->vk_log, pl_vulkan_params(
-            .instance = ctx->placebo_instance->instance,
-            .get_proc_addr = ctx->placebo_instance->get_proc_addr,
-            .surface = ctx->vk_surface,
-            .allow_software = false,
-            .opt_extensions = optional_device_exts,
-            .num_opt_extensions = FF_ARRAY_ELEMS(optional_device_exts),
-            .extra_queues = VK_QUEUE_VIDEO_DECODE_BIT_KHR,
-            .device_name = select_device(opt),
-    ));
-    if (!ctx->placebo_vulkan)
-        return AVERROR_EXTERNAL;
-    ctx->hw_device_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VULKAN);
-    if (!ctx->hw_device_ref) {
-        return AVERROR(ENOMEM);
-    }
-
-    device_ctx = (AVHWDeviceContext *) ctx->hw_device_ref->data;
-    device_ctx->user_opaque = ctx;
-
-    vk_dev_ctx = device_ctx->hwctx;
-    vk_dev_ctx->lock_queue = placebo_lock_queue,
-            vk_dev_ctx->unlock_queue = placebo_unlock_queue;
-
-    vk_dev_ctx->get_proc_addr = ctx->placebo_instance->get_proc_addr;
-
-    vk_dev_ctx->inst = ctx->placebo_instance->instance;
-    vk_dev_ctx->phys_dev = ctx->placebo_vulkan->phys_device;
-    vk_dev_ctx->act_dev = ctx->placebo_vulkan->device;
-
-    vk_dev_ctx->device_features = *ctx->placebo_vulkan->features;
-
-    vk_dev_ctx->enabled_inst_extensions = ctx->placebo_instance->extensions;
-    vk_dev_ctx->nb_enabled_inst_extensions = ctx->placebo_instance->num_extensions;
-
-    vk_dev_ctx->enabled_dev_extensions = ctx->placebo_vulkan->extensions;
-    vk_dev_ctx->nb_enabled_dev_extensions = ctx->placebo_vulkan->num_extensions;
-
-    vk_dev_ctx->queue_family_index = ctx->placebo_vulkan->queue_graphics.index;
-    vk_dev_ctx->nb_graphics_queues = ctx->placebo_vulkan->queue_graphics.count;
-
-    vk_dev_ctx->queue_family_tx_index = ctx->placebo_vulkan->queue_transfer.index;
-    vk_dev_ctx->nb_tx_queues = ctx->placebo_vulkan->queue_transfer.count;
-
-    vk_dev_ctx->queue_family_comp_index = ctx->placebo_vulkan->queue_compute.index;
-    vk_dev_ctx->nb_comp_queues = ctx->placebo_vulkan->queue_compute.count;
-
-    ret = get_decode_queue(renderer, &decode_index, &decode_count);
-    if (ret < 0)
-        return ret;
-
-    vk_dev_ctx->queue_family_decode_index = decode_index;
-    vk_dev_ctx->nb_decode_queues = decode_count;
-
-    ret = av_hwdevice_ctx_init(ctx->hw_device_ref);
-    if (ret < 0)
-        return ret;
-
-    return 0;
-}
-
-static int create(VkRenderer *renderer, SDL_Window *window, AVDictionary *opt)
-{
-    int ret = 0;
-    unsigned num_ext = 0;
-    const char **ext = NULL;
-    int w, h;
-    struct pl_log_params vk_log_params = {
-            .log_cb = vk_log_cb,
-            .log_level = PL_LOG_DEBUG,
-            .log_priv = renderer,
-    };
-    RendererContext *ctx = (RendererContext *) renderer;
-    AVDictionaryEntry *entry;
-
-    ctx->vk_log = pl_log_create(PL_API_VER, &vk_log_params);
-
-    if (!SDL_Vulkan_GetInstanceExtensions(window, &num_ext, NULL)) {
-        av_log(NULL, AV_LOG_FATAL, "Failed to get vulkan extensions: %s\n",
-               SDL_GetError());
-        return AVERROR_EXTERNAL;
-    }
-
-    ext = av_calloc(num_ext, sizeof(*ext));
-    if (!ext) {
-        ret = AVERROR(ENOMEM);
-        goto out;
-    }
-
-    SDL_Vulkan_GetInstanceExtensions(window, &num_ext, ext);
-
-    entry = av_dict_get(opt, "create_by_placebo", NULL, 0);
-    if (entry && strtol(entry->value, NULL, 10))
-        ret = create_vk_by_placebo(renderer, ext, num_ext, opt);
-    else
-        ret = create_vk_by_hwcontext(renderer, ext, num_ext, opt);
-    if (ret < 0)
-        goto out;
-
-    if (!SDL_Vulkan_CreateSurface(window, ctx->inst, &ctx->vk_surface)) {
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-
-    ctx->swapchain = pl_vulkan_create_swapchain(
-            ctx->placebo_vulkan,
-            pl_vulkan_swapchain_params(
-                    .surface = ctx->vk_surface,
-                    .present_mode = VK_PRESENT_MODE_FIFO_KHR));
-    if (!ctx->swapchain) {
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-
-    SDL_Vulkan_GetDrawableSize(window, &w, &h);
-    pl_swapchain_resize(ctx->swapchain, &w, &h);
-
-    ctx->renderer = pl_renderer_create(ctx->vk_log, ctx->placebo_vulkan->gpu);
-    if (!ctx->renderer) {
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-
-    ctx->vk_frame = av_frame_alloc();
-    if (!ctx->vk_frame) {
-        ret = AVERROR(ENOMEM);
-        goto out;
-    }
-
-    ret = 0;
-
-out:
-    av_free(ext);
-    return ret;
-}
-
-static int get_hw_dev(VkRenderer *renderer, AVBufferRef **dev)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-
-    *dev = ctx->hw_device_ref;
-    return 0;
-}
-
-static int create_hw_frame(VkRenderer *renderer, AVFrame *frame)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    AVHWFramesContext *src_hw_frame = (AVHWFramesContext *)
-            frame->hw_frames_ctx->data;
-    AVHWFramesContext *hw_frame;
-    AVVulkanFramesContext *vk_frame_ctx;
-    int ret;
-
-    if (ctx->hw_frame_ref) {
-        hw_frame = (AVHWFramesContext *) ctx->hw_frame_ref->data;
-
-        if (hw_frame->width == frame->width &&
-            hw_frame->height == frame->height &&
-            hw_frame->sw_format == src_hw_frame->sw_format)
-            return 0;
-
-        av_buffer_unref(&ctx->hw_frame_ref);
-    }
-
-    if (!ctx->constraints) {
-        ctx->constraints = av_hwdevice_get_hwframe_constraints(
-                ctx->hw_device_ref, NULL);
-        if (!ctx->constraints)
-            return AVERROR(ENOMEM);
-    }
-
-    // Check constraints and skip create hwframe. Don't take it as error since
-    // we can fallback to memory copy from GPU to CPU.
-    if ((ctx->constraints->max_width &&
-         ctx->constraints->max_width < frame->width) ||
-        (ctx->constraints->max_height &&
-         ctx->constraints->max_height < frame->height) ||
-        (ctx->constraints->min_width &&
-         ctx->constraints->min_width > frame->width) ||
-        (ctx->constraints->min_height &&
-         ctx->constraints->min_height > frame->height))
-        return 0;
-
-    if (ctx->constraints->valid_sw_formats) {
-        enum AVPixelFormat *sw_formats = ctx->constraints->valid_sw_formats;
-        while (*sw_formats != AV_PIX_FMT_NONE) {
-            if (*sw_formats == src_hw_frame->sw_format)
-                break;
-            sw_formats++;
-        }
-        if (*sw_formats == AV_PIX_FMT_NONE)
-            return 0;
-    }
-
-    ctx->hw_frame_ref = av_hwframe_ctx_alloc(ctx->hw_device_ref);
-    if (!ctx->hw_frame_ref)
-        return AVERROR(ENOMEM);
-
-    hw_frame = (AVHWFramesContext *) ctx->hw_frame_ref->data;
-    hw_frame->format = AV_PIX_FMT_VULKAN;
-    hw_frame->sw_format = src_hw_frame->sw_format;
-    hw_frame->width = frame->width;
-    hw_frame->height = frame->height;
-
-    if (frame->format == AV_PIX_FMT_CUDA) {
-        vk_frame_ctx = hw_frame->hwctx;
-        vk_frame_ctx->flags = AV_VK_FRAME_FLAG_DISABLE_MULTIPLANE;
-    }
-
-    ret = av_hwframe_ctx_init(ctx->hw_frame_ref);
-    if (ret < 0) {
-        av_log(renderer, AV_LOG_ERROR, "Create hwframe context failed, %s\n",
-               av_err2str(ret));
-        return ret;
-    }
-
-    av_hwframe_transfer_get_formats(ctx->hw_frame_ref,
-                                    AV_HWFRAME_TRANSFER_DIRECTION_TO,
-                                    &ctx->transfer_formats, 0);
-
-    return 0;
-}
-
-static inline int check_hw_transfer(RendererContext *ctx, AVFrame *frame)
-{
-    if (!ctx->hw_frame_ref || !ctx->transfer_formats)
-        return 0;
-
-    for (int i = 0; ctx->transfer_formats[i] != AV_PIX_FMT_NONE; i++)
-        if (ctx->transfer_formats[i] == frame->format)
-            return 1;
-
-    return 0;
-}
-
-static inline int move_to_output_frame(RendererContext *ctx, AVFrame *frame)
-{
-    int ret = av_frame_copy_props(ctx->vk_frame, frame);
-    if (ret < 0)
-        return ret;
-    av_frame_unref(frame);
-    av_frame_move_ref(frame, ctx->vk_frame);
-    return 0;
-}
-
-static int map_frame(VkRenderer *renderer, AVFrame *frame, int use_hw_frame)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    int ret;
-
-    if (use_hw_frame && !ctx->hw_frame_ref)
-        return AVERROR(ENOSYS);
-
-    // Try map data first
-    av_frame_unref(ctx->vk_frame);
-    if (use_hw_frame) {
-        ctx->vk_frame->hw_frames_ctx = av_buffer_ref(ctx->hw_frame_ref);
-        ctx->vk_frame->format = AV_PIX_FMT_VULKAN;
-    }
-    ret = av_hwframe_map(ctx->vk_frame, frame, 0);
-    if (!ret)
-        return move_to_output_frame(ctx, frame);
-
-    if (ret != AVERROR(ENOSYS))
-        av_log(NULL, AV_LOG_FATAL, "Map frame failed: %s\n", av_err2str(ret));
-    return ret;
-}
-
-static int transfer_frame(VkRenderer *renderer, AVFrame *frame, int use_hw_frame)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    int ret;
-
-    if (use_hw_frame && !check_hw_transfer(ctx, frame))
-        return AVERROR(ENOSYS);
-
-    av_frame_unref(ctx->vk_frame);
-    if (use_hw_frame)
-        av_hwframe_get_buffer(ctx->hw_frame_ref, ctx->vk_frame, 0);
-    ret = av_hwframe_transfer_data(ctx->vk_frame, frame, 1);
-    if (!ret)
-        return move_to_output_frame(ctx, frame);
-
-    if (ret != AVERROR(ENOSYS))
-        av_log(NULL, AV_LOG_FATAL, "Transfer frame failed: %s\n",
-               av_err2str(ret));
-    return ret;
-}
-
-static int convert_frame(VkRenderer *renderer, AVFrame *frame)
-{
-    int ret;
-
-    if (!frame->hw_frames_ctx)
-        return 0;
-
-    if (frame->format == AV_PIX_FMT_VULKAN)
-        return 0;
-
-    ret = create_hw_frame(renderer, frame);
-    if (ret < 0)
-        return ret;
-
-    for (int use_hw = 1; use_hw >=0; use_hw--) {
-        ret = map_frame(renderer, frame, use_hw);
-        if (!ret)
-            return 0;
-        if (ret != AVERROR(ENOSYS))
-            return ret;
-
-        ret = transfer_frame(renderer, frame, use_hw);
-        if (!ret)
-            return 0;
-        if (ret != AVERROR(ENOSYS))
-            return ret;
-    }
-
-    return ret;
-}
-
-static int display(VkRenderer *renderer, AVFrame *frame)
-{
-    struct pl_swapchain_frame swap_frame = {0};
-    struct pl_frame pl_frame = {0};
-    struct pl_frame target = {0};
-    RendererContext *ctx = (RendererContext *) renderer;
-    int ret = 0;
-
-    ret = convert_frame(renderer, frame);
-    if (ret < 0)
-        return ret;
-
-    if (!pl_map_avframe_ex(ctx->placebo_vulkan->gpu, &pl_frame, pl_avframe_params(
-            .frame = frame,
-            .tex = ctx->tex))) {
-        av_log(NULL, AV_LOG_ERROR, "pl_map_avframe_ex failed\n");
-        return AVERROR_EXTERNAL;
-    }
-
-    if (!pl_swapchain_start_frame(ctx->swapchain, &swap_frame)) {
-        av_log(NULL, AV_LOG_ERROR, "start frame failed\n");
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-
-    pl_frame_from_swapchain(&target, &swap_frame);
-    if (!pl_render_image(ctx->renderer, &pl_frame, &target,
-                         &pl_render_default_params)) {
-        av_log(NULL, AV_LOG_ERROR, "pl_render_image failed\n");
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-
-    if (!pl_swapchain_submit_frame(ctx->swapchain)) {
-        av_log(NULL, AV_LOG_ERROR, "pl_swapchain_submit_frame failed\n");
-        ret = AVERROR_EXTERNAL;
-        goto out;
-    }
-    pl_swapchain_swap_buffers(ctx->swapchain);
-
-out:
-    pl_unmap_avframe(ctx->placebo_vulkan->gpu, &pl_frame);
-    return ret;
-}
-
-static int resize(VkRenderer *renderer, int width, int height)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-
-    if (!pl_swapchain_resize(ctx->swapchain, &width, &height))
-        return AVERROR_EXTERNAL;
-    return 0;
-}
-
-static void destroy(VkRenderer *renderer)
-{
-    RendererContext *ctx = (RendererContext *) renderer;
-    PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
-
-    av_frame_free(&ctx->vk_frame);
-    av_freep(&ctx->transfer_formats);
-    av_hwframe_constraints_free(&ctx->constraints);
-    av_buffer_unref(&ctx->hw_frame_ref);
-
-    if (ctx->placebo_vulkan) {
-        for (int i = 0; i < FF_ARRAY_ELEMS(ctx->tex); i++)
-            pl_tex_destroy(ctx->placebo_vulkan->gpu, &ctx->tex[i]);
-        pl_renderer_destroy(&ctx->renderer);
-        pl_swapchain_destroy(&ctx->swapchain);
-        pl_vulkan_destroy(&ctx->placebo_vulkan);
-    }
-
-    if (ctx->vk_surface) {
-        vkDestroySurfaceKHR = (PFN_vkDestroySurfaceKHR)
-                ctx->get_proc_addr(ctx->inst, "vkDestroySurfaceKHR");
-        vkDestroySurfaceKHR(ctx->inst, ctx->vk_surface, NULL);
-        ctx->vk_surface = NULL;
-    }
-
-    av_buffer_unref(&ctx->hw_device_ref);
-    pl_vk_inst_destroy(&ctx->placebo_instance);
-
-    pl_log_destroy(&ctx->vk_log);
-}
-
-static const AVClass vulkan_renderer_class = {
-        .class_name = "Vulkan Renderer",
-        .item_name  = av_default_item_name,
-        .version    = LIBAVUTIL_VERSION_INT,
-};
-
-VkRenderer *vk_get_renderer(void)
-{
-    RendererContext *ctx = av_mallocz(sizeof(*ctx));
-    VkRenderer *renderer;
-
-    if (!ctx)
-        return NULL;
-
-    renderer = &ctx->api;
-    renderer->class = &vulkan_renderer_class;
-    renderer->get_hw_dev = get_hw_dev;
-    renderer->create = create;
-    renderer->display = display;
-    renderer->resize = resize;
-    renderer->destroy = destroy;
-
-    return renderer;
-}
-
-#else
-
-VkRenderer *vk_get_renderer(void)
-{
-    return NULL;
-}
-
-#endif
-
-int vk_renderer_create(VkRenderer *renderer, SDL_Window *window,
-                       AVDictionary *opt)
-{
-    return renderer->create(renderer, window, opt);
-}
-
-int vk_renderer_get_hw_dev(VkRenderer *renderer, AVBufferRef **dev)
-{
-    return renderer->get_hw_dev(renderer, dev);
-}
-
-int vk_renderer_display(VkRenderer *renderer, AVFrame *frame)
-{
-    return renderer->display(renderer, frame);
-}
-
-int vk_renderer_resize(VkRenderer *renderer, int width, int height)
-{
-    return renderer->resize(renderer, width, height);
-}
-
-void vk_renderer_destroy(VkRenderer *renderer)
-{
-    renderer->destroy(renderer);
-}
@@ -1,41 +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 FFTOOLS_FFPLAY_RENDERER_H
-#define FFTOOLS_FFPLAY_RENDERER_H
-
-#include <SDL.h>
-
-#include "libavutil/frame.h"
-
-typedef struct VkRenderer VkRenderer;
-
-VkRenderer *vk_get_renderer(void);
-
-int vk_renderer_create(VkRenderer *renderer, SDL_Window *window,
-                       AVDictionary *opt);
-
-int vk_renderer_get_hw_dev(VkRenderer *renderer, AVBufferRef **dev);
-
-int vk_renderer_display(VkRenderer *renderer, AVFrame *frame);
-
-int vk_renderer_resize(VkRenderer *renderer, int width, int height);
-
-void vk_renderer_destroy(VkRenderer *renderer);
-
-#endif /* FFTOOLS_FFPLAY_RENDERER_H */
@@ -724,10 +724,13 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
    return 0;
 }

-static void print_codecs(int encoder)
+static int print_codecs(int encoder)
 {
    const AVCodecDescriptor **codecs;
-    unsigned i, nb_codecs = get_codecs_sorted(&codecs);
+    int i, nb_codecs = get_codecs_sorted(&codecs);
+
+    if (nb_codecs < 0)
+        return nb_codecs;

    printf("%s:\n"
           " V..... = Video\n"
@@ -762,18 +765,17 @@ static void print_codecs(int encoder)
        }
    }
    av_free(codecs);
+    return 0;
 }

 int show_decoders(void *optctx, const char *opt, const char *arg)
 {
-    print_codecs(0);
-    return 0;
+    return print_codecs(0);
 }

 int show_encoders(void *optctx, const char *opt, const char *arg)
 {
-    print_codecs(1);
-    return 0;
+    return print_codecs(1);
 }

 int show_bsfs(void *optctx, const char *opt, const char *arg)
@@ -852,22 +854,15 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
    const AVOutputFormat *ofmt = NULL;
    const char *last_name;
    int is_dev;
-    const char *is_device_placeholder = device_only ? "" : ".";
-
-    printf("%s:\n"
-           " D.%s = Demuxing supported\n"
-           " .E%s = Muxing supported\n"
-           "%s"
-           " ---\n",
-           device_only ? "Devices" : "Formats",
-           is_device_placeholder, is_device_placeholder,
-           device_only ? "": " ..d = Is a device\n");

+    printf("%s\n"
+           " D. = Demuxing supported\n"
+           " .E = Muxing supported\n"
+           " --\n", device_only ? "Devices:" : "File formats:");
    last_name = "000";
    for (;;) {
        int decode = 0;
        int encode = 0;
-        int device = 0;
        const char *name      = NULL;
        const char *long_name = NULL;

@@ -882,7 +877,6 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
                    name      = ofmt->name;
                    long_name = ofmt->long_name;
                    encode    = 1;
-                    device    = is_dev;
                }
            }
        }
@@ -897,24 +891,20 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
                    name      = ifmt->name;
                    long_name = ifmt->long_name;
                    encode    = 0;
-                    device    = is_dev;
                }
-                if (name && strcmp(ifmt->name, name) == 0) {
+                if (name && strcmp(ifmt->name, name) == 0)
                    decode = 1;
-                    device = is_dev;
-                }
            }
        }
        if (!name)
            break;
        last_name = name;

-        printf(" %c%c%s %-15s %s\n",
+        printf(" %c%c %-15s %s\n",
               decode ? 'D' : ' ',
               encode ? 'E' : ' ',
-               device_only ? "" : (device ? "d" : " "),
               name,
-            long_name ? long_name : " ");
+            long_name ? long_name:" ");
    }
    return 0;
 }
@@ -41,9 +41,9 @@ int show_sources(void *optctx, const char *opt, const char *arg);

 #if CONFIG_AVDEVICE
 #define CMDUTILS_COMMON_OPTIONS_AVDEVICE                                                                                \
-    { "sources"    , OPT_TYPE_FUNC, OPT_EXIT | OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = show_sources },                 \
+    { "sources"    , OPT_EXIT | HAS_ARG, { .func_arg = show_sources },                                                  \
      "list sources of the input device", "device" },                                                                   \
-    { "sinks"      , OPT_TYPE_FUNC, OPT_EXIT | OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = show_sinks },                   \
+    { "sinks"      , OPT_EXIT | HAS_ARG, { .func_arg = show_sinks },                                                    \
      "list sinks of the output device", "device" },                                                                    \

 #else
@@ -197,35 +197,35 @@ int opt_cpuflags(void *optctx, const char *opt, const char *arg);
 int opt_cpucount(void *optctx, const char *opt, const char *arg);

 #define CMDUTILS_COMMON_OPTIONS                                                                                         \
-    { "L",            OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_license },     "show license" },                          \
-    { "h",            OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_help },        "show help", "topic" },                    \
-    { "?",            OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_help },        "show help", "topic" },                    \
-    { "help",         OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_help },        "show help", "topic" },                    \
-    { "-help",        OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_help },        "show help", "topic" },                    \
-    { "version",      OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_version },     "show version" },                          \
-    { "buildconf",    OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_buildconf },   "show build configuration" },              \
-    { "formats",      OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_formats },     "show available formats" },                \
-    { "muxers",       OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_muxers },      "show available muxers" },                 \
-    { "demuxers",     OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_demuxers },    "show available demuxers" },               \
-    { "devices",      OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_devices },     "show available devices" },                \
-    { "codecs",       OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_codecs },      "show available codecs" },                 \
-    { "decoders",     OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_decoders },    "show available decoders" },               \
-    { "encoders",     OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_encoders },    "show available encoders" },               \
-    { "bsfs",         OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_bsfs },        "show available bit stream filters" },     \
-    { "protocols",    OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_protocols },   "show available protocols" },              \
-    { "filters",      OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_filters },     "show available filters" },                \
-    { "pix_fmts",     OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_pix_fmts },    "show available pixel formats" },          \
-    { "layouts",      OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_layouts },     "show standard channel layouts" },         \
-    { "sample_fmts",  OPT_TYPE_FUNC, OPT_EXIT,              { .func_arg = show_sample_fmts }, "show available audio sample formats" },   \
-    { "dispositions", OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_dispositions}, "show available stream dispositions" },    \
-    { "colors",       OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_colors },      "show available color names" },            \
-    { "loglevel",     OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
-    { "v",            OPT_TYPE_FUNC, OPT_FUNC_ARG,          { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
-    { "report",       OPT_TYPE_FUNC, OPT_EXPERT,            { .func_arg = opt_report },       "generate a report" },                     \
-    { "max_alloc",    OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_max_alloc },    "set maximum size of a single allocated block", "bytes" }, \
-    { "cpuflags",     OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags },     "force specific cpu flags", "flags" },     \
-    { "cpucount",     OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_EXPERT, { .func_arg = opt_cpucount },     "force specific cpu count", "count" },     \
-    { "hide_banner",  OPT_TYPE_BOOL, OPT_EXPERT,            {&hide_banner},                   "do not show program banner", "hide_banner" }, \
+    { "L",           OPT_EXIT,             { .func_arg = show_license },     "show license" },                          \
+    { "h",           OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "?",           OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "help",        OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "-help",       OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "version",     OPT_EXIT,             { .func_arg = show_version },     "show version" },                          \
+    { "buildconf",   OPT_EXIT,             { .func_arg = show_buildconf },   "show build configuration" },              \
+    { "formats",     OPT_EXIT,             { .func_arg = show_formats },     "show available formats" },                \
+    { "muxers",      OPT_EXIT,             { .func_arg = show_muxers },      "show available muxers" },                 \
+    { "demuxers",    OPT_EXIT,             { .func_arg = show_demuxers },    "show available demuxers" },               \
+    { "devices",     OPT_EXIT,             { .func_arg = show_devices },     "show available devices" },                \
+    { "codecs",      OPT_EXIT,             { .func_arg = show_codecs },      "show available codecs" },                 \
+    { "decoders",    OPT_EXIT,             { .func_arg = show_decoders },    "show available decoders" },               \
+    { "encoders",    OPT_EXIT,             { .func_arg = show_encoders },    "show available encoders" },               \
+    { "bsfs",        OPT_EXIT,             { .func_arg = show_bsfs },        "show available bit stream filters" },     \
+    { "protocols",   OPT_EXIT,             { .func_arg = show_protocols },   "show available protocols" },              \
+    { "filters",     OPT_EXIT,             { .func_arg = show_filters },     "show available filters" },                \
+    { "pix_fmts",    OPT_EXIT,             { .func_arg = show_pix_fmts },    "show available pixel formats" },          \
+    { "layouts",     OPT_EXIT,             { .func_arg = show_layouts },     "show standard channel layouts" },         \
+    { "sample_fmts", OPT_EXIT,             { .func_arg = show_sample_fmts }, "show available audio sample formats" },   \
+    { "dispositions", OPT_EXIT,            { .func_arg = show_dispositions}, "show available stream dispositions" },    \
+    { "colors",      OPT_EXIT,             { .func_arg = show_colors },      "show available color names" },            \
+    { "loglevel",    HAS_ARG,              { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
+    { "v",           HAS_ARG,              { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
+    { "report",      0,                    { .func_arg = opt_report },       "generate a report" },                     \
+    { "max_alloc",   HAS_ARG,              { .func_arg = opt_max_alloc },    "set maximum size of a single allocated block", "bytes" }, \
+    { "cpuflags",    HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags },     "force specific cpu flags", "flags" },     \
+    { "cpucount",    HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpucount },     "force specific cpu count", "count" },     \
+    { "hide_banner", OPT_BOOL | OPT_EXPERT, {&hide_banner},     "do not show program banner", "hide_banner" },          \
    CMDUTILS_COMMON_OPTIONS_AVDEVICE                                                                                    \

 #endif /* FFTOOLS_OPT_COMMON_H */
@@ -319,7 +319,7 @@ static int overflow_heartbeat(SyncQueue *sq, int stream_idx)
    /* signal a fake timestamp for all streams that prevent tail_ts from being output */
    tail_ts++;
    for (unsigned int i = 0; i < sq->nb_streams; i++) {
-        const SyncQueueStream *st1 = &sq->streams[i];
+        SyncQueueStream *st1 = &sq->streams[i];
        int64_t ts;

        if (st == st1 || st1->finished ||
@@ -524,8 +524,8 @@ fail:
 static int receive_for_stream(SyncQueue *sq, unsigned int stream_idx,
                              SyncQueueFrame frame)
 {
-    const SyncQueueStream *st_head = sq->head_stream >= 0 ?
-                                     &sq->streams[sq->head_stream] : NULL;
+    SyncQueueStream *st_head = sq->head_stream >= 0 ?
+                               &sq->streams[sq->head_stream] : NULL;
    SyncQueueStream *st;

    av_assert0(stream_idx < sq->nb_streams);
@@ -164,12 +164,7 @@ static int receive_locked(ThreadQueue *tq, int *stream_idx,
    FifoElem elem;
    unsigned int nb_finished = 0;

-    while (av_fifo_read(tq->fifo, &elem, 1) >= 0) {
-        if (tq->finished[elem.stream_idx] & FINISHED_RECV) {
-            objpool_release(tq->obj_pool, &elem.obj);
-            continue;
-        }
-
+    if (av_fifo_read(tq->fifo, &elem, 1) >= 0) {
        tq->obj_move(data, elem.obj);
        objpool_release(tq->obj_pool, &elem.obj);
        *stream_idx = elem.stream_idx;
@@ -177,7 +172,7 @@ static int receive_locked(ThreadQueue *tq, int *stream_idx,
    }

    for (unsigned int i = 0; i < tq->nb_streams; i++) {
-        if (!tq->finished[i])
+        if (!(tq->finished[i] & FINISHED_SEND))
            continue;

        /* return EOF to the consumer at most once for each stream */
@@ -202,14 +197,7 @@ int tq_receive(ThreadQueue *tq, int *stream_idx, void *data)
    pthread_mutex_lock(&tq->lock);

    while (1) {
-        size_t can_read = av_fifo_can_read(tq->fifo);
-
        ret = receive_locked(tq, stream_idx, data);
-
-        // signal other threads if the fifo state changed
-        if (can_read != av_fifo_can_read(tq->fifo))
-            pthread_cond_broadcast(&tq->cond);
-
        if (ret == AVERROR(EAGAIN)) {
            pthread_cond_wait(&tq->cond, &tq->lock);
            continue;
@@ -218,6 +206,9 @@ int tq_receive(ThreadQueue *tq, int *stream_idx, void *data)
        break;
    }

+    if (ret == 0)
+        pthread_cond_broadcast(&tq->cond);
+
    pthread_mutex_unlock(&tq->lock);

    return ret;
@@ -125,7 +125,7 @@ static const uint8_t dequant_table[64] = {
    20, 35, 34, 32, 31, 22, 15,  8,
 };

-static VLCElem block_type_vlc[2][4][32];
+static VLC block_type_vlc[2][4];


 typedef struct CFrameBuffer {
@@ -250,15 +250,17 @@ static void idct(int16_t block[64])

 static av_cold void init_vlcs(void)
 {
+    static VLCElem table[2][4][32];
    int i, j;

    for (i = 0; i < 2; i++) {
        for (j = 0; j < 4; j++) {
-            ff_vlc_init_table_sparse(block_type_vlc[i][j], FF_ARRAY_ELEMS(block_type_vlc[i][j]),
-                                     BLOCK_TYPE_VLC_BITS, 7,
-                                     &block_type_tab[i][j][0][1], 2, 1,
-                                     &block_type_tab[i][j][0][0], 2, 1,
-                                     NULL, 0, 0, 0);
+            block_type_vlc[i][j].table           = table[i][j];
+            block_type_vlc[i][j].table_allocated = 32;
+            vlc_init(&block_type_vlc[i][j], BLOCK_TYPE_VLC_BITS, 7,
+                     &block_type_tab[i][j][0][1], 2, 1,
+                     &block_type_tab[i][j][0][0], 2, 1,
+                     VLC_INIT_USE_STATIC);
        }
    }
 }
@@ -355,7 +357,7 @@ static int decode_p_block(FourXContext *f, uint16_t *dst, const uint16_t *src,
    if (get_bits_left(&f->gb) < 1)
        return AVERROR_INVALIDDATA;
    h     = 1 << log2h;
-    code  = get_vlc2(&f->gb, block_type_vlc[1 - (f->version > 1)][index],
+    code  = get_vlc2(&f->gb, block_type_vlc[1 - (f->version > 1)][index].table,
                     BLOCK_TYPE_VLC_BITS, 1);
    av_assert0(code >= 0 && code <= 6);

@@ -43,8 +43,6 @@ typedef struct EightBpsContext {

    uint8_t planes;
    uint8_t planemap[4];
-
-    uint32_t pal[256];
 } EightBpsContext;

 static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
@@ -118,12 +116,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
 FF_DISABLE_DEPRECATION_WARNINGS
        frame->palette_has_changed =
 #endif
-        ff_copy_palette(c->pal, avpkt, avctx);
+        ff_copy_palette(frame->data[1], avpkt, avctx);
 #if FF_API_PALETTE_HAS_CHANGED
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
-
-        memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
    }

    *got_frame = 1;
@@ -25,6 +25,7 @@ HEADERS = ac3_parser.h                                                  \
          version_major.h                                               \
          videotoolbox.h                                                \
          vorbis_parser.h                                               \
+          xvmc.h                                                        \

 OBJS = ac3_parser.o                                                     \
       adts_parser.o                                                    \
@@ -63,8 +64,6 @@ OBJS = ac3_parser.o                                                     \
       xiph.o                                                           \

 # subsystems
-include $(SRC_PATH)/libavcodec/vvc/Makefile
-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
 OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
 OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o ac3.o ac3tab.o
 OBJS-$(CONFIG_ADTS_HEADER)             += adts_header.o mpeg4audio_sample_rates.o
@@ -82,8 +81,8 @@ OBJS-$(CONFIG_CBS_H265)                += cbs_h2645.o cbs_sei.o h2645_parse.o
 OBJS-$(CONFIG_CBS_H266)                += cbs_h2645.o cbs_sei.o h2645_parse.o
 OBJS-$(CONFIG_CBS_JPEG)                += cbs_jpeg.o
 OBJS-$(CONFIG_CBS_MPEG2)               += cbs_mpeg2.o
-OBJS-$(CONFIG_CBS_VP8)                 += cbs_vp8.o vp8data.o
 OBJS-$(CONFIG_CBS_VP9)                 += cbs_vp9.o
+OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
 OBJS-$(CONFIG_DEFLATE_WRAPPER)         += zlib_wrapper.o
 OBJS-$(CONFIG_DOVI_RPU)                += dovi_rpu.o
 OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
@@ -105,7 +104,7 @@ OBJS-$(CONFIG_H264_SEI)                += h264_sei.o h2645_sei.o
 OBJS-$(CONFIG_HEVCPARSE)               += hevc_parse.o hevc_ps.o hevc_data.o \
                                          h2645data.o h2645_parse.o h2645_vui.o
 OBJS-$(CONFIG_HEVC_SEI)                += hevc_sei.o h2645_sei.o \
-                                          dynamic_hdr_vivid.o aom_film_grain.o
+                                          dynamic_hdr_vivid.o
 OBJS-$(CONFIG_HPELDSP)                 += hpeldsp.o
 OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
 OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
@@ -177,12 +176,10 @@ OBJS-$(CONFIG_WMV2DSP)                 += wmv2dsp.o
 OBJS-$(CONFIG_ZERO12V_DECODER)         += 012v.o
 OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
 OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
-OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aacdec_common.o aactab.o \
-                                          aacsbr.o aacps_common.o aacps_float.o \
+OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o aacsbr.o aacps_common.o aacps_float.o \
                                          kbdwin.o \
                                          sbrdsp.o aacpsdsp_float.o cbrt_data.o
-OBJS-$(CONFIG_AAC_FIXED_DECODER)       += aacdec_fixed.o aacdec_common.o aactab.o \
-                                          aacsbr_fixed.o aacps_common.o aacps_fixed.o \
+OBJS-$(CONFIG_AAC_FIXED_DECODER)       += aacdec_fixed.o aactab.o aacsbr_fixed.o aacps_common.o aacps_fixed.o \
                                          kbdwin.o \
                                          sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o
 OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o aacenctab.o    \
@@ -252,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER)       += atrac3plusdec.o atrac3plus.o \
 OBJS-$(CONFIG_ATRAC9_DECODER)          += atrac9dec.o
 OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
 OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
-OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o av1_parse.o
+OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o
 OBJS-$(CONFIG_AV1_CUVID_DECODER)       += cuviddec.o
 OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER)  += mediacodecdec.o
 OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER)  += mediacodecenc.o
@@ -340,7 +337,6 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dvenc.o dv.o dvdata.o
 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
 OBJS-$(CONFIG_DXTORY_DECODER)          += dxtory.o
 OBJS-$(CONFIG_DXV_DECODER)             += dxv.o
-OBJS-$(CONFIG_DXV_ENCODER)             += dxvenc.o
 OBJS-$(CONFIG_EAC3_DECODER)            += eac3_data.o
 OBJS-$(CONFIG_EAC3_ENCODER)            += eac3enc.o eac3_data.o
 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
@@ -432,7 +428,7 @@ OBJS-$(CONFIG_HDR_ENCODER)             += hdrenc.o
 OBJS-$(CONFIG_HEVC_DECODER)            += hevcdec.o hevc_mvs.o \
                                          hevc_cabac.o hevc_refs.o hevcpred.o    \
                                          hevcdsp.o hevc_filter.o hevc_data.o \
-                                          h274.o aom_film_grain.o
+                                          h274.o
 OBJS-$(CONFIG_HEVC_AMF_ENCODER)        += amfenc_hevc.o
 OBJS-$(CONFIG_HEVC_CUVID_DECODER)      += cuviddec.o
 OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
@@ -449,7 +445,8 @@ OBJS-$(CONFIG_HEVC_V4L2M2M_DECODER)    += v4l2_m2m_dec.o
 OBJS-$(CONFIG_HEVC_V4L2M2M_ENCODER)    += v4l2_m2m_enc.o
 OBJS-$(CONFIG_HEVC_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o
 OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      += hnm4video.o
-OBJS-$(CONFIG_HQ_HQA_DECODER)          += hq_hqa.o hq_hqadsp.o canopus.o
+OBJS-$(CONFIG_HQ_HQA_DECODER)          += hq_hqa.o hq_hqadata.o hq_hqadsp.o \
+                                          canopus.o
 OBJS-$(CONFIG_HQX_DECODER)             += hqx.o hqxvlc.o hqxdsp.o canopus.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
@@ -480,7 +477,6 @@ OBJS-$(CONFIG_JV_DECODER)              += jvdec.o
 OBJS-$(CONFIG_KGV1_DECODER)            += kgv1dec.o
 OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.o
 OBJS-$(CONFIG_LAGARITH_DECODER)        += lagarith.o lagarithrac.o
-OBJS-$(CONFIG_LEAD_DECODER)            += leaddec.o jpegquanttables.o
 OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc_common.o
 OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
 OBJS-$(CONFIG_LSCR_DECODER)            += lscrdec.o png.o pngdec.o pngdsp.o
@@ -623,7 +619,6 @@ OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o                     \
 OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o
 OBJS-$(CONFIG_QDMC_DECODER)            += qdmc.o
 OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.o
-OBJS-$(CONFIG_QOA_DECODER)             += qoadec.o
 OBJS-$(CONFIG_QOI_DECODER)             += qoidec.o
 OBJS-$(CONFIG_QOI_ENCODER)             += qoienc.o
 OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.o
@@ -986,7 +981,6 @@ OBJS-$(CONFIG_ADPCM_ZORK_DECODER)         += adpcm.o adpcm_data.o

 # hardware accelerators
 OBJS-$(CONFIG_D3D11VA)                    += dxva2.o
-OBJS-$(CONFIG_D3D12VA)                    += dxva2.o d3d12va_decode.o
 OBJS-$(CONFIG_DXVA2)                      += dxva2.o
 OBJS-$(CONFIG_NVDEC)                      += nvdec.o
 OBJS-$(CONFIG_VAAPI)                      += vaapi_decode.o
@@ -996,7 +990,6 @@ OBJS-$(CONFIG_VULKAN)                     += vulkan.o vulkan_video.o

 OBJS-$(CONFIG_AV1_D3D11VA_HWACCEL)        += dxva2_av1.o
 OBJS-$(CONFIG_AV1_DXVA2_HWACCEL)          += dxva2_av1.o
-OBJS-$(CONFIG_AV1_D3D12VA_HWACCEL)        += dxva2_av1.o d3d12va_av1.o
 OBJS-$(CONFIG_AV1_NVDEC_HWACCEL)          += nvdec_av1.o
 OBJS-$(CONFIG_AV1_VAAPI_HWACCEL)          += vaapi_av1.o
 OBJS-$(CONFIG_AV1_VDPAU_HWACCEL)          += vdpau_av1.o
@@ -1005,7 +998,6 @@ OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
 OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
 OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
 OBJS-$(CONFIG_H264_DXVA2_HWACCEL)         += dxva2_h264.o
-OBJS-$(CONFIG_H264_D3D12VA_HWACCEL)       += dxva2_h264.o d3d12va_h264.o
 OBJS-$(CONFIG_H264_NVDEC_HWACCEL)         += nvdec_h264.o
 OBJS-$(CONFIG_H264_QSV_HWACCEL)           += qsvdec.o
 OBJS-$(CONFIG_H264_VAAPI_HWACCEL)         += vaapi_h264.o
@@ -1014,7 +1006,6 @@ OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
 OBJS-$(CONFIG_H264_VULKAN_HWACCEL)        += vulkan_decode.o vulkan_h264.o
 OBJS-$(CONFIG_HEVC_D3D11VA_HWACCEL)       += dxva2_hevc.o
 OBJS-$(CONFIG_HEVC_DXVA2_HWACCEL)         += dxva2_hevc.o
-OBJS-$(CONFIG_HEVC_D3D12VA_HWACCEL)       += dxva2_hevc.o d3d12va_hevc.o
 OBJS-$(CONFIG_HEVC_NVDEC_HWACCEL)         += nvdec_hevc.o
 OBJS-$(CONFIG_HEVC_QSV_HWACCEL)           += qsvdec.o
 OBJS-$(CONFIG_HEVC_VAAPI_HWACCEL)         += vaapi_hevc.o h265_profile_level.o
@@ -1027,7 +1018,6 @@ OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL)        += vdpau_mpeg12.o
 OBJS-$(CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
 OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL)      += dxva2_mpeg2.o
 OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)        += dxva2_mpeg2.o
-OBJS-$(CONFIG_MPEG2_D3D12VA_HWACCEL)      += dxva2_mpeg2.o d3d12va_mpeg2.o
 OBJS-$(CONFIG_MPEG2_NVDEC_HWACCEL)        += nvdec_mpeg12.o
 OBJS-$(CONFIG_MPEG2_QSV_HWACCEL)          += qsvdec.o
 OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)        += vaapi_mpeg2.o
@@ -1039,7 +1029,6 @@ OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL)        += vdpau_mpeg4.o
 OBJS-$(CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
 OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL)        += dxva2_vc1.o
 OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
-OBJS-$(CONFIG_VC1_D3D12VA_HWACCEL)        += dxva2_vc1.o d3d12va_vc1.o
 OBJS-$(CONFIG_VC1_NVDEC_HWACCEL)          += nvdec_vc1.o
 OBJS-$(CONFIG_VC1_QSV_HWACCEL)            += qsvdec.o
 OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o
@@ -1048,7 +1037,6 @@ OBJS-$(CONFIG_VP8_NVDEC_HWACCEL)          += nvdec_vp8.o
 OBJS-$(CONFIG_VP8_VAAPI_HWACCEL)          += vaapi_vp8.o
 OBJS-$(CONFIG_VP9_D3D11VA_HWACCEL)        += dxva2_vp9.o
 OBJS-$(CONFIG_VP9_DXVA2_HWACCEL)          += dxva2_vp9.o
-OBJS-$(CONFIG_VP9_D3D12VA_HWACCEL)        += dxva2_vp9.o d3d12va_vp9.o
 OBJS-$(CONFIG_VP9_NVDEC_HWACCEL)          += nvdec_vp9.o
 OBJS-$(CONFIG_VP9_VAAPI_HWACCEL)          += vaapi_vp9.o
 OBJS-$(CONFIG_VP9_VDPAU_HWACCEL)          += vdpau_vp9.o
@@ -1157,8 +1145,6 @@ OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
 OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
 OBJS-$(CONFIG_LIBXAVS_ENCODER)            += libxavs.o
 OBJS-$(CONFIG_LIBXAVS2_ENCODER)           += libxavs2.o
-OBJS-$(CONFIG_LIBXEVD_DECODER)            += libxevd.o
-OBJS-$(CONFIG_LIBXEVE_ENCODER)            += libxeve.o
 OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
 OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER)   += libzvbi-teletextdec.o ass.o

@@ -1231,14 +1217,54 @@ OBJS-$(CONFIG_XMA_PARSER)              += xma_parser.o
 OBJS-$(CONFIG_XWD_PARSER)              += xwd_parser.o

 # bitstream filters
-include $(SRC_PATH)/libavcodec/bsf/Makefile
-
-OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF)      += av1_parse.o h2645_parse.o
-OBJS-$(CONFIG_H264_METADATA_BSF)          += h264_levels.o h2645data.o
-OBJS-$(CONFIG_HAPQA_EXTRACT_BSF)          += hap.o
-OBJS-$(CONFIG_HEVC_METADATA_BSF)          += h265_profile_level.o h2645data.o
-OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += av1_parse.o
-OBJS-$(CONFIG_TRUEHD_CORE_BSF)            += mlp_parse.o mlp.o
+OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o
+OBJS-$(CONFIG_AV1_METADATA_BSF)           += av1_metadata_bsf.o
+OBJS-$(CONFIG_AV1_FRAME_MERGE_BSF)        += av1_frame_merge_bsf.o
+OBJS-$(CONFIG_AV1_FRAME_SPLIT_BSF)        += av1_frame_split_bsf.o
+OBJS-$(CONFIG_CHOMP_BSF)                  += chomp_bsf.o
+OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.o
+OBJS-$(CONFIG_DCA_CORE_BSF)               += dca_core_bsf.o
+OBJS-$(CONFIG_DTS2PTS_BSF)                += dts2pts_bsf.o
+OBJS-$(CONFIG_DV_ERROR_MARKER_BSF)        += dv_error_marker_bsf.o
+OBJS-$(CONFIG_EAC3_CORE_BSF)              += eac3_core_bsf.o
+OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF)      += extract_extradata_bsf.o    \
+                                             av1_parse.o h2645_parse.o
+OBJS-$(CONFIG_FILTER_UNITS_BSF)           += filter_units_bsf.o
+OBJS-$(CONFIG_H264_METADATA_BSF)          += h264_metadata_bsf.o h264_levels.o \
+                                             h2645data.o
+OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.o
+OBJS-$(CONFIG_H264_REDUNDANT_PPS_BSF)     += h264_redundant_pps_bsf.o
+OBJS-$(CONFIG_HAPQA_EXTRACT_BSF)          += hapqa_extract_bsf.o hap.o
+OBJS-$(CONFIG_HEVC_METADATA_BSF)          += h265_metadata_bsf.o h265_profile_level.o \
+                                             h2645data.o
+OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF)       += hevc_mp4toannexb_bsf.o
+OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.o
+OBJS-$(CONFIG_MEDIA100_TO_MJPEGB_BSF)     += media100_to_mjpegb_bsf.o
+OBJS-$(CONFIG_MJPEG2JPEG_BSF)             += mjpeg2jpeg_bsf.o
+OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.o
+OBJS-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF)   += mpeg4_unpack_bframes_bsf.o
+OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.o
+OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.o \
+                                             mpegaudiotabs.o
+OBJS-$(CONFIG_MPEG2_METADATA_BSF)         += mpeg2_metadata_bsf.o
+OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
+OBJS-$(CONFIG_NULL_BSF)                   += null_bsf.o
+OBJS-$(CONFIG_OPUS_METADATA_BSF)          += opus_metadata_bsf.o
+OBJS-$(CONFIG_PCM_RECHUNK_BSF)            += pcm_rechunk_bsf.o
+OBJS-$(CONFIG_PGS_FRAME_MERGE_BSF)        += pgs_frame_merge_bsf.o
+OBJS-$(CONFIG_PRORES_METADATA_BSF)        += prores_metadata_bsf.o
+OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o av1_parse.o
+OBJS-$(CONFIG_SETTS_BSF)                  += setts_bsf.o
+OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
+OBJS-$(CONFIG_TRACE_HEADERS_BSF)          += trace_headers_bsf.o
+OBJS-$(CONFIG_TRUEHD_CORE_BSF)            += truehd_core_bsf.o mlp_parse.o mlp.o
+OBJS-$(CONFIG_VP9_METADATA_BSF)           += vp9_metadata_bsf.o
+OBJS-$(CONFIG_VP9_RAW_REORDER_BSF)        += vp9_raw_reorder_bsf.o
+OBJS-$(CONFIG_VP9_SUPERFRAME_BSF)         += vp9_superframe_bsf.o
+OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF)   += vp9_superframe_split_bsf.o
+OBJS-$(CONFIG_VVC_METADATA_BSF)           += h266_metadata_bsf.o
+OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF)        += vvc_mp4toannexb_bsf.o
+OBJS-$(CONFIG_EVC_FRAME_MERGE_BSF)        += evc_frame_merge_bsf.o

 # thread libraries
 OBJS-$(HAVE_LIBC_MSVCRT)               += file_open.o
@@ -1258,11 +1284,11 @@ SKIPHEADERS                            += %_tablegen.h                  \
                                          aacenc_quantization.h         \
                                          aacenc_quantization_misc.h    \
                                          bitstream_template.h          \
-                                          $(ARCH)/vpx_arith.h           \
+                                          vulkan_video_codec_av1std_mesa.h \
+                                          $(ARCH)/vpx_arith.h          \

 SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
 SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
-SKIPHEADERS-$(CONFIG_D3D12VA)          += d3d12va_decode.h
 SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_JNI)              += ffjni.h
 SKIPHEADERS-$(CONFIG_LCMS2)            += fflcms2.h
@@ -1276,10 +1302,11 @@ SKIPHEADERS-$(CONFIG_NVDEC)            += nvdec.h
 SKIPHEADERS-$(CONFIG_NVENC)            += nvenc.h
 SKIPHEADERS-$(CONFIG_QSV)              += qsv.h qsv_internal.h
 SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h
+SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
 SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
 SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
-SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h
+SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
 SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
 SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h

@@ -32,6 +32,16 @@


 #include "aac_defines.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
+#include "libavutil/fixed_dsp.h"
+#include "libavutil/mem_internal.h"
+#include "libavutil/tx.h"
+#include "avcodec.h"
+#include "mpeg4audio.h"
+#include "sbr.h"
+
+#include <stdint.h>

 #define MAX_CHANNELS 64
 #define MAX_ELEM_ID 16
@@ -39,6 +49,8 @@
 #define TNS_MAX_ORDER 20
 #define MAX_LTP_LONG_SFB 40

+#define CLIP_AVOIDANCE_FACTOR 0.95f
+
 enum RawDataBlockType {
    TYPE_SCE,
    TYPE_CPE,
@@ -76,6 +88,8 @@ enum BandType {
    INTENSITY_BT   = 15,    ///< Scalefactor data are intensity stereo positions (in phase).
 };

+#define IS_CODEBOOK_UNSIGNED(x) (((x) - 1) & 10)
+
 enum ChannelPosition {
    AAC_CHANNEL_OFF   = 0,
    AAC_CHANNEL_FRONT = 1,
@@ -85,6 +99,34 @@ enum ChannelPosition {
    AAC_CHANNEL_CC    = 5,
 };

+/**
+ * The point during decoding at which channel coupling is applied.
+ */
+enum CouplingPoint {
+    BEFORE_TNS,
+    BETWEEN_TNS_AND_IMDCT,
+    AFTER_IMDCT = 3,
+};
+
+/**
+ * Output configuration status
+ */
+enum OCStatus {
+    OC_NONE,        ///< Output unconfigured
+    OC_TRIAL_PCE,   ///< Output configuration under trial specified by an inband PCE
+    OC_TRIAL_FRAME, ///< Output configuration under trial specified by a frame header
+    OC_GLOBAL_HDR,  ///< Output configuration set in a global header but not yet locked
+    OC_LOCKED,      ///< Output configuration locked in place
+};
+
+typedef struct OutputConfiguration {
+    MPEG4AudioConfig m4ac;
+    uint8_t layout_map[MAX_ELEM_ID*4][3];
+    int layout_map_tags;
+    AVChannelLayout ch_layout;
+    enum OCStatus status;
+} OutputConfiguration;
+
 /**
 * Predictor State
 */
@@ -113,6 +155,70 @@ typedef struct PredictorState {
 #define NOISE_PRE_BITS    9    ///< length of preamble
 #define NOISE_OFFSET     90    ///< subtracted from global gain, used as offset for the preamble

+/**
+ * Long Term Prediction
+ */
+typedef struct LongTermPrediction {
+    int8_t present;
+    int16_t lag;
+    int coef_idx;
+    INTFLOAT coef;
+    int8_t used[MAX_LTP_LONG_SFB];
+} LongTermPrediction;
+
+/**
+ * Individual Channel Stream
+ */
+typedef struct IndividualChannelStream {
+    uint8_t max_sfb;            ///< number of scalefactor bands per group
+    enum WindowSequence window_sequence[2];
+    uint8_t use_kb_window[2];   ///< If set, use Kaiser-Bessel window, otherwise use a sine window.
+    int num_window_groups;
+    uint8_t group_len[8];
+    LongTermPrediction ltp;
+    const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window
+    const uint8_t *swb_sizes;   ///< table of scalefactor band sizes for a particular window
+    int num_swb;                ///< number of scalefactor window bands
+    int num_windows;
+    int tns_max_bands;
+    int predictor_present;
+    int predictor_initialized;
+    int predictor_reset_group;
+    int predictor_reset_count[31];  ///< used by encoder to count prediction resets
+    uint8_t prediction_used[41];
+    uint8_t window_clipping[8]; ///< set if a certain window is near clipping
+    float clip_avoidance_factor; ///< set if any window is near clipping to the necessary atennuation factor to avoid it
+} IndividualChannelStream;
+
+/**
+ * Temporal Noise Shaping
+ */
+typedef struct TemporalNoiseShaping {
+    int present;
+    int n_filt[8];
+    int length[8][4];
+    int direction[8][4];
+    int order[8][4];
+    int coef_idx[8][4][TNS_MAX_ORDER];
+    INTFLOAT coef[8][4][TNS_MAX_ORDER];
+} TemporalNoiseShaping;
+
+/**
+ * Dynamic Range Control - decoded from the bitstream but not processed further.
+ */
+typedef struct DynamicRangeControl {
+    int pce_instance_tag;                           ///< Indicates with which program the DRC info is associated.
+    int dyn_rng_sgn[17];                            ///< DRC sign information; 0 - positive, 1 - negative
+    int dyn_rng_ctl[17];                            ///< DRC magnitude information
+    int exclude_mask[MAX_CHANNELS];                 ///< Channels to be excluded from DRC processing.
+    int band_incr;                                  ///< Number of DRC bands greater than 1 having DRC info.
+    int interpolation_scheme;                       ///< Indicates the interpolation scheme used in the SBR QMF domain.
+    int band_top[17];                               ///< Indicates the top of the i-th DRC band in units of 4 spectral lines.
+    int prog_ref_level;                             /**< A reference level for the long-term program audio level for all
+                                                     *   channels combined.
+                                                     */
+} DynamicRangeControl;
+
 typedef struct Pulse {
    int num_pulse;
    int start;
@@ -120,4 +226,166 @@ typedef struct Pulse {
    int amp[4];
 } Pulse;

+/**
+ * coupling parameters
+ */
+typedef struct ChannelCoupling {
+    enum CouplingPoint coupling_point;  ///< The point during decoding at which coupling is applied.
+    int num_coupled;       ///< number of target elements
+    enum RawDataBlockType type[8];   ///< Type of channel element to be coupled - SCE or CPE.
+    int id_select[8];      ///< element id
+    int ch_select[8];      /**< [0] shared list of gains; [1] list of gains for right channel;
+                            *   [2] list of gains for left channel; [3] lists of gains for both channels
+                            */
+    INTFLOAT gain[16][120];
+} ChannelCoupling;
+
+/**
+ * Single Channel Element - used for both SCE and LFE elements.
+ */
+typedef struct SingleChannelElement {
+    IndividualChannelStream ics;
+    TemporalNoiseShaping tns;
+    Pulse pulse;
+    enum BandType band_type[128];                   ///< band types
+    enum BandType band_alt[128];                    ///< alternative band type (used by encoder)
+    int band_type_run_end[120];                     ///< band type run end points
+    INTFLOAT sf[120];                               ///< scalefactors
+    int sf_idx[128];                                ///< scalefactor indices (used by encoder)
+    uint8_t zeroes[128];                            ///< band is not coded (used by encoder)
+    uint8_t can_pns[128];                           ///< band is allowed to PNS (informative)
+    float  is_ener[128];                            ///< Intensity stereo pos (used by encoder)
+    float pns_ener[128];                            ///< Noise energy values (used by encoder)
+    DECLARE_ALIGNED(32, INTFLOAT, pcoeffs)[1024];   ///< coefficients for IMDCT, pristine
+    DECLARE_ALIGNED(32, INTFLOAT, coeffs)[1024];    ///< coefficients for IMDCT, maybe processed
+    DECLARE_ALIGNED(32, INTFLOAT, saved)[1536];     ///< overlap
+    DECLARE_ALIGNED(32, INTFLOAT, ret_buf)[2048];   ///< PCM output buffer
+    DECLARE_ALIGNED(16, INTFLOAT, ltp_state)[3072]; ///< time signal for LTP
+    DECLARE_ALIGNED(32, AAC_FLOAT, lcoeffs)[1024];  ///< MDCT of LTP coefficients (used by encoder)
+    DECLARE_ALIGNED(32, AAC_FLOAT, prcoeffs)[1024]; ///< Main prediction coefs (used by encoder)
+    PredictorState predictor_state[MAX_PREDICTORS];
+    INTFLOAT *ret;                                  ///< PCM output
+} SingleChannelElement;
+
+/**
+ * channel element - generic struct for SCE/CPE/CCE/LFE
+ */
+typedef struct ChannelElement {
+    int present;
+    // CPE specific
+    int common_window;        ///< Set if channels share a common 'IndividualChannelStream' in bitstream.
+    int     ms_mode;          ///< Signals mid/side stereo flags coding mode (used by encoder)
+    uint8_t is_mode;          ///< Set if any bands have been encoded using intensity stereo (used by encoder)
+    uint8_t ms_mask[128];     ///< Set if mid/side stereo is used for each scalefactor window band
+    uint8_t is_mask[128];     ///< Set if intensity stereo is used (used by encoder)
+    // shared
+    SingleChannelElement ch[2];
+    // CCE specific
+    ChannelCoupling coup;
+    SpectralBandReplication sbr;
+} ChannelElement;
+
+enum AACOutputChannelOrder {
+    CHANNEL_ORDER_DEFAULT,
+    CHANNEL_ORDER_CODED,
+};
+
+/**
+ * main AAC context
+ */
+struct AACContext {
+    AVClass        *class;
+    AVCodecContext *avctx;
+    AVFrame *frame;
+
+    int is_saved;                 ///< Set if elements have stored overlap from previous frame.
+    DynamicRangeControl che_drc;
+
+    /**
+     * @name Channel element related data
+     * @{
+     */
+    ChannelElement          *che[4][MAX_ELEM_ID];
+    ChannelElement  *tag_che_map[4][MAX_ELEM_ID];
+    int tags_mapped;
+    int warned_remapping_once;
+    /** @} */
+
+    /**
+     * @name temporary aligned temporary buffers
+     * (We do not want to have these on the stack.)
+     * @{
+     */
+    DECLARE_ALIGNED(32, INTFLOAT, buf_mdct)[1024];
+    /** @} */
+
+    /**
+     * @name Computed / set up during initialization
+     * @{
+     */
+    AVTXContext *mdct120;
+    AVTXContext *mdct128;
+    AVTXContext *mdct480;
+    AVTXContext *mdct512;
+    AVTXContext *mdct960;
+    AVTXContext *mdct1024;
+    AVTXContext *mdct_ltp;
+
+    av_tx_fn mdct120_fn;
+    av_tx_fn mdct128_fn;
+    av_tx_fn mdct480_fn;
+    av_tx_fn mdct512_fn;
+    av_tx_fn mdct960_fn;
+    av_tx_fn mdct1024_fn;
+    av_tx_fn mdct_ltp_fn;
+#if USE_FIXED
+    AVFixedDSPContext *fdsp;
+#else
+    AVFloatDSPContext *fdsp;
+#endif /* USE_FIXED */
+    int random_state;
+    /** @} */
+
+    /**
+     * @name Members used for output
+     * @{
+     */
+    SingleChannelElement *output_element[MAX_CHANNELS]; ///< Points to each SingleChannelElement
+    /** @} */
+
+
+    /**
+     * @name Japanese DTV specific extension
+     * @{
+     */
+    int force_dmono_mode;///< 0->not dmono, 1->use first channel, 2->use second channel
+    int dmono_mode;      ///< 0->not dmono, 1->use first channel, 2->use second channel
+    /** @} */
+
+    enum AACOutputChannelOrder output_channel_order;
+
+    DECLARE_ALIGNED(32, INTFLOAT, temp)[128];
+
+    OutputConfiguration oc[2];
+    int warned_num_aac_frames;
+    int warned_960_sbr;
+    unsigned warned_71_wide;
+    int warned_gain_control;
+    int warned_he_aac_mono;
+
+    /* aacdec functions pointers */
+    void (*imdct_and_windowing)(AACContext *ac, SingleChannelElement *sce);
+    void (*apply_ltp)(AACContext *ac, SingleChannelElement *sce);
+    void (*apply_tns)(INTFLOAT coef[1024], TemporalNoiseShaping *tns,
+                      IndividualChannelStream *ics, int decode);
+    void (*windowing_and_mdct_ltp)(AACContext *ac, INTFLOAT *out,
+                                   INTFLOAT *in, IndividualChannelStream *ics);
+    void (*update_ltp)(AACContext *ac, SingleChannelElement *sce);
+    void (*vector_pow43)(int *coefs, int len);
+    void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
+
+};
+
+void ff_aacdec_init_mips(AACContext *c);
+
 #endif /* AVCODEC_AAC_H */
@@ -135,6 +135,12 @@ get_next:
                    avctx->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
                    avctx->ch_layout.nb_channels = hdr.channels;
                }
+#if FF_API_OLD_CHANNEL_LAYOUT
+FF_DISABLE_DEPRECATION_WARNINGS
+                avctx->channels = avctx->ch_layout.nb_channels;
+                avctx->channel_layout = hdr.channel_layout;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
            }
            s1->duration = hdr.num_blocks * 256;
            avctx->audio_service_type = hdr.bitstream_mode;
@@ -30,6 +30,7 @@
 #include "libavutil/softfloat.h"

 #define AAC_RENAME(x)       x ## _fixed
+#define AAC_RENAME_32(x)    x ## _fixed_32
 #define AAC_RENAME2(x)      x ## _fixed
 typedef int                 INTFLOAT;
 typedef unsigned            UINTFLOAT;  ///< Equivalent to INTFLOAT, Used as temporal cast to avoid undefined sign overflow operations.
@@ -71,19 +72,12 @@ typedef int                 AAC_SIGNE;
                                      ((int64_t)(y) * (z)) + \
                                        0x40000000) >> 31)
 #define AAC_HALF_SUM(x, y)  (((x) >> 1) + ((y) >> 1))
-
-#ifdef LPC_USE_FIXED
-#error aac_defines.h must be included before lpc_functions.h for fixed point decoder
-#endif
-
-#define LPC_USE_FIXED 1
-#define LPC_MUL26(x, y)     AAC_MUL26((x), (y))
-#define LPC_FIXR(x)         FIXR(x)
-#define LPC_SRA_R(x, y)     (int)(((x) + (1 << ((y) - 1))) >> (y))
+#define AAC_SRA_R(x, y)     (int)(((x) + (1 << ((y) - 1))) >> (y))

 #else

 #define AAC_RENAME(x)       x
+#define AAC_RENAME_32(x)    x
 #define AAC_RENAME2(x)      ff_ ## x
 typedef float               INTFLOAT;
 typedef float               UINTFLOAT;
@@ -111,6 +105,7 @@ typedef unsigned            AAC_SIGNE;
                                               (c) * (d) - (e) * (f))
 #define AAC_MSUB31_V3(x, y, z)    ((x) - (y)) * (z)
 #define AAC_HALF_SUM(x, y)  ((x) + (y)) * 0.5f
+#define AAC_SRA_R(x, y)     (x)

 #endif /* USE_FIXED */

@@ -108,10 +108,10 @@ static av_always_inline float quantize_and_encode_band_cost_template(
        return cost * lambda;
    }
    if (!scaled) {
-        s->aacdsp.abs_pow34(s->scoefs, in, size);
+        s->abs_pow34(s->scoefs, in, size);
        scaled = s->scoefs;
    }
-    s->aacdsp.quant_bands(s->qcoefs, in, scaled, size, !BT_UNSIGNED, aac_cb_maxval[cb], Q34, ROUNDING);
+    s->quant_bands(s->qcoefs, in, scaled, size, !BT_UNSIGNED, aac_cb_maxval[cb], Q34, ROUNDING);
    if (BT_UNSIGNED) {
        off = 0;
    } else {
@@ -311,7 +311,7 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce
    float next_minrd = INFINITY;
    int next_mincb = 0;

-    s->aacdsp.abs_pow34(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
    start = win*128;
    for (cb = 0; cb < CB_TOT_ALL; cb++) {
        path[0][cb].cost     = 0.0f;
@@ -522,7 +522,7 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
        }
    }
    idx = 1;
-    s->aacdsp.abs_pow34(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
    for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
        start = w*128;
        for (g = 0; g < sce->ics.num_swb; g++) {
@@ -668,7 +668,7 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s,

    if (!allz)
        return;
-    s->aacdsp.abs_pow34(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
    ff_quantize_band_cost_cache_init(s);

    for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
@@ -874,8 +874,8 @@ static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChanne
                s->fdsp->vector_fmul_scalar(PNS, PNS, scale, sce->ics.swb_sizes[g]);
                pns_senergy = s->fdsp->scalarproduct_float(PNS, PNS, sce->ics.swb_sizes[g]);
                pns_energy += pns_senergy;
-                s->aacdsp.abs_pow34(NOR34, &sce->coeffs[start_c], sce->ics.swb_sizes[g]);
-                s->aacdsp.abs_pow34(PNS34, PNS, sce->ics.swb_sizes[g]);
+                s->abs_pow34(NOR34, &sce->coeffs[start_c], sce->ics.swb_sizes[g]);
+                s->abs_pow34(PNS34, PNS, sce->ics.swb_sizes[g]);
                dist1 += quantize_band_cost(s, &sce->coeffs[start_c],
                                            NOR34,
                                            sce->ics.swb_sizes[g],
@@ -1012,8 +1012,8 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe)
                        S[i] =  M[i]
                              - sce1->coeffs[start+(w+w2)*128+i];
                    }
-                    s->aacdsp.abs_pow34(M34, M, sce0->ics.swb_sizes[g]);
-                    s->aacdsp.abs_pow34(S34, S, sce0->ics.swb_sizes[g]);
+                    s->abs_pow34(M34, M, sce0->ics.swb_sizes[g]);
+                    s->abs_pow34(S34, S, sce0->ics.swb_sizes[g]);
                    for (i = 0; i < sce0->ics.swb_sizes[g]; i++ ) {
                        Mmax = FFMAX(Mmax, M34[i]);
                        Smax = FFMAX(Smax, S34[i]);
@@ -1056,10 +1056,10 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe)
                                  - sce1->coeffs[start+(w+w2)*128+i];
                        }

-                        s->aacdsp.abs_pow34(L34, sce0->coeffs+start+(w+w2)*128, sce0->ics.swb_sizes[g]);
-                        s->aacdsp.abs_pow34(R34, sce1->coeffs+start+(w+w2)*128, sce0->ics.swb_sizes[g]);
-                        s->aacdsp.abs_pow34(M34, M,                         sce0->ics.swb_sizes[g]);
-                        s->aacdsp.abs_pow34(S34, S,                         sce0->ics.swb_sizes[g]);
+                        s->abs_pow34(L34, sce0->coeffs+start+(w+w2)*128, sce0->ics.swb_sizes[g]);
+                        s->abs_pow34(R34, sce1->coeffs+start+(w+w2)*128, sce0->ics.swb_sizes[g]);
+                        s->abs_pow34(M34, M,                         sce0->ics.swb_sizes[g]);
+                        s->abs_pow34(S34, S,                         sce0->ics.swb_sizes[g]);
                        dist1 += quantize_band_cost(s, &sce0->coeffs[start + (w+w2)*128],
                                                    L34,
                                                    sce0->ics.swb_sizes[g],
@@ -70,7 +70,7 @@ static void codebook_trellis_rate(AACEncContext *s, SingleChannelElement *sce,
    float next_minbits = INFINITY;
    int next_mincb = 0;

-    s->aacdsp.abs_pow34(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
    start = win*128;
    for (cb = 0; cb < CB_TOT_ALL; cb++) {
        path[0][cb].cost     = run_bits+4;
@@ -291,7 +291,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,

    if (!allz)
        return;
-    s->aacdsp.abs_pow34(s->scoefs, sce->coeffs, 1024);
+    s->abs_pow34(s->scoefs, sce->coeffs, 1024);
    ff_quantize_band_cost_cache_init(s);

    for (i = 0; i < sizeof(minsf) / sizeof(minsf[0]); ++i)
@@ -40,11 +40,11 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "get_bits.h"
+#include "lpc.h"
 #include "kbdwin.h"
 #include "sinewin.h"

 #include "aac.h"
-#include "aacdec.h"
 #include "aactab.h"
 #include "aacdectab.h"
 #include "adts_header.h"
@@ -209,7 +209,7 @@ static av_always_inline void predict(PredictorState *ps, float *coef,
 *
 * @param   index   index into coupling gain array
 */
-static void apply_dependent_coupling(AACDecContext *ac,
+static void apply_dependent_coupling(AACContext *ac,
                                     SingleChannelElement *target,
                                     ChannelElement *cce, int index)
 {
@@ -245,7 +245,7 @@ static void apply_dependent_coupling(AACDecContext *ac,
 *
 * @param   index   index into coupling gain array
 */
-static void apply_independent_coupling(AACDecContext *ac,
+static void apply_independent_coupling(AACContext *ac,
                                       SingleChannelElement *target,
                                       ChannelElement *cce, int index)
 {
@@ -262,7 +262,7 @@ static void apply_independent_coupling(AACDecContext *ac,
 #define LOAS_SYNC_WORD   0x2b7       ///< 11 bits LOAS sync word

 struct LATMContext {
-    AACDecContext aac_ctx;  ///< containing AACContext
+    AACContext aac_ctx;     ///< containing AACContext
    int initialized;        ///< initialized after a valid extradata was seen

    // parser data
@@ -281,7 +281,7 @@ static inline uint32_t latm_get_value(GetBitContext *b)
 static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
                                             GetBitContext *gb, int asclen)
 {
-    AACDecContext *ac     = &latmctx->aac_ctx;
+    AACContext *ac        = &latmctx->aac_ctx;
    AVCodecContext *avctx = ac->avctx;
    MPEG4AudioConfig m4ac = { 0 };
    GetBitContext gbc;
@@ -555,7 +555,7 @@ const FFCodec ff_aac_decoder = {
    CODEC_LONG_NAME("AAC (Advanced Audio Coding)"),
    .p.type          = AVMEDIA_TYPE_AUDIO,
    .p.id            = AV_CODEC_ID_AAC,
-    .priv_data_size  = sizeof(AACDecContext),
+    .priv_data_size  = sizeof(AACContext),
    .init            = aac_decode_init,
    .close           = aac_decode_close,
    FF_CODEC_DECODE_CB(aac_decode_frame),
@@ -564,7 +564,8 @@ const FFCodec ff_aac_decoder = {
    },
    .p.capabilities  = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
    .caps_internal   = FF_CODEC_CAP_INIT_CLEANUP,
-    .p.ch_layouts    = ff_aac_ch_layout,
+    CODEC_OLD_CHANNEL_LAYOUTS_ARRAY(aac_channel_layout)
+    .p.ch_layouts    = aac_ch_layout,
    .flush = flush,
    .p.priv_class    = &aac_decoder_class,
    .p.profiles      = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
@@ -589,7 +590,8 @@ const FFCodec ff_aac_latm_decoder = {
    },
    .p.capabilities  = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
    .caps_internal   = FF_CODEC_CAP_INIT_CLEANUP,
-    .p.ch_layouts    = ff_aac_ch_layout,
+    CODEC_OLD_CHANNEL_LAYOUTS_ARRAY(aac_channel_layout)
+    .p.ch_layouts    = aac_ch_layout,
    .flush = flush,
    .p.profiles      = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
 };
@@ -1,279 +0,0 @@
-/*
- * AAC decoder definitions and structures
- * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org )
- * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov 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
- */
-
-/**
- * @file
- * AAC decoder definitions and structures
- * @author Oded Shimon  ( ods15 ods15 dyndns org )
- * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
- */
-
-#ifndef AVCODEC_AACDEC_H
-#define AVCODEC_AACDEC_H
-
-#include <stdint.h>
-
-#include "libavutil/channel_layout.h"
-#include "libavutil/float_dsp.h"
-#include "libavutil/fixed_dsp.h"
-#include "libavutil/mem_internal.h"
-#include "libavutil/tx.h"
-
-#include "aac.h"
-#include "aac_defines.h"
-#include "mpeg4audio.h"
-#include "sbr.h"
-
-/**
- * Output configuration status
- */
-enum OCStatus {
-    OC_NONE,        ///< Output unconfigured
-    OC_TRIAL_PCE,   ///< Output configuration under trial specified by an inband PCE
-    OC_TRIAL_FRAME, ///< Output configuration under trial specified by a frame header
-    OC_GLOBAL_HDR,  ///< Output configuration set in a global header but not yet locked
-    OC_LOCKED,      ///< Output configuration locked in place
-};
-
-enum AACOutputChannelOrder {
-    CHANNEL_ORDER_DEFAULT,
-    CHANNEL_ORDER_CODED,
-};
-
-/**
- * The point during decoding at which channel coupling is applied.
- */
-enum CouplingPoint {
-    BEFORE_TNS,
-    BETWEEN_TNS_AND_IMDCT,
-    AFTER_IMDCT = 3,
-};
-
-/**
- * Long Term Prediction
- */
-typedef struct LongTermPrediction {
-    int8_t present;
-    int16_t lag;
-    INTFLOAT coef;
-    int8_t used[MAX_LTP_LONG_SFB];
-} LongTermPrediction;
-
-/**
- * Individual Channel Stream
- */
-typedef struct IndividualChannelStream {
-    uint8_t max_sfb;            ///< number of scalefactor bands per group
-    enum WindowSequence window_sequence[2];
-    uint8_t use_kb_window[2];   ///< If set, use Kaiser-Bessel window, otherwise use a sine window.
-    int num_window_groups;
-    uint8_t group_len[8];
-    LongTermPrediction ltp;
-    const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window
-    int num_swb;                ///< number of scalefactor window bands
-    int num_windows;
-    int tns_max_bands;
-    int predictor_present;
-    int predictor_initialized;
-    int predictor_reset_group;
-    uint8_t prediction_used[41];
-    uint8_t window_clipping[8]; ///< set if a certain window is near clipping
-} IndividualChannelStream;
-
-/**
- * Temporal Noise Shaping
- */
-typedef struct TemporalNoiseShaping {
-    int present;
-    int n_filt[8];
-    int length[8][4];
-    int direction[8][4];
-    int order[8][4];
-    INTFLOAT coef[8][4][TNS_MAX_ORDER];
-} TemporalNoiseShaping;
-
-/**
- * coupling parameters
- */
-typedef struct ChannelCoupling {
-    enum CouplingPoint coupling_point;  ///< The point during decoding at which coupling is applied.
-    int num_coupled;       ///< number of target elements
-    enum RawDataBlockType type[8];   ///< Type of channel element to be coupled - SCE or CPE.
-    int id_select[8];      ///< element id
-    int ch_select[8];      /**< [0] shared list of gains; [1] list of gains for right channel;
-                            *   [2] list of gains for left channel; [3] lists of gains for both channels
-                            */
-    INTFLOAT gain[16][120];
-} ChannelCoupling;
-
-/**
- * Single Channel Element - used for both SCE and LFE elements.
- */
-typedef struct SingleChannelElement {
-    IndividualChannelStream ics;
-    TemporalNoiseShaping tns;
-    enum BandType band_type[128];                   ///< band types
-    int band_type_run_end[120];                     ///< band type run end points
-    INTFLOAT sf[120];                               ///< scalefactors
-    DECLARE_ALIGNED(32, INTFLOAT, coeffs)[1024];    ///< coefficients for IMDCT, maybe processed
-    DECLARE_ALIGNED(32, INTFLOAT, saved)[1536];     ///< overlap
-    DECLARE_ALIGNED(32, INTFLOAT, ret_buf)[2048];   ///< PCM output buffer
-    DECLARE_ALIGNED(16, INTFLOAT, ltp_state)[3072]; ///< time signal for LTP
-    PredictorState predictor_state[MAX_PREDICTORS];
-    INTFLOAT *ret;                                  ///< PCM output
-} SingleChannelElement;
-
-/**
- * channel element - generic struct for SCE/CPE/CCE/LFE
- */
-typedef struct ChannelElement {
-    int present;
-    // CPE specific
-    uint8_t ms_mask[128];     ///< Set if mid/side stereo is used for each scalefactor window band
-    // shared
-    SingleChannelElement ch[2];
-    // CCE specific
-    ChannelCoupling coup;
-    SpectralBandReplication sbr;
-} ChannelElement;
-
-typedef struct OutputConfiguration {
-    MPEG4AudioConfig m4ac;
-    uint8_t layout_map[MAX_ELEM_ID*4][3];
-    int layout_map_tags;
-    AVChannelLayout ch_layout;
-    enum OCStatus status;
-} OutputConfiguration;
-
-/**
- * Dynamic Range Control - decoded from the bitstream but not processed further.
- */
-typedef struct DynamicRangeControl {
-    int pce_instance_tag;                           ///< Indicates with which program the DRC info is associated.
-    int dyn_rng_sgn[17];                            ///< DRC sign information; 0 - positive, 1 - negative
-    int dyn_rng_ctl[17];                            ///< DRC magnitude information
-    int exclude_mask[MAX_CHANNELS];                 ///< Channels to be excluded from DRC processing.
-    int band_incr;                                  ///< Number of DRC bands greater than 1 having DRC info.
-    int interpolation_scheme;                       ///< Indicates the interpolation scheme used in the SBR QMF domain.
-    int band_top[17];                               ///< Indicates the top of the i-th DRC band in units of 4 spectral lines.
-    int prog_ref_level;                             /**< A reference level for the long-term program audio level for all
-                                                     *   channels combined.
-                                                     */
-} DynamicRangeControl;
-
-/**
- * main AAC decoding context
- */
-typedef struct AACDecContext {
-    const struct AVClass  *class;
-    struct AVCodecContext *avctx;
-    struct AVFrame *frame;
-
-    int is_saved;                 ///< Set if elements have stored overlap from previous frame.
-    DynamicRangeControl che_drc;
-
-    /**
-     * @name Channel element related data
-     * @{
-     */
-    ChannelElement          *che[4][MAX_ELEM_ID];
-    ChannelElement  *tag_che_map[4][MAX_ELEM_ID];
-    int tags_mapped;
-    int warned_remapping_once;
-    /** @} */
-
-    /**
-     * @name temporary aligned temporary buffers
-     * (We do not want to have these on the stack.)
-     * @{
-     */
-    DECLARE_ALIGNED(32, INTFLOAT, buf_mdct)[1024];
-    DECLARE_ALIGNED(32, INTFLOAT, temp)[128];
-    /** @} */
-
-    /**
-     * @name Computed / set up during initialization
-     * @{
-     */
-    AVTXContext *mdct120;
-    AVTXContext *mdct128;
-    AVTXContext *mdct480;
-    AVTXContext *mdct512;
-    AVTXContext *mdct960;
-    AVTXContext *mdct1024;
-    AVTXContext *mdct_ltp;
-
-    av_tx_fn mdct120_fn;
-    av_tx_fn mdct128_fn;
-    av_tx_fn mdct480_fn;
-    av_tx_fn mdct512_fn;
-    av_tx_fn mdct960_fn;
-    av_tx_fn mdct1024_fn;
-    av_tx_fn mdct_ltp_fn;
-#if USE_FIXED
-    AVFixedDSPContext *fdsp;
-#else
-    AVFloatDSPContext *fdsp;
-#endif /* USE_FIXED */
-    int random_state;
-    /** @} */
-
-    /**
-     * @name Members used for output
-     * @{
-     */
-    SingleChannelElement *output_element[MAX_CHANNELS]; ///< Points to each SingleChannelElement
-    /** @} */
-
-
-    /**
-     * @name Japanese DTV specific extension
-     * @{
-     */
-    int force_dmono_mode;///< 0->not dmono, 1->use first channel, 2->use second channel
-    int dmono_mode;      ///< 0->not dmono, 1->use first channel, 2->use second channel
-    /** @} */
-
-    enum AACOutputChannelOrder output_channel_order;
-
-    OutputConfiguration oc[2];
-    int warned_num_aac_frames;
-    int warned_960_sbr;
-    unsigned warned_71_wide;
-    int warned_gain_control;
-    int warned_he_aac_mono;
-
-    /* aacdec functions pointers */
-    void (*imdct_and_windowing)(struct AACDecContext *ac, SingleChannelElement *sce);
-    void (*apply_ltp)(struct AACDecContext *ac, SingleChannelElement *sce);
-    void (*apply_tns)(INTFLOAT coef[1024], TemporalNoiseShaping *tns,
-                      IndividualChannelStream *ics, int decode);
-    void (*windowing_and_mdct_ltp)(struct AACDecContext *ac, INTFLOAT *out,
-                                   INTFLOAT *in, IndividualChannelStream *ics);
-    void (*update_ltp)(struct AACDecContext *ac, SingleChannelElement *sce);
-    void (*vector_pow43)(int *coefs, int len);
-    void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
-} AACDecContext;
-
-void ff_aacdec_init_mips(AACDecContext *c);
-
-#endif /* AVCODEC_AACDEC_H */
@@ -1,307 +0,0 @@
-/*
- * Common code and tables of the AAC fixed- and floating-point decoders
- * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org )
- * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov 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
- */
-
-/**
- * @file
- * Common code and tables of the AAC fixed- and floating-point decoders
- */
-
-#include "aac.h"
-#include "aacdectab.h"
-#include "aacps.h"
-#include "aactab.h"
-#include "vlc.h"
-
-#include "libavutil/attributes.h"
-#include "libavutil/thread.h"
-
-const int8_t ff_tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 5, 5, 16, 5, 0 };
-
-const uint8_t ff_aac_channel_layout_map[16][16][3] = {
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, },
-    { { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
-    { { 0, } },
-    { { 0, } },
-    { { 0, } },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
-    {
-      { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, // SCE1 = FC,
-      { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, // CPE1 = FLc and FRc,
-      { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, // CPE2 = FL and FR,
-      { TYPE_CPE, 2, AAC_CHANNEL_BACK  }, // CPE3 = SiL and SiR,
-      { TYPE_CPE, 3, AAC_CHANNEL_BACK  }, // CPE4 = BL and BR,
-      { TYPE_SCE, 1, AAC_CHANNEL_BACK  }, // SCE2 = BC,
-      { TYPE_LFE, 0, AAC_CHANNEL_LFE   }, // LFE1 = LFE1,
-      { TYPE_LFE, 1, AAC_CHANNEL_LFE   }, // LFE2 = LFE2,
-      { TYPE_SCE, 2, AAC_CHANNEL_FRONT }, // SCE3 = TpFC,
-      { TYPE_CPE, 4, AAC_CHANNEL_FRONT }, // CPE5 = TpFL and TpFR,
-      { TYPE_CPE, 5, AAC_CHANNEL_SIDE  }, // CPE6 = TpSiL and TpSiR,
-      { TYPE_SCE, 3, AAC_CHANNEL_SIDE  }, // SCE4 = TpC,
-      { TYPE_CPE, 6, AAC_CHANNEL_BACK  }, // CPE7 = TpBL and TpBR,
-      { TYPE_SCE, 4, AAC_CHANNEL_BACK  }, // SCE5 = TpBC,
-      { TYPE_SCE, 5, AAC_CHANNEL_FRONT }, // SCE6 = BtFC,
-      { TYPE_CPE, 7, AAC_CHANNEL_FRONT }, // CPE8 = BtFL and BtFR
-    },
-    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, { TYPE_CPE, 2, AAC_CHANNEL_FRONT  }, },
-    { { 0, } },
-};
-
-const int16_t ff_aac_channel_map[3][4][6] = {
-    {
-      { AV_CHAN_FRONT_CENTER,        AV_CHAN_FRONT_LEFT_OF_CENTER, AV_CHAN_FRONT_RIGHT_OF_CENTER, AV_CHAN_FRONT_LEFT,        AV_CHAN_FRONT_RIGHT,        AV_CHAN_NONE },
-      { AV_CHAN_UNUSED,              AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
-      { AV_CHAN_UNUSED,              AV_CHAN_SIDE_LEFT,            AV_CHAN_SIDE_RIGHT,            AV_CHAN_BACK_LEFT,         AV_CHAN_BACK_RIGHT,         AV_CHAN_BACK_CENTER },
-      { AV_CHAN_LOW_FREQUENCY,       AV_CHAN_LOW_FREQUENCY_2,      AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
-    },
-    {
-      { AV_CHAN_TOP_FRONT_CENTER,    AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_TOP_FRONT_LEFT,    AV_CHAN_TOP_FRONT_RIGHT,    AV_CHAN_NONE },
-      { AV_CHAN_UNUSED,              AV_CHAN_TOP_SIDE_LEFT,        AV_CHAN_TOP_SIDE_RIGHT,        AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_TOP_CENTER},
-      { AV_CHAN_UNUSED,              AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_TOP_BACK_LEFT,     AV_CHAN_TOP_BACK_RIGHT,     AV_CHAN_TOP_BACK_CENTER},
-      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE},
-    },
-    {
-      { AV_CHAN_BOTTOM_FRONT_CENTER, AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_BOTTOM_FRONT_LEFT, AV_CHAN_BOTTOM_FRONT_RIGHT, AV_CHAN_NONE },
-      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
-      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
-      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
-    },
-};
-
-const AVChannelLayout ff_aac_ch_layout[] = {
-    AV_CHANNEL_LAYOUT_MONO,
-    AV_CHANNEL_LAYOUT_STEREO,
-    AV_CHANNEL_LAYOUT_SURROUND,
-    AV_CHANNEL_LAYOUT_4POINT0,
-    AV_CHANNEL_LAYOUT_5POINT0_BACK,
-    AV_CHANNEL_LAYOUT_5POINT1_BACK,
-    AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK,
-    AV_CHANNEL_LAYOUT_6POINT1_BACK,
-    AV_CHANNEL_LAYOUT_7POINT1,
-    AV_CHANNEL_LAYOUT_22POINT2,
-    AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK,
-    { 0 },
-};
-
-VLCElem ff_vlc_scalefactors[352];
-const VLCElem *ff_vlc_spectral[11];
-
-/// Huffman tables for SBR
-
-static const uint8_t sbr_huffman_tab[][2] = {
-    /* t_huffman_env_1_5dB - 121 entries */
-    {  60,   2 }, {  59,   2 }, {  61,   3 }, {  58,   3 }, {  62,   4 },
-    {  57,   4 }, {  63,   5 }, {  56,   5 }, {  64,   6 }, {  55,   6 },
-    {  65,   7 }, {  54,   7 }, {  66,   8 }, {  53,   8 }, {  67,   9 },
-    {  52,   9 }, {  51,  10 }, {  68,  10 }, {  50,  11 }, {  69,  12 },
-    {  49,  12 }, {  70,  13 }, {  48,  13 }, {  47,  13 }, {  71,  14 },
-    {  46,  14 }, {  72,  14 }, {  45,  14 }, {  44,  15 }, {  73,  15 },
-    {  41,  16 }, {  42,  16 }, {  43,  16 }, {  74,  16 }, {  36,  16 },
-    {  40,  16 }, {  76,  16 }, {  34,  17 }, {  39,  17 }, {  75,  17 },
-    {  37,  17 }, {  35,  18 }, {  38,  18 }, {   0,  18 }, {   1,  18 },
-    {   2,  18 }, {   3,  18 }, {   4,  18 }, {   5,  18 }, {   6,  19 },
-    {   7,  19 }, {   8,  19 }, {   9,  19 }, {  10,  19 }, {  11,  19 },
-    {  12,  19 }, {  13,  19 }, {  14,  19 }, {  15,  19 }, {  16,  19 },
-    {  17,  19 }, {  18,  19 }, {  19,  19 }, {  20,  19 }, {  21,  19 },
-    {  22,  19 }, {  23,  19 }, {  24,  19 }, {  25,  19 }, {  26,  19 },
-    {  27,  19 }, {  28,  19 }, {  29,  19 }, {  30,  19 }, {  31,  19 },
-    {  32,  19 }, {  33,  19 }, {  77,  19 }, {  78,  19 }, {  79,  19 },
-    {  80,  19 }, {  81,  19 }, {  82,  19 }, {  83,  19 }, {  84,  19 },
-    {  85,  19 }, {  86,  19 }, {  87,  19 }, {  88,  19 }, {  89,  19 },
-    {  90,  19 }, {  91,  19 }, {  92,  19 }, {  93,  19 }, {  94,  19 },
-    {  95,  19 }, {  96,  19 }, {  97,  19 }, {  98,  19 }, {  99,  19 },
-    { 100,  19 }, { 101,  19 }, { 102,  19 }, { 103,  19 }, { 104,  19 },
-    { 105,  19 }, { 106,  19 }, { 107,  19 }, { 108,  19 }, { 109,  19 },
-    { 110,  19 }, { 111,  19 }, { 112,  19 }, { 113,  19 }, { 114,  19 },
-    { 115,  19 }, { 116,  19 }, { 117,  19 }, { 118,  19 }, { 119,  19 },
-    { 120,  19 },
-    /* f_huffman_env_1_5dB - 121 entries */
-    {  60,   2 }, {  59,   2 }, {  61,   3 }, {  58,   3 }, {  57,   4 },
-    {  62,   4 }, {  56,   5 }, {  63,   5 }, {  55,   6 }, {  64,   6 },
-    {  54,   7 }, {  65,   8 }, {  53,   8 }, {  66,   8 }, {  52,   9 },
-    {  67,   9 }, {  51,   9 }, {  68,  10 }, {  50,  10 }, {  69,  11 },
-    {  49,  11 }, {  70,  11 }, {  71,  11 }, {  48,  12 }, {  72,  12 },
-    {  47,  12 }, {  73,  12 }, {  74,  13 }, {  46,  13 }, {  45,  13 },
-    {  75,  13 }, {  76,  14 }, {  77,  14 }, {  44,  14 }, {  43,  15 },
-    {  42,  15 }, {  41,  16 }, {  78,  16 }, {  79,  16 }, {  40,  16 },
-    {  39,  16 }, {  80,  17 }, {  81,  17 }, {  36,  17 }, {  37,  17 },
-    {  38,  17 }, {  34,  17 }, {  32,  18 }, {  82,  18 }, {  83,  18 },
-    {  85,  18 }, {  19,  18 }, {  35,  18 }, {  86,  18 }, {  87,  18 },
-    {  30,  18 }, {  33,  18 }, {  84,  18 }, {  88,  18 }, { 104,  18 },
-    {   9,  19 }, {  14,  19 }, {  16,  19 }, {  17,  19 }, {  23,  19 },
-    {  27,  19 }, {  29,  19 }, {  31,  19 }, {  90,  19 }, {  97,  19 },
-    { 102,  19 }, { 107,  19 }, { 108,  19 }, {   0,  19 }, {   1,  19 },
-    {   2,  20 }, {   3,  20 }, {   4,  20 }, {   5,  20 }, {   6,  20 },
-    {   7,  20 }, {   8,  20 }, {  10,  20 }, {  11,  20 }, {  12,  20 },
-    {  13,  20 }, {  15,  20 }, {  18,  20 }, {  20,  20 }, {  21,  20 },
-    {  22,  20 }, {  24,  20 }, {  25,  20 }, {  26,  20 }, {  28,  20 },
-    {  89,  20 }, {  91,  20 }, {  92,  20 }, {  93,  20 }, {  94,  20 },
-    {  95,  20 }, {  96,  20 }, {  98,  20 }, {  99,  20 }, { 100,  20 },
-    { 101,  20 }, { 103,  20 }, { 105,  20 }, { 106,  20 }, { 109,  20 },
-    { 110,  20 }, { 111,  20 }, { 112,  20 }, { 113,  20 }, { 114,  20 },
-    { 115,  20 }, { 116,  20 }, { 117,  20 }, { 118,  20 }, { 119,  20 },
-    { 120,  20 },
-    /* t_huffman_env_bal_1_5dB - 49 entries */
-    {  24,   1 }, {  25,   2 }, {  23,   3 }, {  26,   4 }, {  22,   5 },
-    {  27,   6 }, {  21,   7 }, {  28,   8 }, {  20,   9 }, {  19,  11 },
-    {  29,  11 }, {  18,  12 }, {  30,  12 }, {  31,  15 }, {  17,  16 },
-    {  32,  16 }, {   0,  16 }, {   1,  16 }, {   2,  16 }, {   3,  16 },
-    {   4,  16 }, {   5,  16 }, {   6,  16 }, {   7,  16 }, {   8,  16 },
-    {   9,  16 }, {  10,  16 }, {  11,  16 }, {  12,  16 }, {  13,  16 },
-    {  14,  16 }, {  15,  16 }, {  16,  16 }, {  33,  16 }, {  34,  16 },
-    {  35,  16 }, {  36,  16 }, {  37,  16 }, {  38,  16 }, {  39,  17 },
-    {  40,  17 }, {  41,  17 }, {  42,  17 }, {  43,  17 }, {  44,  17 },
-    {  45,  17 }, {  46,  17 }, {  47,  17 }, {  48,  17 },
-    /* f_huffman_env_bal_1_5dB - 49 entries */
-    {  24,   1 }, {  23,   2 }, {  25,   3 }, {  22,   4 }, {  26,   5 },
-    {  27,   6 }, {  21,   7 }, {  20,   8 }, {  28,   9 }, {  19,  11 },
-    {  29,  11 }, {  18,  11 }, {  30,  12 }, {  17,  14 }, {  31,  15 },
-    {  32,  16 }, {  15,  16 }, {  16,  17 }, {   0,  18 }, {   1,  18 },
-    {   2,  18 }, {   3,  18 }, {   4,  18 }, {   5,  18 }, {   6,  18 },
-    {   7,  18 }, {   8,  18 }, {   9,  18 }, {  10,  18 }, {  11,  18 },
-    {  12,  18 }, {  13,  18 }, {  14,  18 }, {  33,  18 }, {  34,  18 },
-    {  35,  18 }, {  36,  18 }, {  37,  18 }, {  38,  18 }, {  39,  18 },
-    {  40,  18 }, {  41,  18 }, {  42,  18 }, {  43,  18 }, {  44,  18 },
-    {  45,  18 }, {  46,  18 }, {  47,  19 }, {  48,  19 },
-    /* t_huffman_env_3_0dB - 63 entries */
-    {  31,   1 }, {  30,   2 }, {  32,   3 }, {  29,   4 }, {  33,   5 },
-    {  28,   6 }, {  34,   7 }, {  27,   8 }, {  35,   9 }, {  26,  11 },
-    {  36,  11 }, {  25,  12 }, {  24,  13 }, {  37,  13 }, {  23,  14 },
-    {  38,  14 }, {  22,  14 }, {  21,  14 }, {  39,  14 }, {  40,  15 },
-    {  41,  16 }, {  18,  16 }, {  20,  16 }, {  19,  16 }, {  17,  17 },
-    {  42,  17 }, {  43,  18 }, {   0,  18 }, {   1,  18 }, {   2,  19 },
-    {   3,  19 }, {   4,  19 }, {   5,  19 }, {   6,  19 }, {   7,  19 },
-    {   8,  19 }, {   9,  19 }, {  10,  19 }, {  11,  19 }, {  12,  19 },
-    {  13,  19 }, {  14,  19 }, {  15,  19 }, {  16,  19 }, {  44,  19 },
-    {  45,  19 }, {  46,  19 }, {  47,  19 }, {  48,  19 }, {  49,  19 },
-    {  50,  19 }, {  51,  19 }, {  52,  19 }, {  53,  19 }, {  54,  19 },
-    {  55,  19 }, {  56,  19 }, {  57,  19 }, {  58,  19 }, {  59,  19 },
-    {  60,  19 }, {  61,  19 }, {  62,  19 },
-    /* f_huffman_env_3_0dB - 63 entries */
-    {  31,   1 }, {  30,   2 }, {  32,   3 }, {  29,   4 }, {  33,   5 },
-    {  28,   6 }, {  34,   8 }, {  27,   8 }, {  35,   9 }, {  26,   9 },
-    {  36,  10 }, {  25,  10 }, {  37,  11 }, {  24,  11 }, {  38,  12 },
-    {  23,  12 }, {  39,  13 }, {  40,  14 }, {  22,  14 }, {  21,  15 },
-    {  41,  15 }, {  42,  15 }, {  20,  16 }, {  19,  16 }, {  43,  16 },
-    {  44,  16 }, {  18,  17 }, {  16,  17 }, {  45,  17 }, {  46,  17 },
-    {  17,  18 }, {  49,  18 }, {  13,  18 }, {   7,  18 }, {  12,  18 },
-    {  47,  18 }, {  48,  18 }, {   9,  19 }, {  10,  19 }, {  15,  19 },
-    {  51,  19 }, {  52,  19 }, {  53,  19 }, {  56,  19 }, {   8,  19 },
-    {  11,  19 }, {  55,  19 }, {   0,  20 }, {   1,  20 }, {   2,  20 },
-    {   3,  20 }, {   4,  20 }, {   5,  20 }, {   6,  20 }, {  14,  20 },
-    {  50,  20 }, {  54,  20 }, {  57,  20 }, {  58,  20 }, {  59,  20 },
-    {  60,  20 }, {  61,  20 }, {  62,  20 },
-    /* t_huffman_env_bal_3_0dB - 25 entries */
-    {  12,   1 }, {  13,   2 }, {  11,   3 }, {  10,   4 }, {  14,   5 },
-    {  15,   6 }, {   9,   7 }, {   8,   8 }, {  16,   9 }, {   7,  12 },
-    {   0,  13 }, {   1,  13 }, {   2,  13 }, {   3,  13 }, {   4,  13 },
-    {   5,  13 }, {   6,  13 }, {  17,  13 }, {  18,  13 }, {  19,  13 },
-    {  20,  13 }, {  21,  13 }, {  22,  13 }, {  23,  14 }, {  24,  14 },
-    /* f_huffman_env_bal_3_0dB - 25 entries */
-    {  12,   1 }, {  11,   2 }, {  13,   3 }, {  10,   4 }, {  14,   5 },
-    {  15,   6 }, {   9,   7 }, {   8,   8 }, {  16,   9 }, {   7,  11 },
-    {  17,  12 }, {  18,  13 }, {   0,  13 }, {   1,  13 }, {   2,  13 },
-    {   3,  13 }, {   4,  13 }, {   5,  14 }, {   6,  14 }, {  19,  14 },
-    {  20,  14 }, {  21,  14 }, {  22,  14 }, {  23,  14 }, {  24,  14 },
-    /* t_huffman_noise_3_0dB - 63 entries */
-    {  31,   1 }, {  32,   2 }, {  30,   3 }, {  29,   4 }, {  33,   5 },
-    {  28,   6 }, {  34,   8 }, {  27,   8 }, {  35,  10 }, {  26,  11 },
-    {  36,  13 }, {  42,  13 }, {   0,  13 }, {   1,  13 }, {   2,  13 },
-    {   3,  13 }, {   4,  13 }, {   5,  13 }, {   6,  13 }, {   7,  13 },
-    {   8,  13 }, {   9,  13 }, {  10,  13 }, {  11,  13 }, {  12,  13 },
-    {  13,  13 }, {  14,  13 }, {  15,  13 }, {  16,  13 }, {  17,  13 },
-    {  18,  13 }, {  19,  13 }, {  20,  13 }, {  21,  13 }, {  22,  13 },
-    {  23,  13 }, {  24,  13 }, {  25,  13 }, {  37,  13 }, {  38,  13 },
-    {  39,  13 }, {  40,  13 }, {  41,  13 }, {  43,  13 }, {  44,  13 },
-    {  45,  13 }, {  46,  13 }, {  47,  13 }, {  48,  13 }, {  49,  13 },
-    {  50,  13 }, {  51,  13 }, {  52,  13 }, {  53,  13 }, {  54,  13 },
-    {  55,  13 }, {  56,  13 }, {  57,  13 }, {  58,  13 }, {  59,  13 },
-    {  60,  13 }, {  61,  14 }, {  62,  14 },
-    /* t_huffman_noise_bal_3_0dB - 25 entries */
-    {  12,   1 }, {  11,   2 }, {  13,   3 }, {  10,   5 }, {  14,   6 },
-    {   0,   8 }, {   1,   8 }, {   2,   8 }, {   3,   8 }, {   4,   8 },
-    {   5,   8 }, {   6,   8 }, {   7,   8 }, {   8,   8 }, {   9,   8 },
-    {  15,   8 }, {  16,   8 }, {  17,   8 }, {  18,   8 }, {  19,   8 },
-    {  20,   8 }, {  21,   8 }, {  22,   8 }, {  23,   8 }, {  24,   8 },
-};
-
-static const uint8_t sbr_huffman_nb_codes[] = {
-    121, 121, 49, 49, 63, 63, 25, 25, 63, 25
-};
-
-static const int8_t sbr_vlc_offsets[10] = {
-    -60, -60, -24, -24, -31, -31, -12, -12, -31, -12
-};
-
-const VLCElem *ff_aac_sbr_vlc[10];
-
-static av_cold void aacdec_common_init(void)
-{
-    static VLCElem vlc_buf[(304 + 270 + 550 + 300 + 328 +
-                            294 + 306 + 268 + 510 + 366 + 462) +
-                           (1098 + 1092 + 768 + 1026 + 1058 +
-                            1052 +  544 + 544 +  592 + 512)];
-    VLCInitState state = VLC_INIT_STATE(vlc_buf);
-    const uint8_t (*tab)[2] = sbr_huffman_tab;
-
-    for (unsigned i = 0; i < 11; i++) {
-#define TAB_WRAP_SIZE(name) name[i], sizeof(name[i][0]), sizeof(name[i][0])
-        ff_vlc_spectral[i] =
-            ff_vlc_init_tables_sparse(&state, 8, ff_aac_spectral_sizes[i],
-                                      TAB_WRAP_SIZE(ff_aac_spectral_bits),
-                                      TAB_WRAP_SIZE(ff_aac_spectral_codes),
-                                      TAB_WRAP_SIZE(ff_aac_codebook_vector_idx),
-                                      0);
-    }
-
-    VLC_INIT_STATIC_TABLE(ff_vlc_scalefactors, 7,
-                          FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
-                          ff_aac_scalefactor_bits,
-                          sizeof(ff_aac_scalefactor_bits[0]),
-                          sizeof(ff_aac_scalefactor_bits[0]),
-                          ff_aac_scalefactor_code,
-                          sizeof(ff_aac_scalefactor_code[0]),
-                          sizeof(ff_aac_scalefactor_code[0]), 0);
-
-    // SBR VLC table initialization
-    for (int i = 0; i < FF_ARRAY_ELEMS(ff_aac_sbr_vlc); i++) {
-        ff_aac_sbr_vlc[i] =
-            ff_vlc_init_tables_from_lengths(&state, 9, sbr_huffman_nb_codes[i],
-                                            &tab[0][1], 2,
-                                            &tab[0][0], 2, 1,
-                                            sbr_vlc_offsets[i], 0);
-        tab += sbr_huffman_nb_codes[i];
-    }
-
-    ff_ps_init_common();
-}
-
-av_cold void ff_aacdec_common_init_once(void)
-{
-    static AVOnce init_static_once = AV_ONCE_INIT;
-    ff_thread_once(&init_static_once, aacdec_common_init);
-}
@@ -66,11 +66,11 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "get_bits.h"
+#include "lpc.h"
 #include "kbdwin.h"
 #include "sinewin_fixed_tablegen.h"

 #include "aac.h"
-#include "aacdec.h"
 #include "aactab.h"
 #include "aacdectab.h"
 #include "adts_header.h"
@@ -89,49 +89,6 @@ DECLARE_ALIGNED(32, static int, AAC_RENAME2(aac_kbd_short_128))[128];
 DECLARE_ALIGNED(32, static int, AAC_RENAME2(aac_kbd_long_960))[960];
 DECLARE_ALIGNED(32, static int, AAC_RENAME2(aac_kbd_short_120))[120];

-/* @name ltp_coef
- * Table of the LTP coefficients
- */
-static const int ltp_coef_fixed[8] = {
-    Q30(0.570829), Q30(0.696616), Q30(0.813004), Q30(0.911304),
-    Q30(0.984900), Q30(1.067894), Q30(1.194601), Q30(1.369533),
-};
-
-/* @name tns_tmp2_map
- * Tables of the tmp2[] arrays of LPC coefficients used for TNS.
- * The suffix _M_N[] indicate the values of coef_compress and coef_res
- * respectively.
- * @{
- */
-static const int tns_tmp2_map_1_3[4] = {
-    Q31(0.00000000), Q31(-0.43388373),  Q31(0.64278758),  Q31(0.34202015),
-};
-
-static const int tns_tmp2_map_0_3[8] = {
-    Q31(0.00000000), Q31(-0.43388373), Q31(-0.78183150), Q31(-0.97492790),
-    Q31(0.98480773), Q31( 0.86602539), Q31( 0.64278758), Q31( 0.34202015),
-};
-
-static const int tns_tmp2_map_1_4[8] = {
-    Q31(0.00000000), Q31(-0.20791170), Q31(-0.40673664), Q31(-0.58778524),
-    Q31(0.67369562), Q31( 0.52643216), Q31( 0.36124167), Q31( 0.18374951),
-};
-
-static const int tns_tmp2_map_0_4[16] = {
-    Q31( 0.00000000), Q31(-0.20791170), Q31(-0.40673664), Q31(-0.58778524),
-    Q31(-0.74314481), Q31(-0.86602539), Q31(-0.95105654), Q31(-0.99452192),
-    Q31( 0.99573416), Q31( 0.96182561), Q31( 0.89516330), Q31( 0.79801720),
-    Q31( 0.67369562), Q31( 0.52643216), Q31( 0.36124167), Q31( 0.18374951),
-};
-
-static const int * const tns_tmp2_map_fixed[4] = {
-    tns_tmp2_map_0_3,
-    tns_tmp2_map_0_4,
-    tns_tmp2_map_1_3,
-    tns_tmp2_map_1_4
-};
-// @}
-
 static av_always_inline void reset_predict_state(PredictorState *ps)
 {
    ps->r0.mant   = 0;
@@ -397,7 +354,7 @@ static const int cce_scale_fixed[8] = {
 *
 * @param   index   index into coupling gain array
 */
-static void apply_dependent_coupling_fixed(AACDecContext *ac,
+static void apply_dependent_coupling_fixed(AACContext *ac,
                                     SingleChannelElement *target,
                                     ChannelElement *cce, int index)
 {
@@ -461,7 +418,7 @@ static void apply_dependent_coupling_fixed(AACDecContext *ac,
 *
 * @param   index   index into coupling gain array
 */
-static void apply_independent_coupling_fixed(AACDecContext *ac,
+static void apply_independent_coupling_fixed(AACContext *ac,
                                       SingleChannelElement *target,
                                       ChannelElement *cce, int index)
 {
@@ -499,7 +456,7 @@ const FFCodec ff_aac_fixed_decoder = {
    CODEC_LONG_NAME("AAC (Advanced Audio Coding)"),
    .p.type          = AVMEDIA_TYPE_AUDIO,
    .p.id            = AV_CODEC_ID_AAC,
-    .priv_data_size  = sizeof(AACDecContext),
+    .priv_data_size  = sizeof(AACContext),
    .init            = aac_decode_init,
    .close           = aac_decode_close,
    FF_CODEC_DECODE_CB(aac_decode_frame),
@@ -508,7 +465,8 @@ const FFCodec ff_aac_fixed_decoder = {
    },
    .p.capabilities  = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
    .caps_internal   = FF_CODEC_CAP_INIT_CLEANUP,
-    .p.ch_layouts    = ff_aac_ch_layout,
+    CODEC_OLD_CHANNEL_LAYOUTS_ARRAY(aac_channel_layout)
+    .p.ch_layouts    = aac_ch_layout,
    .p.priv_class    = &aac_decoder_class,
    .p.profiles      = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
    .flush = flush,
@@ -93,9 +93,11 @@
 #include "libavutil/thread.h"
 #include "decode.h"
 #include "internal.h"
-#include "lpc_functions.h"

-static int output_configure(AACDecContext *ac,
+static VLC vlc_scalefactors;
+static VLC vlc_spectral[11];
+
+static int output_configure(AACContext *ac,
                            uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
                            enum OCStatus oc_type, int get_new_frame);

@@ -125,7 +127,7 @@ static int count_channels(uint8_t (*layout)[3], int tags)
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static av_cold int che_configure(AACDecContext *ac,
+static av_cold int che_configure(AACContext *ac,
                                 enum ChannelPosition che_pos,
                                 int type, int id, int *channels)
 {
@@ -161,7 +163,7 @@ static av_cold int che_configure(AACDecContext *ac,

 static int frame_configure_elements(AVCodecContext *avctx)
 {
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    int type, id, ch, ret;

    /* set channel pointers to internal buffers by default */
@@ -281,10 +283,10 @@ static int assign_channels(struct elem_to_channel e2c_vec[MAX_ELEM_ID], uint8_t

    if (pos == AAC_CHANNEL_LFE) {
        while (nb_channels) {
-            if (ff_aac_channel_map[layer][pos - 1][j] == AV_CHAN_NONE)
+            if (aac_channel_map[layer][pos - 1][j] == AV_CHAN_NONE)
                return -1;
            e2c_vec[i] = (struct elem_to_channel) {
-                .av_position  = 1ULL << ff_aac_channel_map[layer][pos - 1][j],
+                .av_position  = 1ULL << aac_channel_map[layer][pos - 1][j],
                .syn_ele      = layout_map[i][0],
                .elem_id      = layout_map[i][1],
                .aac_position = pos
@@ -300,12 +302,12 @@ static int assign_channels(struct elem_to_channel e2c_vec[MAX_ELEM_ID], uint8_t
    }

    while (nb_channels & 1) {
-        if (ff_aac_channel_map[layer][pos - 1][0] == AV_CHAN_NONE)
+        if (aac_channel_map[layer][pos - 1][0] == AV_CHAN_NONE)
            return -1;
-        if (ff_aac_channel_map[layer][pos - 1][0] == AV_CHAN_UNUSED)
+        if (aac_channel_map[layer][pos - 1][0] == AV_CHAN_UNUSED)
            break;
        e2c_vec[i] = (struct elem_to_channel) {
-            .av_position  = 1ULL << ff_aac_channel_map[layer][pos - 1][0],
+            .av_position  = 1ULL << aac_channel_map[layer][pos - 1][0],
            .syn_ele      = layout_map[i][0],
            .elem_id      = layout_map[i][1],
            .aac_position = pos
@@ -317,21 +319,21 @@ static int assign_channels(struct elem_to_channel e2c_vec[MAX_ELEM_ID], uint8_t

    j = (pos != AAC_CHANNEL_SIDE) && nb_channels <= 3 ? 3 : 1;
    while (nb_channels >= 2) {
-        if (ff_aac_channel_map[layer][pos - 1][j]   == AV_CHAN_NONE ||
-            ff_aac_channel_map[layer][pos - 1][j+1] == AV_CHAN_NONE)
+        if (aac_channel_map[layer][pos - 1][j]   == AV_CHAN_NONE ||
+            aac_channel_map[layer][pos - 1][j+1] == AV_CHAN_NONE)
            return -1;
        i += assign_pair(e2c_vec, layout_map, i,
-                         1ULL << ff_aac_channel_map[layer][pos - 1][j],
-                         1ULL << ff_aac_channel_map[layer][pos - 1][j+1],
+                         1ULL << aac_channel_map[layer][pos - 1][j],
+                         1ULL << aac_channel_map[layer][pos - 1][j+1],
                         pos, layout);
        j += 2;
        nb_channels -= 2;
    }
    while (nb_channels & 1) {
-        if (ff_aac_channel_map[layer][pos - 1][5] == AV_CHAN_NONE)
+        if (aac_channel_map[layer][pos - 1][5] == AV_CHAN_NONE)
            return -1;
        e2c_vec[i] = (struct elem_to_channel) {
-            .av_position  = 1ULL << ff_aac_channel_map[layer][pos - 1][5],
+            .av_position  = 1ULL << aac_channel_map[layer][pos - 1][5],
            .syn_ele      = layout_map[i][0],
            .elem_id      = layout_map[i][1],
            .aac_position = pos
@@ -412,8 +414,7 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags)
 /**
 * Save current output configuration if and only if it has been locked.
 */
-static int push_output_configuration(AACDecContext *ac)
-{
+static int push_output_configuration(AACContext *ac) {
    int pushed = 0;

    if (ac->oc[1].status == OC_LOCKED || ac->oc[0].status == OC_NONE) {
@@ -428,8 +429,7 @@ static int push_output_configuration(AACDecContext *ac)
 * Restore the previous output configuration if and only if the current
 * configuration is unlocked.
 */
-static void pop_output_configuration(AACDecContext *ac)
-{
+static void pop_output_configuration(AACContext *ac) {
    if (ac->oc[1].status != OC_LOCKED && ac->oc[0].status != OC_NONE) {
        ac->oc[1] = ac->oc[0];
        ac->avctx->ch_layout = ac->oc[1].ch_layout;
@@ -444,7 +444,7 @@ static void pop_output_configuration(AACDecContext *ac)
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int output_configure(AACDecContext *ac,
+static int output_configure(AACContext *ac,
                            uint8_t layout_map[MAX_ELEM_ID * 4][3], int tags,
                            enum OCStatus oc_type, int get_new_frame)
 {
@@ -454,6 +454,9 @@ static int output_configure(AACDecContext *ac,
    uint8_t id_map[TYPE_END][MAX_ELEM_ID] = {{ 0 }};
    uint8_t type_counts[TYPE_END] = { 0 };

+    if (get_new_frame && !ac->frame)
+        return AVERROR_INVALIDDATA;
+
    if (ac->oc[1].layout_map != layout_map) {
        memcpy(ac->oc[1].layout_map, layout_map, tags * sizeof(layout_map[0]));
        ac->oc[1].layout_map_tags = tags;
@@ -469,6 +472,13 @@ static int output_configure(AACDecContext *ac,
    }
    // Try to sniff a reasonable channel order, otherwise output the
    // channels in the order the PCE declared them.
+#if FF_API_OLD_CHANNEL_LAYOUT
+FF_DISABLE_DEPRECATION_WARNINGS
+    if (avctx->request_channel_layout == AV_CH_LAYOUT_NATIVE)
+        ac->output_channel_order = CHANNEL_ORDER_CODED;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
    if (ac->output_channel_order == CHANNEL_ORDER_DEFAULT)
        layout = sniff_channel_order(layout_map, tags);
    for (i = 0; i < tags; i++) {
@@ -512,7 +522,7 @@ static int output_configure(AACDecContext *ac,

 static void flush(AVCodecContext *avctx)
 {
-    AACDecContext *ac= avctx->priv_data;
+    AACContext *ac= avctx->priv_data;
    int type, i, j;

    for (type = 3; type >= 0; type--) {
@@ -533,7 +543,7 @@ static void flush(AVCodecContext *avctx)
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int set_default_channel_config(AACDecContext *ac, AVCodecContext *avctx,
+static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx,
                                      uint8_t (*layout_map)[3],
                                      int *tags,
                                      int channel_config)
@@ -545,8 +555,8 @@ static int set_default_channel_config(AACDecContext *ac, AVCodecContext *avctx,
               channel_config);
        return AVERROR_INVALIDDATA;
    }
-    *tags = ff_tags_per_config[channel_config];
-    memcpy(layout_map, ff_aac_channel_layout_map[channel_config - 1],
+    *tags = tags_per_config[channel_config];
+    memcpy(layout_map, aac_channel_layout_map[channel_config - 1],
           *tags * sizeof(*layout_map));

    /*
@@ -573,7 +583,7 @@ static int set_default_channel_config(AACDecContext *ac, AVCodecContext *avctx,
    return 0;
 }

-static ChannelElement *get_che(AACDecContext *ac, int type, int elem_id)
+static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
 {
    /* For PCE based channel configurations map the channels solely based
     * on tags. */
@@ -654,7 +664,7 @@ static ChannelElement *get_che(AACDecContext *ac, int type, int elem_id)
         * SCE[0] CPE[0] CPE[1] LFE[0].
         * If we seem to have encountered such a stream, transfer
         * the LFE[0] element to the SCE[1]'s mapping */
-        if (ac->tags_mapped == ff_tags_per_config[ac->oc[1].m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
+        if (ac->tags_mapped == tags_per_config[ac->oc[1].m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
            if (!ac->warned_remapping_once && (type != TYPE_LFE || elem_id != 0)) {
                av_log(ac->avctx, AV_LOG_WARNING,
                   "This stream seems to incorrectly report its last channel as %s[%d], mapping to LFE[0]\n",
@@ -676,7 +686,7 @@ static ChannelElement *get_che(AACDecContext *ac, int type, int elem_id)
         * SCE[0] CPE[0] SCE[1].
         * If we seem to have encountered such a stream, transfer
         * the SCE[1] element to the LFE[0]'s mapping */
-        if (ac->tags_mapped == ff_tags_per_config[ac->oc[1].m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
+        if (ac->tags_mapped == tags_per_config[ac->oc[1].m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
            if (!ac->warned_remapping_once && (type != TYPE_SCE || elem_id != 1)) {
                av_log(ac->avctx, AV_LOG_WARNING,
                   "This stream seems to incorrectly report its last channel as %s[%d], mapping to SCE[1]\n",
@@ -826,12 +836,12 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
 /**
 * Decode GA "General Audio" specific configuration; reference: table 4.1.
 *
- * @param   ac          pointer to AACDecContext, may be null
+ * @param   ac          pointer to AACContext, may be null
 * @param   avctx       pointer to AVCCodecContext, used for logging
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_ga_specific_config(AACDecContext *ac, AVCodecContext *avctx,
+static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
                                     GetBitContext *gb,
                                     int get_bit_alignment,
                                     MPEG4AudioConfig *m4ac,
@@ -912,7 +922,7 @@ static int decode_ga_specific_config(AACDecContext *ac, AVCodecContext *avctx,
    return 0;
 }

-static int decode_eld_specific_config(AACDecContext *ac, AVCodecContext *avctx,
+static int decode_eld_specific_config(AACContext *ac, AVCodecContext *avctx,
                                     GetBitContext *gb,
                                     MPEG4AudioConfig *m4ac,
                                     int channel_config)
@@ -972,7 +982,7 @@ static int decode_eld_specific_config(AACDecContext *ac, AVCodecContext *avctx,
 /**
 * Decode audio specific configuration; reference: table 1.13.
 *
- * @param   ac          pointer to AACDecContext, may be null
+ * @param   ac          pointer to AACContext, may be null
 * @param   avctx       pointer to AVCCodecContext, used for logging
 * @param   m4ac        pointer to MPEG4AudioConfig, used for parsing
 * @param   gb          buffer holding an audio specific config
@@ -981,7 +991,7 @@ static int decode_eld_specific_config(AACDecContext *ac, AVCodecContext *avctx,
 *
 * @return  Returns error status or number of consumed bits. <0 - error
 */
-static int decode_audio_specific_config_gb(AACDecContext *ac,
+static int decode_audio_specific_config_gb(AACContext *ac,
                                           AVCodecContext *avctx,
                                           MPEG4AudioConfig *m4ac,
                                           GetBitContext *gb,
@@ -1048,7 +1058,7 @@ static int decode_audio_specific_config_gb(AACDecContext *ac,
    return get_bits_count(gb);
 }

-static int decode_audio_specific_config(AACDecContext *ac,
+static int decode_audio_specific_config(AACContext *ac,
                                        AVCodecContext *avctx,
                                        MPEG4AudioConfig *m4ac,
                                        const uint8_t *data, int64_t bit_size,
@@ -1117,17 +1127,43 @@ static void reset_predictor_group(PredictorState *ps, int group_num)
        reset_predict_state(&ps[i]);
 }

-static void aacdec_init(AACDecContext *ac);
+static void aacdec_init(AACContext *ac);

 static av_cold void aac_static_table_init(void)
 {
+    static VLCElem vlc_buf[304 + 270 + 550 + 300 + 328 +
+                           294 + 306 + 268 + 510 + 366 + 462];
+    for (unsigned i = 0, offset = 0; i < 11; i++) {
+        vlc_spectral[i].table           = &vlc_buf[offset];
+        vlc_spectral[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset;
+        ff_vlc_init_sparse(&vlc_spectral[i], 8, ff_aac_spectral_sizes[i],
+                           ff_aac_spectral_bits[i],       sizeof(ff_aac_spectral_bits[i][0]),
+                                                          sizeof(ff_aac_spectral_bits[i][0]),
+                           ff_aac_spectral_codes[i],      sizeof(ff_aac_spectral_codes[i][0]),
+                                                          sizeof(ff_aac_spectral_codes[i][0]),
+                           ff_aac_codebook_vector_idx[i], sizeof(ff_aac_codebook_vector_idx[i][0]),
+                                                          sizeof(ff_aac_codebook_vector_idx[i][0]),
+                 VLC_INIT_STATIC_OVERLONG);
+        offset += vlc_spectral[i].table_size;
+    }
+
    AAC_RENAME(ff_aac_sbr_init)();

-    ff_aacdec_common_init_once();
+    ff_aac_tableinit();
+
+    VLC_INIT_STATIC(&vlc_scalefactors, 7,
+                    FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
+                    ff_aac_scalefactor_bits,
+                    sizeof(ff_aac_scalefactor_bits[0]),
+                    sizeof(ff_aac_scalefactor_bits[0]),
+                    ff_aac_scalefactor_code,
+                    sizeof(ff_aac_scalefactor_code[0]),
+                    sizeof(ff_aac_scalefactor_code[0]),
+                    352);

    // window initialization
-    AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960);
-    AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120);
+    AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960);
+    AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120);

 #if !USE_FIXED
    AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960);
@@ -1135,8 +1171,8 @@ static av_cold void aac_static_table_init(void)
    AAC_RENAME(ff_init_ff_sine_windows)(9);
    ff_aac_float_common_init();
 #else
-    AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024);
-    AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128);
+    AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024);
+    AAC_RENAME(avpriv_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128);
    init_sine_windows_fixed();
 #endif

@@ -1148,7 +1184,7 @@ static AVOnce aac_table_init = AV_ONCE_INIT;
 static av_cold int aac_decode_init(AVCodecContext *avctx)
 {
    float scale;
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    int ret;

    if (avctx->sample_rate > 96000)
@@ -1246,7 +1282,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
 /**
 * Skip data_stream_element; reference: table 4.10.
 */
-static int skip_data_stream_element(AACDecContext *ac, GetBitContext *gb)
+static int skip_data_stream_element(AACContext *ac, GetBitContext *gb)
 {
    int byte_align = get_bits1(gb);
    int count = get_bits(gb, 8);
@@ -1263,7 +1299,7 @@ static int skip_data_stream_element(AACDecContext *ac, GetBitContext *gb)
    return 0;
 }

-static int decode_prediction(AACDecContext *ac, IndividualChannelStream *ics,
+static int decode_prediction(AACContext *ac, IndividualChannelStream *ics,
                             GetBitContext *gb)
 {
    int sfb;
@@ -1291,7 +1327,7 @@ static void decode_ltp(LongTermPrediction *ltp,
    int sfb;

    ltp->lag  = get_bits(gb, 11);
-    ltp->coef = AAC_RENAME2(ltp_coef)[get_bits(gb, 3)];
+    ltp->coef = ltp_coef[get_bits(gb, 3)];
    for (sfb = 0; sfb < FFMIN(max_sfb, MAX_LTP_LONG_SFB); sfb++)
        ltp->used[sfb] = get_bits1(gb);
 }
@@ -1299,7 +1335,7 @@ static void decode_ltp(LongTermPrediction *ltp,
 /**
 * Decode Individual Channel Stream info; reference: table 4.6.
 */
-static int decode_ics_info(AACDecContext *ac, IndividualChannelStream *ics,
+static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics,
                           GetBitContext *gb)
 {
    const MPEG4AudioConfig *const m4ac = &ac->oc[1].m4ac;
@@ -1425,7 +1461,7 @@ fail:
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_band_types(AACDecContext *ac, enum BandType band_type[120],
+static int decode_band_types(AACContext *ac, enum BandType band_type[120],
                             int band_type_run_end[120], GetBitContext *gb,
                             IndividualChannelStream *ics)
 {
@@ -1474,7 +1510,7 @@ static int decode_band_types(AACDecContext *ac, enum BandType band_type[120],
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_scalefactors(AACDecContext *ac, INTFLOAT sf[120], GetBitContext *gb,
+static int decode_scalefactors(AACContext *ac, INTFLOAT sf[120], GetBitContext *gb,
                               unsigned int global_gain,
                               IndividualChannelStream *ics,
                               enum BandType band_type[120],
@@ -1493,7 +1529,7 @@ static int decode_scalefactors(AACDecContext *ac, INTFLOAT sf[120], GetBitContex
            } else if ((band_type[idx] == INTENSITY_BT) ||
                       (band_type[idx] == INTENSITY_BT2)) {
                for (; i < run_end; i++, idx++) {
-                    offset[2] += get_vlc2(gb, ff_vlc_scalefactors, 7, 3) - SCALE_DIFF_ZERO;
+                    offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - SCALE_DIFF_ZERO;
                    clipped_offset = av_clip(offset[2], -155, 100);
                    if (offset[2] != clipped_offset) {
                        avpriv_request_sample(ac->avctx,
@@ -1512,7 +1548,7 @@ static int decode_scalefactors(AACDecContext *ac, INTFLOAT sf[120], GetBitContex
                    if (noise_flag-- > 0)
                        offset[1] += get_bits(gb, NOISE_PRE_BITS) - NOISE_PRE;
                    else
-                        offset[1] += get_vlc2(gb, ff_vlc_scalefactors, 7, 3) - SCALE_DIFF_ZERO;
+                        offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - SCALE_DIFF_ZERO;
                    clipped_offset = av_clip(offset[1], -100, 155);
                    if (offset[1] != clipped_offset) {
                        avpriv_request_sample(ac->avctx,
@@ -1528,7 +1564,7 @@ static int decode_scalefactors(AACDecContext *ac, INTFLOAT sf[120], GetBitContex
                }
            } else {
                for (; i < run_end; i++, idx++) {
-                    offset[0] += get_vlc2(gb, ff_vlc_scalefactors, 7, 3) - SCALE_DIFF_ZERO;
+                    offset[0] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - SCALE_DIFF_ZERO;
                    if (offset[0] > 255U) {
                        av_log(ac->avctx, AV_LOG_ERROR,
                               "Scalefactor (%d) out of range.\n", offset[0]);
@@ -1576,7 +1612,7 @@ static int decode_pulses(Pulse *pulse, GetBitContext *gb,
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
+static int decode_tns(AACContext *ac, TemporalNoiseShaping *tns,
                      GetBitContext *gb, const IndividualChannelStream *ics)
 {
    int w, filt, i, coef_len, coef_res, coef_compress;
@@ -1604,7 +1640,7 @@ static int decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
                    tmp2_idx = 2 * coef_compress + coef_res;

                    for (i = 0; i < tns->order[w][filt]; i++)
-                        tns->coef[w][filt][i] = AAC_RENAME2(tns_tmp2_map)[tmp2_idx][get_bits(gb, coef_len)];
+                        tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
                }
            }
        }
@@ -1644,7 +1680,7 @@ static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb,
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_spectrum_and_dequant(AACDecContext *ac, INTFLOAT coef[1024],
+static int decode_spectrum_and_dequant(AACContext *ac, INTFLOAT coef[1024],
                                       GetBitContext *gb, const INTFLOAT sf[120],
                                       int pulse_present, const Pulse *pulse,
                                       const IndividualChannelStream *ics,
@@ -1701,7 +1737,7 @@ static int decode_spectrum_and_dequant(AACDecContext *ac, INTFLOAT coef[1024],
 #if !USE_FIXED
                const float *vq = ff_aac_codebook_vector_vals[cbt_m1];
 #endif /* !USE_FIXED */
-                const VLCElem *vlc_tab = ff_vlc_spectral[cbt_m1];
+                const VLCElem *vlc_tab = vlc_spectral[cbt_m1].table;
                OPEN_READER(re, gb);

                switch (cbt_m1 >> 1) {
@@ -1939,7 +1975,7 @@ static int decode_spectrum_and_dequant(AACDecContext *ac, INTFLOAT coef[1024],
 /**
 * Apply AAC-Main style frequency domain prediction.
 */
-static void apply_prediction(AACDecContext *ac, SingleChannelElement *sce)
+static void apply_prediction(AACContext *ac, SingleChannelElement *sce)
 {
    int sfb, k;

@@ -2002,7 +2038,7 @@ static void decode_gain_control(SingleChannelElement * sce, GetBitContext * gb)
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_ics(AACDecContext *ac, SingleChannelElement *sce,
+static int decode_ics(AACContext *ac, SingleChannelElement *sce,
                      GetBitContext *gb, int common_window, int scale_flag)
 {
    Pulse pulse;
@@ -2093,7 +2129,7 @@ fail:
 /**
 * Mid/Side stereo decoding; reference: 4.6.8.1.3.
 */
-static void apply_mid_side_stereo(AACDecContext *ac, ChannelElement *cpe)
+static void apply_mid_side_stereo(AACContext *ac, ChannelElement *cpe)
 {
    const IndividualChannelStream *ics = &cpe->ch[0].ics;
    INTFLOAT *ch0 = cpe->ch[0].coeffs;
@@ -2131,7 +2167,7 @@ static void apply_mid_side_stereo(AACDecContext *ac, ChannelElement *cpe)
 *                      [1] mask is decoded from bitstream; [2] mask is all 1s;
 *                      [3] reserved for scalable AAC
 */
-static void apply_intensity_stereo(AACDecContext *ac,
+static void apply_intensity_stereo(AACContext *ac,
                                   ChannelElement *cpe, int ms_present)
 {
    const IndividualChannelStream *ics = &cpe->ch[1].ics;
@@ -2181,7 +2217,7 @@ static void apply_intensity_stereo(AACDecContext *ac,
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_cpe(AACDecContext *ac, GetBitContext *gb, ChannelElement *cpe)
+static int decode_cpe(AACContext *ac, GetBitContext *gb, ChannelElement *cpe)
 {
    int i, ret, common_window, ms_present = 0;
    int eld_syntax = ac->oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
@@ -2234,7 +2270,7 @@ static const float cce_scale[] = {
 *
 * @return  Returns error status. 0 - OK, !0 - error
 */
-static int decode_cce(AACDecContext *ac, GetBitContext *gb, ChannelElement *che)
+static int decode_cce(AACContext *ac, GetBitContext *gb, ChannelElement *che)
 {
    int num_gain = 0;
    int c, g, sfb, ret;
@@ -2275,7 +2311,7 @@ static int decode_cce(AACDecContext *ac, GetBitContext *gb, ChannelElement *che)
        INTFLOAT gain_cache = FIXR10(1.);
        if (c) {
            cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb);
-            gain = cge ? get_vlc2(gb, ff_vlc_scalefactors, 7, 3) - 60: 0;
+            gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0;
            gain_cache = GET_GAIN(scale, gain);
 #if USE_FIXED
            if ((abs(gain_cache)-1024) >> 3 > 30)
@@ -2289,7 +2325,7 @@ static int decode_cce(AACDecContext *ac, GetBitContext *gb, ChannelElement *che)
                for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
                    if (sce->band_type[idx] != ZERO_BT) {
                        if (!cge) {
-                            int t = get_vlc2(gb, ff_vlc_scalefactors, 7, 3) - 60;
+                            int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
                            if (t) {
                                int s = 1;
                                t = gain += t;
@@ -2384,7 +2420,7 @@ static int decode_dynamic_range(DynamicRangeControl *che_drc,
    return n;
 }

-static int decode_fill(AACDecContext *ac, GetBitContext *gb, int len) {
+static int decode_fill(AACContext *ac, GetBitContext *gb, int len) {
    uint8_t buf[256];
    int i, major, minor;

@@ -2417,7 +2453,7 @@ unknown:
 *
 * @return Returns number of bytes consumed
 */
-static int decode_extension_payload(AACDecContext *ac, GetBitContext *gb, int cnt,
+static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
                                    ChannelElement *che, enum RawDataBlockType elem_type)
 {
    int crc_flag = 0;
@@ -2510,7 +2546,7 @@ static void apply_tns(INTFLOAT coef_param[1024], TemporalNoiseShaping *tns,
                continue;

            // tns_decode_coef
-            compute_lpc_coefs(tns->coef[w][filt], order, lpc, 0, 0, 0);
+            AAC_RENAME(compute_lpc_coefs)(tns->coef[w][filt], order, lpc, 0, 0, 0);

            start = ics->swb_offset[FFMIN(bottom, mmm)];
            end   = ics->swb_offset[FFMIN(   top, mmm)];
@@ -2547,7 +2583,7 @@ static void apply_tns(INTFLOAT coef_param[1024], TemporalNoiseShaping *tns,
 *  Apply windowing and MDCT to obtain the spectral
 *  coefficient from the predicted sample by LTP.
 */
-static void windowing_and_mdct_ltp(AACDecContext *ac, INTFLOAT *out,
+static void windowing_and_mdct_ltp(AACContext *ac, INTFLOAT *out,
                                   INTFLOAT *in, IndividualChannelStream *ics)
 {
    const INTFLOAT *lwindow      = ics->use_kb_window[0] ? AAC_RENAME2(aac_kbd_long_1024) : AAC_RENAME2(sine_1024);
@@ -2573,7 +2609,7 @@ static void windowing_and_mdct_ltp(AACDecContext *ac, INTFLOAT *out,
 /**
 * Apply the long term prediction
 */
-static void apply_ltp(AACDecContext *ac, SingleChannelElement *sce)
+static void apply_ltp(AACContext *ac, SingleChannelElement *sce)
 {
    const LongTermPrediction *ltp = &sce->ics.ltp;
    const uint16_t *offsets = sce->ics.swb_offset;
@@ -2605,7 +2641,7 @@ static void apply_ltp(AACDecContext *ac, SingleChannelElement *sce)
 /**
 * Update the LTP buffer for next frame
 */
-static void update_ltp(AACDecContext *ac, SingleChannelElement *sce)
+static void update_ltp(AACContext *ac, SingleChannelElement *sce)
 {
    IndividualChannelStream *ics = &sce->ics;
    INTFLOAT *saved     = sce->saved;
@@ -2643,7 +2679,7 @@ static void update_ltp(AACDecContext *ac, SingleChannelElement *sce)
 /**
 * Conduct IMDCT and windowing.
 */
-static void imdct_and_windowing(AACDecContext *ac, SingleChannelElement *sce)
+static void imdct_and_windowing(AACContext *ac, SingleChannelElement *sce)
 {
    IndividualChannelStream *ics = &sce->ics;
    INTFLOAT *in    = sce->coeffs;
@@ -2707,7 +2743,7 @@ static void imdct_and_windowing(AACDecContext *ac, SingleChannelElement *sce)
 /**
 * Conduct IMDCT and windowing.
 */
-static void imdct_and_windowing_960(AACDecContext *ac, SingleChannelElement *sce)
+static void imdct_and_windowing_960(AACContext *ac, SingleChannelElement *sce)
 {
    IndividualChannelStream *ics = &sce->ics;
    INTFLOAT *in    = sce->coeffs;
@@ -2768,7 +2804,7 @@ static void imdct_and_windowing_960(AACDecContext *ac, SingleChannelElement *sce
        memcpy(                      saved,       buf + 480,        480 * sizeof(*saved));
    }
 }
-static void imdct_and_windowing_ld(AACDecContext *ac, SingleChannelElement *sce)
+static void imdct_and_windowing_ld(AACContext *ac, SingleChannelElement *sce)
 {
    IndividualChannelStream *ics = &sce->ics;
    INTFLOAT *in    = sce->coeffs;
@@ -2793,7 +2829,7 @@ static void imdct_and_windowing_ld(AACDecContext *ac, SingleChannelElement *sce)
    memcpy(saved, buf + 256, 256 * sizeof(*saved));
 }

-static void imdct_and_windowing_eld(AACDecContext *ac, SingleChannelElement *sce)
+static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce)
 {
    UINTFLOAT *in   = sce->coeffs;
    INTFLOAT *out   = sce->ret;
@@ -2861,10 +2897,10 @@ static void imdct_and_windowing_eld(AACDecContext *ac, SingleChannelElement *sce
 *
 * @param   apply_coupling_method   pointer to (in)dependent coupling function
 */
-static void apply_channel_coupling(AACDecContext *ac, ChannelElement *cc,
+static void apply_channel_coupling(AACContext *ac, ChannelElement *cc,
                                   enum RawDataBlockType type, int elem_id,
                                   enum CouplingPoint coupling_point,
-                                   void (*apply_coupling_method)(AACDecContext *ac, SingleChannelElement *target, ChannelElement *cce, int index))
+                                   void (*apply_coupling_method)(AACContext *ac, SingleChannelElement *target, ChannelElement *cce, int index))
 {
    int i, c;

@@ -2894,10 +2930,10 @@ static void apply_channel_coupling(AACDecContext *ac, ChannelElement *cc,
 /**
 * Convert spectral data to samples, applying all supported tools as appropriate.
 */
-static void spectral_to_sample(AACDecContext *ac, int samples)
+static void spectral_to_sample(AACContext *ac, int samples)
 {
    int i, type;
-    void (*imdct_and_window)(AACDecContext *ac, SingleChannelElement *sce);
+    void (*imdct_and_window)(AACContext *ac, SingleChannelElement *sce);
    switch (ac->oc[1].m4ac.object_type) {
    case AOT_ER_AAC_LD:
        imdct_and_window = imdct_and_windowing_ld;
@@ -2966,7 +3002,7 @@ static void spectral_to_sample(AACDecContext *ac, int samples)
    }
 }

-static int parse_adts_frame_header(AACDecContext *ac, GetBitContext *gb)
+static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
 {
    int size;
    AACADTSHeaderInfo hdr_info;
@@ -3028,10 +3064,10 @@ static int parse_adts_frame_header(AACDecContext *ac, GetBitContext *gb)
    return size;
 }

-static int aac_decode_er_frame(AVCodecContext *avctx, AVFrame *frame,
+static int aac_decode_er_frame(AVCodecContext *avctx, void *data,
                               int *got_frame_ptr, GetBitContext *gb)
 {
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    const MPEG4AudioConfig *const m4ac = &ac->oc[1].m4ac;
    ChannelElement *che;
    int err, i;
@@ -3042,7 +3078,7 @@ static int aac_decode_er_frame(AVCodecContext *avctx, AVFrame *frame,
    if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD)
        samples >>= 1;

-    ac->frame = frame;
+    ac->frame = data;

    if ((err = frame_configure_elements(avctx)) < 0)
        return err;
@@ -3058,9 +3094,9 @@ static int aac_decode_er_frame(AVCodecContext *avctx, AVFrame *frame,
                              chan_config);
        return AVERROR_INVALIDDATA;
    }
-    for (i = 0; i < ff_tags_per_config[chan_config]; i++) {
-        const int elem_type = ff_aac_channel_layout_map[chan_config-1][i][0];
-        const int elem_id   = ff_aac_channel_layout_map[chan_config-1][i][1];
+    for (i = 0; i < tags_per_config[chan_config]; i++) {
+        const int elem_type = aac_channel_layout_map[chan_config-1][i][0];
+        const int elem_id   = aac_channel_layout_map[chan_config-1][i][1];
        if (!(che=get_che(ac, elem_type, elem_id))) {
            av_log(ac->avctx, AV_LOG_ERROR,
                   "channel element %d.%d is not allocated\n",
@@ -3104,7 +3140,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame,
                                int *got_frame_ptr, GetBitContext *gb,
                                const AVPacket *avpkt)
 {
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    ChannelElement *che = NULL, *che_prev = NULL;
    enum RawDataBlockType elem_type, che_prev_type = TYPE_END;
    int err, elem_id;
@@ -3280,6 +3316,12 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame,
        ac->oc[1].status = OC_LOCKED;
    }

+    if (samples && avctx->sample_rate <= 0) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Cannot output a frame without a valid sample rate\n");
+        return AVERROR_INVALIDDATA;
+    }
+
    if (!ac->frame->data[0] && samples) {
        av_log(avctx, AV_LOG_ERROR, "no frame data found\n");
        err = AVERROR_INVALIDDATA;
@@ -3313,7 +3355,7 @@ fail:
 static int aac_decode_frame(AVCodecContext *avctx, AVFrame *frame,
                            int *got_frame_ptr, AVPacket *avpkt)
 {
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    const uint8_t *buf = avpkt->data;
    int buf_size = avpkt->size;
    GetBitContext gb;
@@ -3375,7 +3417,7 @@ static int aac_decode_frame(AVCodecContext *avctx, AVFrame *frame,

 static av_cold int aac_decode_close(AVCodecContext *avctx)
 {
-    AACDecContext *ac = avctx->priv_data;
+    AACContext *ac = avctx->priv_data;
    int i, type;

    for (i = 0; i < MAX_ELEM_ID; i++) {
@@ -3398,7 +3440,7 @@ static av_cold int aac_decode_close(AVCodecContext *avctx)
    return 0;
 }

-static void aacdec_init(AACDecContext *c)
+static void aacdec_init(AACContext *c)
 {
    c->imdct_and_windowing                      = imdct_and_windowing;
    c->apply_ltp                                = apply_ltp;
@@ -3420,24 +3462,23 @@ static void aacdec_init(AACDecContext *c)
 * AVOptions for Japanese DTV specific extensions (ADTS only)
 */
 #define AACDEC_FLAGS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
-#define OFF(field) offsetof(AACDecContext, field)
 static const AVOption options[] = {
    {"dual_mono_mode", "Select the channel to decode for dual mono",
-     OFF(force_dmono_mode), AV_OPT_TYPE_INT, {.i64=-1}, -1, 2,
-     AACDEC_FLAGS, .unit = "dual_mono_mode"},
+     offsetof(AACContext, force_dmono_mode), AV_OPT_TYPE_INT, {.i64=-1}, -1, 2,
+     AACDEC_FLAGS, "dual_mono_mode"},

-    {"auto", "autoselection",            0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, AACDEC_FLAGS, .unit = "dual_mono_mode"},
-    {"main", "Select Main/Left channel", 0, AV_OPT_TYPE_CONST, {.i64= 1}, INT_MIN, INT_MAX, AACDEC_FLAGS, .unit = "dual_mono_mode"},
-    {"sub" , "Select Sub/Right channel", 0, AV_OPT_TYPE_CONST, {.i64= 2}, INT_MIN, INT_MAX, AACDEC_FLAGS, .unit = "dual_mono_mode"},
-    {"both", "Select both channels",     0, AV_OPT_TYPE_CONST, {.i64= 0}, INT_MIN, INT_MAX, AACDEC_FLAGS, .unit = "dual_mono_mode"},
+    {"auto", "autoselection",            0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"main", "Select Main/Left channel", 0, AV_OPT_TYPE_CONST, {.i64= 1}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"sub" , "Select Sub/Right channel", 0, AV_OPT_TYPE_CONST, {.i64= 2}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"both", "Select both channels",     0, AV_OPT_TYPE_CONST, {.i64= 0}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},

    { "channel_order", "Order in which the channels are to be exported",
-        OFF(output_channel_order), AV_OPT_TYPE_INT,
-        { .i64 = CHANNEL_ORDER_DEFAULT }, 0, 1, AACDEC_FLAGS, .unit = "channel_order" },
+        offsetof(AACContext, output_channel_order), AV_OPT_TYPE_INT,
+        { .i64 = CHANNEL_ORDER_DEFAULT }, 0, 1, AACDEC_FLAGS, "channel_order" },
      { "default", "normal libavcodec channel order", 0, AV_OPT_TYPE_CONST,
-        { .i64 = CHANNEL_ORDER_DEFAULT }, .flags = AACDEC_FLAGS, .unit = "channel_order" },
+        { .i64 = CHANNEL_ORDER_DEFAULT }, .flags = AACDEC_FLAGS, "channel_order" },
      { "coded",    "order in which the channels are coded in the bitstream",
-        0, AV_OPT_TYPE_CONST, { .i64 = CHANNEL_ORDER_CODED }, .flags = AACDEC_FLAGS, .unit = "channel_order" },
+        0, AV_OPT_TYPE_CONST, { .i64 = CHANNEL_ORDER_CODED }, .flags = AACDEC_FLAGS, "channel_order" },

    {NULL},
 };
@@ -1,5 +1,7 @@
 /*
 * AAC decoder data
+ * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org )
+ * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com )
 *
 * This file is part of FFmpeg.
 *
@@ -28,28 +30,99 @@
 #ifndef AVCODEC_AACDECTAB_H
 #define AVCODEC_AACDECTAB_H

+#include "libavutil/channel_layout.h"
+#include "aac.h"
+
 #include <stdint.h>

-#include "vlc.h"
+static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 5, 5, 16, 5, 0 };

-#include "libavutil/attributes_internal.h"
-#include "libavutil/channel_layout.h"
+static const uint8_t aac_channel_layout_map[16][16][3] = {
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, },
+    { { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
+    { { 0, } },
+    { { 0, } },
+    { { 0, } },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_SCE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_CPE, 2, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE  }, },
+    {
+      { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, // SCE1 = FC,
+      { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, // CPE1 = FLc and FRc,
+      { TYPE_CPE, 1, AAC_CHANNEL_FRONT }, // CPE2 = FL and FR,
+      { TYPE_CPE, 2, AAC_CHANNEL_BACK  }, // CPE3 = SiL and SiR,
+      { TYPE_CPE, 3, AAC_CHANNEL_BACK  }, // CPE4 = BL and BR,
+      { TYPE_SCE, 1, AAC_CHANNEL_BACK  }, // SCE2 = BC,
+      { TYPE_LFE, 0, AAC_CHANNEL_LFE   }, // LFE1 = LFE1,
+      { TYPE_LFE, 1, AAC_CHANNEL_LFE   }, // LFE2 = LFE2,
+      { TYPE_SCE, 2, AAC_CHANNEL_FRONT }, // SCE3 = TpFC,
+      { TYPE_CPE, 4, AAC_CHANNEL_FRONT }, // CPE5 = TpFL and TpFR,
+      { TYPE_CPE, 5, AAC_CHANNEL_SIDE  }, // CPE6 = TpSiL and TpSiR,
+      { TYPE_SCE, 3, AAC_CHANNEL_SIDE  }, // SCE4 = TpC,
+      { TYPE_CPE, 6, AAC_CHANNEL_BACK  }, // CPE7 = TpBL and TpBR,
+      { TYPE_SCE, 4, AAC_CHANNEL_BACK  }, // SCE5 = TpBC,
+      { TYPE_SCE, 5, AAC_CHANNEL_FRONT }, // SCE6 = BtFC,
+      { TYPE_CPE, 7, AAC_CHANNEL_FRONT }, // CPE8 = BtFL and BtFR
+    },
+    { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 0, AAC_CHANNEL_FRONT }, { TYPE_CPE, 1, AAC_CHANNEL_BACK }, { TYPE_LFE, 0, AAC_CHANNEL_LFE }, { TYPE_CPE, 2, AAC_CHANNEL_FRONT  }, },
+    { { 0, } },
+};

-FF_VISIBILITY_PUSH_HIDDEN
-void ff_aacdec_common_init_once(void);
+static const int16_t aac_channel_map[3][4][6] = {
+    {
+      { AV_CHAN_FRONT_CENTER,        AV_CHAN_FRONT_LEFT_OF_CENTER, AV_CHAN_FRONT_RIGHT_OF_CENTER, AV_CHAN_FRONT_LEFT,        AV_CHAN_FRONT_RIGHT,        AV_CHAN_NONE },
+      { AV_CHAN_UNUSED,              AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
+      { AV_CHAN_UNUSED,              AV_CHAN_SIDE_LEFT,            AV_CHAN_SIDE_RIGHT,            AV_CHAN_BACK_LEFT,         AV_CHAN_BACK_RIGHT,         AV_CHAN_BACK_CENTER },
+      { AV_CHAN_LOW_FREQUENCY,       AV_CHAN_LOW_FREQUENCY_2,      AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
+    },
+    {
+      { AV_CHAN_TOP_FRONT_CENTER,    AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_TOP_FRONT_LEFT,    AV_CHAN_TOP_FRONT_RIGHT,    AV_CHAN_NONE },
+      { AV_CHAN_UNUSED,              AV_CHAN_TOP_SIDE_LEFT,        AV_CHAN_TOP_SIDE_RIGHT,        AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_TOP_CENTER},
+      { AV_CHAN_UNUSED,              AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_TOP_BACK_LEFT,     AV_CHAN_TOP_BACK_RIGHT,     AV_CHAN_TOP_BACK_CENTER},
+      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE},
+    },
+    {
+      { AV_CHAN_BOTTOM_FRONT_CENTER, AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_BOTTOM_FRONT_LEFT, AV_CHAN_BOTTOM_FRONT_RIGHT, AV_CHAN_NONE },
+      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
+      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
+      { AV_CHAN_NONE,                AV_CHAN_NONE,                 AV_CHAN_NONE,                  AV_CHAN_NONE,              AV_CHAN_NONE,               AV_CHAN_NONE },
+    },
+};

-extern const VLCElem *ff_aac_sbr_vlc[10];
+#if FF_API_OLD_CHANNEL_LAYOUT
+static const uint64_t aac_channel_layout[] = {
+    AV_CH_LAYOUT_MONO,
+    AV_CH_LAYOUT_STEREO,
+    AV_CH_LAYOUT_SURROUND,
+    AV_CH_LAYOUT_4POINT0,
+    AV_CH_LAYOUT_5POINT0_BACK,
+    AV_CH_LAYOUT_5POINT1_BACK,
+    AV_CH_LAYOUT_7POINT1_WIDE_BACK,
+    AV_CH_LAYOUT_6POINT1_BACK,
+    AV_CH_LAYOUT_7POINT1,
+    AV_CH_LAYOUT_22POINT2,
+    AV_CH_LAYOUT_7POINT1_TOP_BACK,
+    0,
+};
+#endif

-extern VLCElem ff_vlc_scalefactors[];
-extern const VLCElem *ff_vlc_spectral[11];
-
-extern const int8_t ff_tags_per_config[16];
-
-extern const uint8_t ff_aac_channel_layout_map[16][16][3];
-
-extern const int16_t ff_aac_channel_map[3][4][6];
-
-extern const AVChannelLayout ff_aac_ch_layout[];
-FF_VISIBILITY_POP_HIDDEN
+static const AVChannelLayout aac_ch_layout[] = {
+    AV_CHANNEL_LAYOUT_MONO,
+    AV_CHANNEL_LAYOUT_STEREO,
+    AV_CHANNEL_LAYOUT_SURROUND,
+    AV_CHANNEL_LAYOUT_4POINT0,
+    AV_CHANNEL_LAYOUT_5POINT0_BACK,
+    AV_CHANNEL_LAYOUT_5POINT1_BACK,
+    AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK,
+    AV_CHANNEL_LAYOUT_6POINT1_BACK,
+    AV_CHANNEL_LAYOUT_7POINT1,
+    AV_CHANNEL_LAYOUT_22POINT2,
+    AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK,
+    { 0 },
+};

 #endif /* AVCODEC_AACDECTAB_H */
@@ -1210,6 +1210,9 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
    if (!s->fdsp)
        return AVERROR(ENOMEM);

+    // window init
+    ff_aac_float_common_init();
+
    if ((ret = av_tx_init(&s->mdct1024, &s->mdct1024_fn, AV_TX_FLOAT_MDCT, 0,
                          1024, &scale, 0)) < 0)
        return ret;
@@ -1356,9 +1359,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
    if (s->channels > 3)
        s->options.mid_side = 0;

-    // Initialize static tables
-    ff_aac_float_common_init();
-
    if ((ret = dsp_init(avctx, s)) < 0)
        return ret;

@@ -1381,19 +1381,29 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
    ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
    s->random_state = 0x1f2e3d4c;

-    ff_aacenc_dsp_init(&s->aacdsp);
+    s->abs_pow34   = abs_pow34_v;
+    s->quant_bands = quantize_bands;
+
+#if ARCH_X86
+    ff_aac_dsp_init_x86(s);
+#endif
+
+#if HAVE_MIPSDSP
+    ff_aac_coder_init_mips(s);
+#endif

    ff_af_queue_init(avctx, &s->afq);
+    ff_aac_tableinit();

    return 0;
 }

 #define AACENC_FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
 static const AVOption aacenc_options[] = {
-    {"aac_coder", "Coding algorithm", offsetof(AACEncContext, options.coder), AV_OPT_TYPE_INT, {.i64 = AAC_CODER_TWOLOOP}, 0, AAC_CODER_NB-1, AACENC_FLAGS, .unit = "coder"},
-        {"anmr",     "ANMR method",               0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_ANMR},    INT_MIN, INT_MAX, AACENC_FLAGS, .unit = "coder"},
-        {"twoloop",  "Two loop searching method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_TWOLOOP}, INT_MIN, INT_MAX, AACENC_FLAGS, .unit = "coder"},
-        {"fast",     "Default fast search",       0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_FAST},    INT_MIN, INT_MAX, AACENC_FLAGS, .unit = "coder"},
+    {"aac_coder", "Coding algorithm", offsetof(AACEncContext, options.coder), AV_OPT_TYPE_INT, {.i64 = AAC_CODER_TWOLOOP}, 0, AAC_CODER_NB-1, AACENC_FLAGS, "coder"},
+        {"anmr",     "ANMR method",               0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_ANMR},    INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
+        {"twoloop",  "Two loop searching method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_TWOLOOP}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
+        {"fast",     "Default fast search",       0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_FAST},    INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
    {"aac_ms", "Force M/S stereo coding", offsetof(AACEncContext, options.mid_side), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AACENC_FLAGS},
    {"aac_is", "Intensity stereo coding", offsetof(AACEncContext, options.intensity_stereo), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
    {"aac_pns", "Perceptual noise substitution", offsetof(AACEncContext, options.pns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1.git
 .1.6