configure: Use MSYSTEM_CARCH for default arch on msys2

On msys2, `uname -m` returns the architecture of the base msys2
layer. On Windows on arm64, the base msys2 layer itself is still
x86_64 only, even if running with e.g. the clangarm64 where the
windows native applications are built as aarch64.

If MSYSTEM_CARCH is set, use this instead of `uname -m` for
the default architecture. This gives the correct behaviour
for the clangarm64 environments. It also gives the correct
default for the 32 bit x86 environments such as `mingw32`.

(On `mingw32`, the fact that `uname -m` returned `x86_64`
hasn't been an issue, as both that and `i686` gets normalized
into `x86` internally in ffmpeg's configure.)

Signed-off-by: Coia Prant <coiaprant@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit df967d095a)

.forgejo/CODEOWNERS

@@ -1,96 +0,0 @@
-# This file describes the expected reviewers for a PR based on the changed
-# files. Unlike what the name of the file suggests they don't own the code, but
-# merely have a good understanding of that area of the codebase and therefore
-# are usually suited as a reviewer.
-
-# Lines in this file match changed paths via Go-Style regular expressions:
-# https://pkg.go.dev/regexp/syntax
-
-# Mind the alphabetical order
-
-# avcodec
-# =======
-libavcodec/.*aac.* @lynne
-libavcodec/.*ac3.* @lynne
-libavcodec/.*atrac9.* @lynne
-libavcodec/.*bitpacked.* @lynne
-libavcodec/.*d3d12va.* @jianhuaw
-libavcodec/.*dirac.* @lynne
-libavcodec/.*ffv1.* @lynne @michaelni
-libavcodec/golomb.* @michaelni
-libavcodec/.*h266.* @frankplow @NuoMi @jianhuaw
-libavcodec/h26x/.* @frankplow @NuoMi @jianhuaw
-libavcodec/.*jpegxl.* @lynne @Traneptora
-libavcodec/.*jxl.* @lynne @Traneptora
-libavcodec/.*opus.* @lynne
-libavcodec/.*png.* @Traneptora
-libavcodec/.*prores.* @lynne
-libavcodec/rangecoder.* @michaelni
-libavcodec/ratecontrol.* @michaelni
-libavcodec/.*siren.* @lynne
-libavcodec/.*vc2.* @lynne
-libavcodec/.*vvc.* @frankplow @NuoMi @jianhuaw
-
-libavcodec/aarch64/.* @lynne @mstorsjo
-libavcodec/arm/.* @mstorsjo
-libavcodec/ppc/.* @sean_mcg
-libavcodec/x86/.* @lynne
-
-# avfilter
-# =======
-libavfilter/aarch64/.* @mstorsjo
-libavfilter/af_whisper.* @vpalmisano
-libavfilter/vf_yadif.* @michaelni
-libavfilter/vsrc_mandelbrot.* @michaelni
-
-# avformat
-# =======
-libavformat/iamf.* @jamrial
-libavformat/.*jpegxl.* @Traneptora
-libavformat/.*jxl.* @Traneptora
-
-# avutil
-# ======
-libavutil/.*crc.* @lynne @michaelni
-libavutil/.*d3d12va.* @jianhuaw
-libavutil/eval.* @michaelni
-libavutil/iamf.* @jamrial
-libavutil/integer.* @michaelni
-libavutil/lfg.* @michaelni
-libavutil/lls.* @michaelni
-libavutil/md5.* @michaelni
-libavutil/mathematics.* @michaelni
-libavutil/mem.* @michaelni
-libavutil/qsort.* @michaelni
-libavutil/random_seed.* @michaelni
-libavutil/rational.* @michaelni
-libavutil/sfc.* @michaelni
-libavutil/softfloat.* @michaelni
-libavutil/tree.* @michaelni
-libavutil/tx.* @lynne
-
-libavutil/aarch64/.* @lynne @mstorsjo
-libavutil/arm/.* @mstorsjo
-libavutil/ppc/.* @sean_mcg
-libavutil/x86/.* @lynne
-
-# swresample
-# =======
-libswresample/aarch64/.* @mstorsjo
-libswresample/arm/.* @mstorsjo
-libswresample/.* @michaelni
-
-# swscale
-# =======
-libswscale/aarch64/.* @mstorsjo
-libswscale/arm/.* @mstorsjo
-libswscale/ppc/.* @sean_mcg
-
-# doc
-# ===
-doc/.* @GyanD
-
-# Frameworks
-# ==========
-.*d3d12va.* @jianhuaw
-.*vulkan.* @lynne

.forgejo/ISSUE_TEMPLATE.md

@@ -1,9 +0,0 @@
-# Summary of the bug
-
-Briefly describe the issue you're experiencing. Include any error messages, unexpected behavior, or relevant observations.
-
-# Steps to reproduce
-
-List the steps required to trigger the bug.
-Include the exact CLI command used, if any.
-Provide sample input files, logs, or scripts if available.

.forgejo/labeler/labeler.js

@@ -1,72 +0,0 @@
-module.exports = async ({github, context}) => {
-    const title = (context.payload.pull_request?.title || context.payload.issue?.title || '').toLowerCase();
-    const labels = [];
-    const issueNumber = context.payload.pull_request?.number || context.payload.issue?.number;
-
-    const kwmap = {
-      'avcodec': 'avcodec',
-      'avdevice': 'avdevice',
-      'avfilter': 'avfilter',
-      'avformat': 'avformat',
-      'avutil': 'avutil',
-      'swresample': 'swresample',
-      'swscale': 'swscale',
-      'fftools': 'CLI'
-    };
-
-    async function isOrgMember(username) {
-        try {
-            const response = await github.rest.orgs.checkMembershipForUser({
-                org: context.repo.owner,
-                username: username
-            });
-            return response.status === 204;
-        } catch (error) {
-            return false;
-        }
-    }
-
-    if (context.payload.action === 'closed' ||
-        (context.payload.action !== 'opened' && (
-             context.payload.action === 'assigned' ||
-             context.payload.action === 'label_updated' ||
-             context.payload.comment) &&
-         await isOrgMember(context.payload.sender.login))
-    ) {
-        try {
-            await github.rest.issues.removeLabel({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                // this should say 'new', but forgejo deviates from GitHub API here and expects the ID
-                name: '41'
-            });
-            console.log('Removed "new" label');
-        } catch (error) {
-            if (error.status !== 404 && error.status !== 410) {
-                console.log('Could not remove "new" label');
-            }
-        }
-    } else if (context.payload.action === 'opened') {
-        labels.push('new');
-        console.log('Detected label: new');
-    }
-
-    if ((context.payload.action === 'opened' || context.payload.action === 'edited') && context.eventName !== 'issue_comment') {
-        for (const [kw, label] of Object.entries(kwmap)) {
-            if (title.includes(kw)) {
-                labels.push(label);
-                console.log('Detected label: ' + label);
-            }
-        }
-    }
-
-    if (labels.length > 0) {
-        await github.rest.issues.addLabels({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            issue_number: issueNumber,
-            labels: labels,
-        });
-    }
-}

.forgejo/labeler/labeler.yml

@@ -1,31 +0,0 @@
-avcodec:
-  - changed-files:
-    - any-glob-to-any-file: libavcodec/**
-
-avdevice:
-  - changed-files:
-    - any-glob-to-any-file: libavdevice/**
-
-avfilter:
-  - changed-files:
-    - any-glob-to-any-file: libavfilter/**
-
-avformat:
-  - changed-files:
-    - any-glob-to-any-file: libavformat/**
-
-avutil:
-  - changed-files:
-    - any-glob-to-any-file: libavutil/**
-
-swresample:
-  - changed-files:
-    - any-glob-to-any-file: libswresample/**
-
-swscale:
-  - changed-files:
-    - any-glob-to-any-file: libswscale/**
-
-CLI:
-  - changed-files:
-    - any-glob-to-any-file: fftools/**

.forgejo/pre-commit/config.yaml

@@ -1,28 +0,0 @@
-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: file-contents-sorter
-      files:
-        .forgejo/pre-commit/ignored-words.txt
-      args:
-        - --ignore-case
-    - id: fix-byte-order-marker
-    - id: mixed-line-ending
-    - id: trailing-whitespace
-- repo: https://github.com/codespell-project/codespell
-  rev: v2.4.1
-  hooks:
-    - id: codespell
-      args:
-        - --ignore-words=.forgejo/pre-commit/ignored-words.txt
-        - --ignore-multiline-regex=codespell:off.*?(codespell:on|\Z)
-      exclude: ^tools/(patcheck|clean-diff)$

.forgejo/pre-commit/ignored-words.txt

@@ -1,119 +0,0 @@
-abl
-ACN
-acount
-addin
-alis
-alls
-ALOG
-ALS
-als
-ANC
-anc
-ANS
-ans
-anull
-basf
-bloc
-brane
-BREIF
-BU
-bu
-bufer
-CAF
-caf
-clen
-clens
-Collet
-compre
-dum
-endin
-erro
-FIEL
-fiel
-filp
-fils
-FILTERD
-filterd
-fle
-fo
-FPR
-fro
-Hald
-indx
-ine
-inh
-inout
-inouts
-inport
-ist
-LAF
-laf
-lastr
-LinS
-mapp
-mis
-mot
-nd
-nIn
-offsetp
-orderd
-ot
-outout
-padd
-PAETH
-paeth
-PARM
-parm
-parms
-pEvents
-PixelX
-Psot
-quater
-readd
-recuse
-redY
-Reencode
-reencode
-remaind
-renderD
-rin
-SAV
-SEH
-SER
-ser
-setts
-shft
-SIZ
-siz
-skipd
-sme
-som
-sover
-STAP
-startd
-statics
-struc
-suble
-TE
-tE
-te
-tha
-tne
-tolen
-tpye
-tre
-TRUN
-trun
-truns
-Tung
-TYE
-ue
-UES
-ues
-vai
-vas
-vie
-VILL
-vor
-wel
-wih

.forgejo/workflows/autolabel.yml

@@ -1,28 +0,0 @@
-on:
-  pull_request_target:
-    types: [opened, edited, synchronize, closed, assigned, labeled, unlabeled]
-  issues:
-    types: [opened, edited, closed, assigned, labeled, unlabeled]
-  issue_comment:
-    types: [created]
-
-jobs:
-  pr_labeler:
-    runs-on: utilities
-    if: ${{ github.event.sender.login != 'ffmpeg-devel' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Label by file-changes
-        uses: https://github.com/actions/labeler@v5
-        if: ${{ forge.event_name == 'pull_request_target' }}
-        with:
-          configuration-path: .forgejo/labeler/labeler.yml
-          repo-token: ${{ secrets.AUTOLABELER_TOKEN }}
-      - name: Label by title-match
-        uses: https://github.com/actions/github-script@v7
-        with:
-          script: |
-            const script = require('.forgejo/labeler/labeler.js')
-            await script({github, context})
-          github-token: ${{ secrets.AUTOLABELER_TOKEN }}

.forgejo/workflows/lint.yml

@@ -1,26 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  lint:
-    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

.forgejo/workflows/test.yml

@@ -1,59 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  run_fate:
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [linux-amd64,linux-aarch64]
-    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
-      - 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 | 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: make fate SAMPLES=$PWD/fate-suite -j$(nproc)
-  compile_only:
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ["ghcr.io/btbn/ffmpeg-builds/win64-gpl: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)

.gitattributes

@@ -1,2 +1,2 @@
 *.pnm -diff -text
-Changelog    merge=union
+tests/ref/fate/sub-scc eol=crlf

.gitignore

@@ -1,6 +1,5 @@
 *.a
 *.o
-*.objs
 *.o.*
 *.d
 *.def
@@ -42,7 +41,3 @@
 /src
 /mapfile
 /tools/python/__pycache__/
-/libavcodec/vulkan/*.c
-/libavfilter/vulkan/*.c
-/.*/
-!/.forgejo/

.mailmap

@@ -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,14 +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>
-<wutong1208@outlook.com> <tong1.wu-at-intel.com@ffmpeg.org>
-<wutong1208@outlook.com> <tong1.wu@intel.com>
-<toqsxw@outlook.com> <jianhua.wu-at-intel.com@ffmpeg.org>
-<toqsxw@outlook.com> <jianhua.wu@intel.com>

.travis.yml

@@ -0,0 +1,30 @@
+language: c
+sudo: false
+os:
+  - linux
+  - osx
+addons:
+  apt:
+    packages:
+      - nasm
+      - diffutils
+compiler:
+  - clang
+  - gcc
+matrix:
+    exclude:
+        - os: osx
+          compiler: gcc
+cache:
+  directories:
+    - ffmpeg-samples
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
+install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
+script:
+  - mkdir -p ffmpeg-samples
+  - ./configure --samples=ffmpeg-samples --cc=$CC
+  - make -j 8
+  - make fate-rsync
+  - make check -j 8

COPYING.LGPLv2.1

@@ -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

Changelog

@@ -1,175 +1,275 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
-version <next>:
+version 6.0.2:
+ fate/subtitles: Ignore line endings for sub-scc test
+ avformat/mxfdec: Check index_edit_rate
+ swscale/utils: Fix xInc overflow
+ avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()
+ avcodec/exr: Dont use 64bits to hold 6bits
+ avcodec/exr: Check for remaining bits in huf_unpack_enc_table()
+ avformat/mpegts: Reset local nb_prg on add_program() failure
+ avformat/aiffdec: Check for previously set channels
+ avformat/mxfdec: Make edit_unit_byte_count unsigned
+ avformat/movenc: Check that cts fits in 32bit
+ avformat/mxfdec: Check first case of offset_temp computation for overflow
+ avfilter/vf_signature: Dont crash on no frames
+ avformat/westwood_vqa: Fix 2g packets
+ avformat/matroskadec: Check timescale
+ avformat/wavdec: satuarte next_tag_ofs, data_end
+ avformat/sbgdec: Check for negative duration
+ avformat/rpl: Use 64bit for total_audio_size and check it
+ avformat/timecode: use 64bit for intermediate for rounding in fps_from_frame_rate()
+ avformat/mov: use 64bit for intermediate for rounding
+ avformat/jacosubdec: Use 64bit for abs
+ avformat/concatdec: Check user_duration sum
+ avcodec/wavarc: Avoid signed integer overflow in sample
+ avcodec/truemotion1: Height not being a multiple of 4 is unsupported
+ avcodec/hcadec: do not set hfr_group_count to invalid values
+ avformat/concatdec: clip outpoint - inpoint overflow in get_best_effort_duration()
+ avformat/jacosubdec: clarify code
+ avformat/cafdec: Check that data chunk end fits within 64bit
+ avformat/iff: Saturate avio_tell() + 12
+ avformat/dxa: Adjust order of operations around block align
+ avformat/cafdec: dont seek beyond 64bit
+ avformat/id3v2: read_uslt() check for the amount read
+ avformat/wady: Check >0 samplerate and channels 1 || 2.
+ avcodec/proresenc_kostya: Remove bug similarity text
+ avcodec/vorbisdec: Check remaining data in vorbis_residue_decode_internal()
+ avformat/concatdec: Check in and outpoints to be to produce a positive representable duration
+ avcodec/8bps: Consider width in the minimal size check
+ libswscale/utils: Fix bayer to yuvj
+ swscale/swscale: Check srcSliceH for bayer
+ swscale/utils: Allocate more dithererror
+ avcodec/indeo3: Round dimensions up in allocate_frame_buffers()
+ avutil/rational: Document what is to be expected from av_d2q() of doubles representing rational numbers
+ avfilter/signature_lookup: Do not dereference NULL pointers after malloc failure
+ avfilter/signature_lookup: dont leave uncleared pointers in sll_free()
+ avcodec/mpegvideo_enc: Use ptrdiff_t for stride
+ libavformat/hlsenc.c: Populate OTI using AAC profile in write_codec_attr.
+ avcodec/mpegvideo_enc: Dont copy beyond the image
+ avfilter/vf_minterpolate: Check pts before division
+ avformat/flacdec: Avoid double AVERRORS
+ avfilter/vf_vidstabdetect: Avoid double AVERRORS
+ avfilter/vf_swaprect: round coordinates down
+ avfilter/vf_swaprect: Use height for vertical variables
+ avfilter/vf_swaprect: assert that rectangles are within memory
+ avfilter/af_alimiter: Check nextpos before use
+ avfilter/f_reverse: Apply PTS compensation only when pts is available
+ avfilter/af_stereowiden: Check length
+ avformat/mov: Fix MSAN issue with stsd_id
+ avfilter/vf_weave: Fix odd height handling
+ avfilter/edge_template: Fix small inputs with gaussian_blur()
+ avfilter/vf_gradfun: Do not overread last line
+ avfilter/avf_showspectrum: fix off by 1 error
+ avformat/mov: do not set sign bit for chunk_offsets
+ avcodec/jpeglsdec: Check Jpeg-LS LSE
+ configure: Enable section_data_rel_ro for FreeBSD and NetBSD aarch64 / arm
+ avcodec/av1dec: Fix resolving zero divisor
+ avformat/mov: Ignore duplicate ftyp
+ avformat/mov: Fix integer overflow in mov_read_packet().
+ avformat/mov: Check if a key is longer than the atom containing it
+ avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one
+ avfilter/af_channelmap: disallow channel index 64
+ avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
+ avfilter/af_channelmap: fix error message if FL source channel was missing
+ avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
+ avformat/mov: don't abort on duplicate Mastering Display Metadata boxes
+ fftools/ffplay: use correct buffersink channel layout parameters
+ swresample/resample: fix rounding errors with filter_size=1 and phase_shift=0
+ avformat/mxfdec: remove resolve_strong_ref usage with AnyType
+ avformat/libsrt: use SRT_EPOLL_IN for waiting for an incoming connection
+ avformat/mxfdec: do not use AnyType when resolving Descriptors and MultipleDescriptors
+ avformat/mxfdec: move resolving Descriptors to the multi descriptor resolve function
+ avutil/hwcontext_d3d11va: prefer DXGI 1.1 factory when available
+ avcodec/av1dec: fix matrix coefficients exposed by codec context
+ avformat/mov_chan: never override number of channels based on chan atom
+ avformat/mov_chan: do not assume channels are in native order
+ avcodec/nvdec: don't free NVDECContext->bitstream
+ lavc/dvdsubenc: only check canvas size when it is actually set
 
 
-version 8.0:
-- Whisper filter
-- Drop support for OpenSSL < 1.1.0
-- Enable TLS peer certificate verification by default (on next major version bump)
-- Drop support for OpenSSL < 1.1.1
-- yasm support dropped, users need to use nasm
-- VVC VAAPI decoder
-- RealVideo 6.0 decoder
-- OpenMAX encoders deprecated
-- libx265 alpha layer encoding
-- ADPCM IMA Xbox decoder
-- Enhanced FLV v2: Multitrack audio/video, modern codec support
-- Animated JPEG XL encoding (via libjxl)
-- VVC in Matroska
-- CENC AV1 support in MP4 muxer
-- pngenc: set default prediction method to PAETH
-- APV decoder and APV raw bitstream muxing and demuxing
-- APV parser
-- APV encoding support through a libopenapv wrapper
-- VVC decoder supports all content of SCC (Screen Content Coding):
-  IBC (Inter Block Copy), Palette Mode and ACT (Adaptive Color Transform
-- G.728 decoder
-- pad_cuda filter
-- Sanyo LD-ADPCM decoder
-- APV in MP4/ISOBMFF muxing and demuxing
-- OpenHarmony hardware decoder/encoder
-- Colordetect filter
-- Add vf_scale_d3d11 filter
-- No longer disabling GCC autovectorization, on X86, ARM and AArch64
-- VP9 Vulkan hwaccel
-- AV1 Vulkan encoder
-- ProRes RAW decoder
-- ProRes RAW Vulkan hwaccel
-- ffprobe -codec option
+version 6.0.1:
+ avcodec/4xm: Check for cfrm exhaustion
+ avformat/mov: Disallow FTYP after streams
+ doc/html: fix styling issue with Texinfo 7.0
+ doc/html: support texinfo 7.0
+ Changelog: update
+ avformat/lafdec: Check for 0 parameters
+ avformat/lafdec: Check for 0 parameters
+ avfilter/buffersink: fix order of operation with = and <0
+ avfilter/framesync: fix order of operation with = and <0
+ tools/target_dec_fuzzer: Adjust threshold for CSCD
+ avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff()
+ avformat/mov: Check that is_still_picture_avif has no trak based streams
+ avformat/matroskadec: Fix declaration-after-statement warnings
+ Update for FFmpeg 6.0.1
+ fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata
+ avformat/rtsp: Use rtsp_st->stream_index
+ avformat/rtsp: Use rtsp_st->stream_index
+ avutil/tx_template: fix integer ovberflwo in fft3()
+ avcodec/jpeg2000dec: Check image offset
+ avformat/mxfdec: Check klv offset
+ libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined
+ avcodec/h2645_parse: Avoid EAGAIN
+ avcodec/xvididct: Make c* unsigned to avoid undefined overflows
+ avcodec/bonk: Fix undefined overflow in predictor_calc_error()
+ avformat/tmv: Check video chunk size
+ avcodec/h264_parser: saturate dts a bit
+ avformat/asfdec_f: Saturate presentation time in marker
+ avformat/xwma: sanity check bits_per_coded_sample
+ avformat/matroskadec: Check prebuffered_ns for overflow
+ avformat/wavdec: Check left avio_tell for overflow
+ avformat/tta: Better totalframes check
+ avformat/rpl: Check for number_of_chunks overflow
+ avformat/mov: compute absolute dts difference without overflow in mov_find_next_sample()
+ avformat/jacosubdec: Check timeres
+ avformat/jacosubdec: avoid signed integer overflows in get_shift()
+ avformat/jacosubdec: Factorize code in get_shift() a bit
+ avformat/sbgdec: Check for negative duration or un-representable end pts
+ avcodec/escape124: Do not return random numbers
+ avcodec/apedec: Fix an integer overflow in predictor_update_filter()
+ tools/target_dec_fuzzer: Adjust wmapro threshold
+ avcodec/wavarc: Allocate AV_INPUT_BUFFER_PADDING_SIZE
+ avcodec/wavarc: Fix integer overflwo in do_stereo()
+ avutil/tx_template: Fix some signed integer overflows in DECL_FFT5()
+ avcodec/aacdec_template: Better avoidance of signed integer overflow in imdct_and_windowing_eld()
+ tools/target_dec_fuzzer: Adjust threshold for MVHA
+ avformat/avs: Check if return code is representable
+ avcodec/flacdec: Fix integer overflow in "33bit" DECODER_SUBFRAME_FIXED_WIDE()
+ avcodec/flacdec: Fix overflow in "33bit" decorrelate
+ avcodec/lcldec: Make PNG filter addressing match the code afterwards
+ avformat/westwood_vqa: Check chunk size
+ avformat/sbgdec: Check for period overflow
+ avformat/concatdec: Check in/outpoint for overflow
+ avformat/mov: Check avif_info
+ avformat/mxfdec: Remove this_partition
+ avcodec/xvididct: Fix integer overflow in idct_row()
+ avcodec/celp_math: avoid overflow in shift
+ tools/target_dec_fuzzer: Adjust threshold for rtv1
+ avformat/hls: reduce default max reload to 3
+ avformat/format: Stop reading data at EOF during probing
+ avcodec/bonk: Fix integer overflow in predictor_calc_error()
+ avcodec/jpeg2000dec: jpeg2000 has its own lowres option
+ avcodec/huffyuvdec: avoid undefined behavior with get_vlc2() failure
+ avcodec/cscd: Fix "CamStudio Lossless Codec 1.0" gzip files
+ avcodec/cscd: Check for CamStudio Lossless Codec 1.0 behavior in end check of LZO files
+ avcodec/mpeg4videodec: consider lowres in dest_pcm[]
+ avcodec/hevcdec: Fix undefined memcpy()
+ avcodec/mpeg4videodec: more unsigned in amv computation
+ avcodec/tta: fix signed overflow in decorrelate
+ avcodec/apedec: remove unused variable
+ avcodec/apedec: Fix 48khz 24bit below insane level
+ avcodec/apedec: Fix CRC for 24bps and bigendian
+ avcodec/wavarc: Check that nb_samples is not negative
+ avcodec/wavarc: Check shift
+ avcodec/xvididct: Fix integer overflow in idct_row()
+ avformat/avr: Check sample rate
+ avformat/imf_cpl: Replace NULL content_title_utf8 by ""
+ avformat/imf_cpl: xmlNodeListGetString() can return NULL
+ avcodec/aacdec_template: Fix undefined signed interger operations
+ avcodec/wavarc: Fix k limit
+ avcodec/rka: Fix integer overflow in decode_filter()
+ avformat/rka: bps < 8 is invalid
+ avcodec/pcm: allow Changing parameters
+ avutil/tx_template: extend to 2M
+ avcodec/jpeg2000dec: Check for reduction factor and image offset
+ avutil/softfloat: Basic documentation for av_sincos_sf()
+ avutil/softfloat: fix av_sincos_sf()
+ tools/target_dec_fuzzer: Adjust threshold for speex
+ avcodec/utils: fix 2 integer overflows in get_audio_frame_duration()
+ avcodec/hevcdec: Avoid null pointer dereferences in MC
+ avcodec/takdsp: Fix integer overflows
+ avcodec/mpegvideo_dec: consider interlaced lowres 4:2:0 chroma in edge emulation check better
+ avcodec/rka: use unsigned for buf0 additions
+ avcodec/rka: Avoid undefined left shift
+ avcodec: Ignoring errors is only possible before the input end
+ avformat/jpegxl_probe: Forward error codes
+ avformat/jpegxl_probe: check length instead of blindly reading
+ avformat/jpegxl_probe: Remove intermediate macro obfuscation around get_bits*()
+ avcodec/noise_bsf: Check for wrapped frames
+ avformat/oggparsetheora: clip duration within 64bit
+ avcodec/rka: avoid undefined multiply in  cmode==0
+ avcodec/rka: use 64bit for srate_pad computation
+ avcodec/bonk: Avoid undefined integer overflow in predictor_calc_error()
+ avformat/wavdec: Check that smv block fits in available space
+ avcodec/adpcm: Fix integer overflow in intermediate in ADPCM_XMD
+ avcodec/dpcm: fix undefined interger overflow in wady
+ avcodec/tiff: add a zero DNG_LINEARIZATION_TABLE check
+ avcodec/tak: Check remaining bits in ff_tak_decode_frame_header()
+ avcodec/sonic: Fix two undefined integer overflows
+ avcodec/utils: the IFF_ILBM implementation assumes that there are a multiple of 16 allocated
+ avcodec/flacdec: Fix signed integre overflow
+ avcodec/exr: Cleanup befor return
+ avcodec/pngdec: Do not pass AVFrame into global header decode
+ avcodec/pngdec: remove AVFrame argument from decode_iccp_chunk()
+ avcodec/wavarc: Check order before using it to write the list
+ avcodec/bonk: decode multiple passes in intlist_read() at once
+ avcodec/vorbisdec: Check codebook float values to be finite
+ avcodec/g2meet: Replace fake allocation avoidance for framebuf
+ avutil/tx_priv: Use unsigned in BF() to avoid signed overflows
+ avcodec/lcldec: More space for rgb24
+ avcodec/lcldec: Support 4:1:1 and 4:2:2 with odd width
+ libavcodec/lcldec: width and height should not be unsigned
+ avformat/imf: fix invalid resource handling
+ avcodec/escape124: Check that blocks are allocated before use
+ avcodec/rka: Fix signed integer overflow in decode_filter()
+ avcodec/huffyuvdec: Fix undefined behavior with shift
+ avcodec/j2kenc: Replace RGB24 special case by generic test
+ avcodec/j2kenc: Replace BGR48 / GRAY16 test by test for number of bits
+ avcodec/j2kenc: simplify pixel format setup
+ avcodec/j2kenc: Fix funky bpno errors on decoding
+ avcodec/j2kenc: remove misleading pred value
+ avcodec/j2kenc: fix 5/3 DWT identifer
+ avcodec/vp3: Check width to avoid assertion failure
+ avcodec/g729postfilter: Limit shift in long term filter
+ avcodec/wavarc: Fix several integer overflows
+ avcodec/tests/snowenc: Fix 2nd test
+ avcodec/tests/snowenc: return a failure if DWT/IDWT mismatches
+ avcodec/snowenc: Fix visual weight calculation
+ avcodec/tests/snowenc: unbreak DWT tests
+ avcodec/mpeg12dec: Check input size
+ avcodec/escape124: Fix some return codes
+ avcodec/escape124: fix signdness of end of input check
+ Use https for repository links
+ avcodec/nvdec_hevc: fail to initialize on unsupported profiles
+ fftools/ffmpeg_enc: apply -top to individual encoded frames
+ avcodec/on2avc: use correct fft sizes
+ avcodec/on2avc: use the matching AVTX context for the 512 sized iMDCT
+ examples: fix build of mux and resample_audio
+ avcodec/nvenc: stop using deprecated rc modes with SDK 12.1
+ configure: use non-deprecated nvenc GUID for conftest
+ avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+ avfilter/vsrc_ddagrab: calculate pointer position on rotated screens
+ avfilter/vsrc_ddagrab: account for mouse-only frames during probing
+ avcodec/aac_ac3_parser: add preprocessor checks for codec specific code
+ avcodec/nvenc: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
+ Revert "lavc/nvenc: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE"
+ Revert "avcodec/nvenc: fix b-frame DTS behavior with fractional framerates"
+ avcodec/vdpau_mpeg4: fix order of quant matrix coefficients
+ avcodec/vdpau_mpeg12: fix order of quant matrix coefficients
+ avcodec/nvdec_mpeg4: fix order of quant matrix coefficients
+ avcodec/nvdec_mpeg2: fix order of quant matrix coefficients
+ fftools/ffmpeg_filter: fix leak of AVIOContext in read_binary()
+ fftools/ffmpeg: avoid possible invalid reads with short -tag values
+ avcodec/mp_cmp: reject invalid comparison function values
+ avcodec/aacpsy: clip global_quality within the psy_vbr_map array boundaries
+ avutil/wchar_filename: propagate MultiByteToWideChar() and WideCharToMultiByte() failures
+ avformat/concatf: check if any nodes were allocated
+ avcodec/nvenc: fix b-frame DTS behavior with fractional framerates
+ avcodec/vorbisdec: export skip_samples instead of dropping frames
+ fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing
+ lavfi/vf_vpp_qsv: set the right timestamp for AVERROR_EOF
+ avfilter/vf_untile: swap the chroma shift values used for plane offsets
+ lavc/decode: stop mangling last_pkt_props->opaque
+ avcodec/nvenc: avoid failing b_ref_mode check when unset
+ lavu/vulkan: fix handle type for 32-bit targets
+ vulkan: Fix win/i386 calling convention
+ avfilter/graphparser: fix filter instance name when an id is provided
+ avcodec/aacps_tablegen: fix build error after avutil bump
+ avcodec/nvenc: fix potential NULL pointer dereference
 
 
-version 7.1:
-- Raw Captions with Time (RCWT) closed caption demuxer
-- LC3/LC3plus decoding/encoding using external library liblc3
-- ffmpeg CLI filtergraph chaining
-- LC3/LC3plus demuxer and muxer
-- pad_vaapi, drawbox_vaapi filters
-- vf_scale supports secondary ref input and framesync options
-- vf_scale2ref deprecated
-- qsv_params option added for QSV encoders
-- VVC decoder compatible with DVB test content
-- xHE-AAC decoder
-- removed DEC Alpha DSP and support code
-- VVC encoding support via libvvenc
-- perlin video source
-- D3D12VA HEVC encoder
-- Cropping metadata parsing and writing in Matroska and MP4/MOV de/muxers
-- Intel QSV-accelerated VVC decoding
-- MediaCodec AAC/AMR-NB/AMR-WB/MP3 decoding
-- YUV colorspace negotiation for codecs and filters, obsoleting the
-  YUVJ pixel format
-- Vulkan H.264 encoder
-- Vulkan H.265 encoder
-- stream specifiers in fftools can now match by stream disposition
-- LCEVC enhancement data exporting in H.26x and MP4/ISOBMFF
-- LCEVC filter
-- MV-HEVC decoding
-- minor stream specifier syntax changes:
-    - when matching by metadata (:m:<key>:<val>), the colon character
-      in keys or values now has to be backslash-escaped
-    - in optional maps (-map ....?) with a metadata-matching stream specifier,
-      the value has to be separated from the question mark by a colon, i.e.
-      -map ....:m:<key>:<val>:? (otherwise it would be ambiguous whether the
-      question mark is a part of <val> or not)
-    - multiple stream types in a single specifier (e.g. :s:s:0) now cause an
-      error, as such a specifier makes no sense
-- Mastering Display and Content Light Level metadata support in hevc_nvenc
-  and av1_nvenc encoders
-- libswresample now accepts custom order channel layouts as input, with some
-  constrains
-- FFV1 parser
-
-
-version 7.0:
-- DXV DXT1 encoder
-- LEAD MCMP decoder
-- EVC decoding using external library libxevd
-- EVC encoding using external library libxeve
-- QOA decoder and demuxer
-- aap filter
-- demuxing, decoding, filtering, encoding, and muxing in the
-  ffmpeg CLI now all run in parallel
-- enable gdigrab device to grab a window using the hwnd=HANDLER syntax
-- IAMF raw demuxer and muxer
-- D3D12VA hardware accelerated H264, HEVC, VP9, AV1, MPEG-2 and VC1 decoding
-- tiltandshift filter
-- qrencode filter and qrencodesrc source
-- quirc filter
-- lavu/eval: introduce randomi() function in expressions
-- VVC decoder (experimental)
-- fsync filter
-- Raw Captions with Time (RCWT) closed caption muxer
-- ffmpeg CLI -bsf option may now be used for input as well as output
-- ffmpeg CLI options may now be used as -/opt <path>, which is equivalent
-  to -opt <contents of file <path>>
-- showinfo bitstream filter
-- a C11-compliant compiler is now required; note that this requirement
-  will be bumped to C17 in the near future, so consider updating your
-  build environment if it lacks C17 support
-- Change the default bitrate control method from VBR to CQP for QSV encoders.
-- removed deprecated ffmpeg CLI options -psnr and -map_channel
-- DVD-Video demuxer, powered by libdvdnav and libdvdread
-- ffprobe -show_stream_groups option
-- ffprobe (with -export_side_data film_grain) now prints film grain metadata
-- AEA muxer
-- ffmpeg CLI loopback decoders
-- Support PacketTypeMetadata of PacketType in enhanced flv format
-- ffplay with hwaccel decoding support (depends on vulkan renderer via libplacebo)
-- dnn filter libtorch backend
-- Android content URIs protocol
-- AOMedia Film Grain Synthesis 1 (AFGS1)
-- RISC-V optimizations for AAC, FLAC, JPEG-2000, LPC, RV4.0, SVQ, VC1, VP8, and more
-- Loongarch optimizations for HEVC decoding
-- Important AArch64 optimizations for HEVC
-- IAMF support inside MP4/ISOBMFF
-- Support for HEIF/AVIF still images and tiled still images
-- Dolby Vision profile 10 support in AV1
-- Support for Ambient Viewing Environment metadata in MP4/ISOBMFF
-- HDR10 metadata passthrough when encoding with libx264, libx265, and libsvtav1
-
-
-version 6.1:
-- libaribcaption decoder
-- Playdate video decoder and demuxer
-- Extend VAAPI support for libva-win32 on Windows
-- afireqsrc audio source filter
-- arls filter
-- ffmpeg CLI new option: -readrate_initial_burst
-- zoneplate video source filter
-- command support in the setpts and asetpts filters
-- Vulkan decode hwaccel, supporting H264, HEVC and AV1
-- color_vulkan filter
-- bwdif_vulkan filter
-- nlmeans_vulkan filter
-- RivaTuner video decoder
-- xfade_vulkan filter
-- vMix video decoder
-- Essential Video Coding parser, muxer and demuxer
-- Essential Video Coding frame merge bsf
-- bwdif_cuda filter
-- Microsoft RLE video encoder
-- Raw AC-4 muxer and demuxer
-- Raw VVC bitstream parser, muxer and demuxer
-- Bitstream filter for editing metadata in VVC streams
-- Bitstream filter for converting VVC from MP4 to Annex B
-- scale_vt filter for videotoolbox
-- transpose_vt filter for videotoolbox
-- support for the P_SKIP hinting to speed up libx264 encoding
-- Support HEVC,VP9,AV1 codec in enhanced flv format
-- apsnr and asisdr audio filters
-- OSQ demuxer and decoder
-- Support HEVC,VP9,AV1 codec fourcclist in enhanced rtmp protocol
-- CRI USM demuxer
-- ffmpeg CLI '-top' option deprecated in favor of the setfield filter
-- VAAPI AV1 encoder
-- ffprobe XML output schema changed to account for multiple
-  variable-fields elements within the same parent element
-- ffprobe -output_format option added as an alias of -of
-
-# codespell:off
-
 version 6.0:
 - Radiance HDR image support
 - ddagrab (Desktop Duplication) video capture filter

FUNDING.json

@@ -1,7 +0,0 @@
-{
-  "drips": {
-    "ethereum": {
-      "ownedBy": "0x2f3900e7064eE63D30d749971265858612AA7139"
-    }
-  }
-}

INSTALL.md

@@ -1,8 +1,5 @@
 ## Installing FFmpeg
 
-0. If you like to include source plugins, merge them before configure
-for example run tools/merge-all-source-plugins
-
 1. Type `./configure` to create the configuration. A list of configure
 options is printed by running `configure --help`.
 
@@ -18,11 +15,3 @@ 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 dependencies (which may in turn depend on
-   some of these 3rd party packages). This avoids circular dependencies during build.

LICENSE.md

@@ -12,6 +12,7 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
 
 Specifically, the GPL parts of FFmpeg are:
 
+- libpostproc
 - optional x86 optimization in the files
     - `libavcodec/x86/flac_dsp_gpl.asm`
     - `libavcodec/x86/idct_mmx.c`
@@ -44,6 +45,7 @@ Specifically, the GPL parts of FFmpeg are:
     - `vf_owdenoise.c`
     - `vf_perspective.c`
     - `vf_phase.c`
+    - `vf_pp.c`
     - `vf_pp7.c`
     - `vf_pullup.c`
     - `vf_repeatfields.c`

MAINTAINERS

@@ -6,26 +6,10 @@ FFmpeg code.
 
 Please try to keep entries where you are the maintainer up to date!
 
-*Status*, one of the following:
-[X] Old code. Something tagged obsolete generally means it has been replaced by a better system and you should be using that.
-[0] No current maintainer [but maybe you could take the role as you write your new code].
-[1] It has a maintainer but they don't have time to do much other than throw the odd patch in.
-[2] Someone actually looks after it.
-
+Names in () mean that the maintainer currently has no time to maintain the code.
 A (CC <address>) after the name means that the maintainer prefers to be CC-ed on
 patches and related discussions.
 
-(L <address>) *Mailing list* that is relevant to this area
-(W <address>) *Web-page* with status/info
-(B <address>) URI for where to file *bugs*. A web-page with detailed bug
-              filing info, a direct bug tracker link, or a mailto: URI.
-(P <address>) *Subsystem Profile* document for more details submitting
-              patches to the given subsystem. This is either an in-tree file,
-              or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
-              for details.
-(T <address>) *SCM* tree type and location.
-              Type is one of: git, hg, quilt, stgit, topgit
-
 
 Applications
 ============
@@ -34,10 +18,10 @@ ffmpeg:
   ffmpeg.c                              Michael Niedermayer, Anton Khirnov
 
 ffplay:
-  ffplay.c                          [2] Marton Balint
+  ffplay.c                              Marton Balint
 
 ffprobe:
-  ffprobe.c                         [2] Stefano Sabatini
+  ffprobe.c                             Stefano Sabatini
 
 Commandline utility code:
   cmdutils.c, cmdutils.h                Michael Niedermayer
@@ -45,32 +29,30 @@ Commandline utility code:
 QuickTime faststart:
   tools/qt-faststart.c                  Baptiste Coudurier
 
-Execution Graph Printing
-  fftools/graph, fftools/resources  [2] softworkz
 
 Miscellaneous Areas
 ===================
 
 documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server day to day operations    (L: root@ffmpeg.org) Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
-project server emergencies              (L: root@ffmpeg.org) Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
-presets                             [0]
+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
+presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
-API tests                           [0]
-samples-request                     [2] Thilo Borgmann, James Almer, Ben Littler
+API tests                               Ludmila Glinskih
 
 
 Communication
 =============
-website                                 (T: https://git.ffmpeg.org/ffmpeg-web) Deby Barbara Lepage
-fate.ffmpeg.org                         (L: fate-admin@ffmpeg.org) (W: https://fate.ffmpeg.org) (P: https://ffmpeg.org/fate.html) (S: https://git.ffmpeg.org/fateserver) Timo Rothenpieler
-Trac bug tracker                        (W: https://trac.ffmpeg.org) Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos
-Patchwork                           [2] (W: https://patchwork.ffmpeg.org) Andriy Gelman
-mailing lists                           (W: https://ffmpeg.org/contact.html#MailingLists) Baptiste Coudurier
+
+website                                 Deby Barbara Lepage
+fate.ffmpeg.org                         Timothy Gu
+Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos
+Patchwork                               Andriy Gelman
+mailing lists                           Baptiste Coudurier
 Twitter                                 Reynaldo H. Verdejo Pinochet
 Launchpad                               Timothy Gu
-ffmpeg-security                     [2] (L: ffmpeg-security@ffmpeg.org) (W: https://ffmpeg.org/security.html) Michael Niedermayer, Reimar Doeffinger
+ffmpeg-security                         Andreas Cadhalpun, Carl Eugen Hoyos, Clément Bœsch, Michael Niedermayer, Reimar Doeffinger, rcombs, wm4
 
 
 libavutil
@@ -85,26 +67,24 @@ Other:
   aes_ctr.c, aes_ctr.h                  Eran Kornblau
   bprint                                Nicolas George
   bswap.h
-  csp.c, csp.h                          Leo Izen, Ronald S. Bultje
   des                                   Reimar Doeffinger
   dynarray.h                            Nicolas George
-  eval.c, eval.h                    [2] Michael Niedermayer
+  eval.c, eval.h                        Michael Niedermayer
   float_dsp                             Loren Merritt
   hash                                  Reimar Doeffinger
   hwcontext_cuda*                       Timo Rothenpieler
-  hwcontext_d3d12va*                    Wu Jianhua
-  hwcontext_vulkan*                 [2] Lynne
+  hwcontext_vulkan*                     Lynne
   intfloat*                             Michael Niedermayer
   integer.c, integer.h                  Michael Niedermayer
   lzo                                   Reimar Doeffinger
-  mathematics.c, mathematics.h      [2] Michael Niedermayer
-  mem.c, mem.h                      [2] Michael Niedermayer
+  mathematics.c, mathematics.h          Michael Niedermayer
+  mem.c, mem.h                          Michael Niedermayer
   opencl.c, opencl.h                    Wei Gao
   opt.c, opt.h                          Michael Niedermayer
-  rational.c, rational.h            [2] Michael Niedermayer
+  rational.c, rational.h                Michael Niedermayer
   rc4                                   Reimar Doeffinger
   ripemd.c, ripemd.h                    James Almer
-  tx*                               [2] Lynne
+  tx*                                   Lynne
 
 
 libavcodec
@@ -126,18 +106,20 @@ Generic Parts:
   DSP utilities:
     dsputils.c, dsputils.h              Michael Niedermayer
   entropy coding:
-    rangecoder.c, rangecoder.h      [2] Michael Niedermayer
+    rangecoder.c, rangecoder.h          Michael Niedermayer
     lzw.*                               Michael Niedermayer
   floating point AAN DCT:
-    faandct.c, faandct.h            [2] Michael Niedermayer
+    faandct.c, faandct.h                Michael Niedermayer
   Golomb coding:
-    golomb.c, golomb.h              [2] Michael Niedermayer
+    golomb.c, golomb.h                  Michael Niedermayer
   motion estimation:
     motion*                             Michael Niedermayer
   rate control:
-    ratecontrol.c                   [2] Michael Niedermayer
+    ratecontrol.c                       Michael Niedermayer
   simple IDCT:
-    simple_idct.c, simple_idct.h    [2] Michael Niedermayer
+    simple_idct.c, simple_idct.h        Michael Niedermayer
+  postprocessing:
+    libpostproc/*                       Michael Niedermayer
   table generation:
     tableprint.c, tableprint.h          Reimar Doeffinger
   fixed point FFT:
@@ -145,7 +127,7 @@ Generic Parts:
   Text Subtitles                        Clément Bœsch
 
 Codecs:
-  4xm.c                             [2] Michael Niedermayer
+  4xm.c                                 Michael Niedermayer
   8bps.c                                Roberto Togni
   8svx.c                                Jaikrishnan Menon
   aacenc*, aaccoder.c                   Rostislav Pehlivanov
@@ -162,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
@@ -179,10 +162,10 @@ Codecs:
   dss_sp.c                              Oleksij Rempel
   dv.c                                  Roman Shaposhnik
   dvbsubdec.c                           Anshul Maheshwari
-  dxv.*, dxvenc.*                       Emma Worley
   eacmv*, eaidct*, eat*                 Peter Ross
+  evrc*                                 Paul B Mahol
   exif.c, exif.h                        Thilo Borgmann
-  ffv1*                             [2] Michael Niedermayer
+  ffv1*                                 Michael Niedermayer
   ffwavesynth.c                         Nicolas George
   fifo.c                                Jan Sebechlebsky
   flicvideo.c                           Mike Melanson
@@ -193,13 +176,11 @@ Codecs:
   h263*                                 Michael Niedermayer
   h264*                                 Loren Merritt, Michael Niedermayer
   hap*                                  Tom Butterworth
-  hevc/*                                Anton Khirnov
   huffyuv*                              Michael Niedermayer
   idcinvideo.c                          Mike Melanson
   interplayvideo.c                      Mike Melanson
   jni*, ffjni*                          Matthieu Bouron
   jpeg2000*                             Nicolas Bertrand
-  jpegxl*                               Leo Izen
   jvdec.c                               Peter Ross
   lcl*.c                                Roberto Togni, Reimar Doeffinger
   libcelt_dec.c                         Nicolas George
@@ -210,6 +191,7 @@ Codecs:
   libgsm.c                              Michel Bardiaux
   libkvazaar.c                          Arttu Ylä-Outinen
   libopenh264enc.c                      Martin Storsjo, Linjie Fu
+  libopenjpeg.c                         Jaikrishnan Menon
   libopenjpegenc.c                      Michael Bradshaw
   libtheoraenc.c                        David Conrad
   libvorbis.c                           David Conrad
@@ -228,12 +210,12 @@ Codecs:
   mqc*                                  Nicolas Bertrand
   msmpeg4.c, msmpeg4data.h              Michael Niedermayer
   msrle.c                               Mike Melanson
-  msrleenc.c                            Tomas Härdin
   msvideo1.c                            Mike Melanson
   nuv.c                                 Reimar Doeffinger
   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
@@ -247,7 +229,7 @@ Codecs:
   rpza.c                                Roberto Togni
   rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
   rv10.c                                Michael Niedermayer
-  sanm.c                                Manuel Lauss
+  s3tc*                                 Ivo van Poorten
   smc.c                                 Mike Melanson
   snow*                                 Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
@@ -255,13 +237,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
@@ -270,23 +255,22 @@ Codecs:
   vp8                                   David Conrad, Ronald Bultje
   vp9                                   Ronald Bultje
   vqavideo.c                            Mike Melanson
-  vvc                               [2] Nuo Mi, Wu Jianhua, Frank Plowman
   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
-  d3d12va*                              Wu Jianhua
-  d3d12va_encode*                       Tong Wu
-  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
@@ -321,38 +305,67 @@ 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                        [2] Michael Niedermayer
+  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                        [2] Michael Niedermayer
-  vf_xfade_vulkan.c                 [2] Marvin Scholz (CC <epirat07@gmail.com>)
+  vf_yadif.c                            Michael Niedermayer
+  vf_zoompan.c                          Paul B Mahol
 
 Sources:
-  vsrc_mandelbrot.c                 [2] Michael Niedermayer
+  vsrc_mandelbrot.c                     Michael Niedermayer
 
 dnn                                     Yejun Guo
 
@@ -370,7 +383,8 @@ Generic parts:
 Muxers/Demuxers:
   4xm.c                                 Mike Melanson
   aadec.c                               Vesselin Bontchev (vesselin.bontchev at yandex dot com)
-  adtsenc.c                         [0]
+  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
@@ -381,12 +395,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
@@ -395,10 +413,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                     [2] Marth64
   electronicarts.c                      Peter Ross
-  evc*                                  Samsung (Dawid Kozinski)
+  epafdec.c                             Paul B Mahol
   ffm*                                  Baptiste Coudurier
   flic.c                                Mike Melanson
   flvdec.c                              Michael Niedermayer
@@ -406,26 +424,28 @@ Muxers/Demuxers:
   gxf.c                                 Reimar Doeffinger
   gxfenc.c                              Baptiste Coudurier
   hlsenc.c                              Christian Suloway, Steven Liu
-  iamf*                             [2] James Almer
   idcin.c                               Mike Melanson
   idroqdec.c                            Mike Melanson
   iff.c                                 Jaikrishnan Menon
   imf*                                  Pierre-Anthony Lemieux
   img2*.c                               Michael Niedermayer
   ipmovie.c                             Mike Melanson
+  ircam*                                Paul B Mahol
   iss.c                                 Stefan Gehrer
-  jpegxl*                               Leo Izen
+  jpegxl_probe.*                        Leo Izen
   jvdec.c                               Peter Ross
   kvag.c                                Zane van Iperen
   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                            Andreas Rheinhardt
-  matroskadec.c                         Andreas Rheinhardt
-  matroskaenc.c                         Andreas Rheinhardt
+  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
@@ -438,6 +458,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
@@ -445,13 +466,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
-  rcwtdec.c                         [2] Marth64
-  rcwtenc.c                         [2] Marth64
   rdt.c                                 Ronald S. Bultje
   rl2.c                                 Sascha Sommer
   rmdec.c, rmenc.c                      Ronald S. Bultje
@@ -470,10 +491,11 @@ Muxers/Demuxers:
   sdp.c                                 Martin Storsjo
   segafilm.c                            Mike Melanson
   segment.c                             Stefano Sabatini
-  smush.c                               Manuel Lauss
+  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
@@ -483,6 +505,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
@@ -494,38 +517,36 @@ Protocols:
   libzmq.c                              Andriy Gelman
   mms*.c                                Ronald S. Bultje
   udp.c                                 Luca Abeni
-  icecast.c                         [2] Marvin Scholz (CC <epirat07@gmail.com>)
+  icecast.c                             Marvin Scholz
 
 
 libswresample
 =============
 
 Generic parts:
-  audioconvert.c                    [2] Michael Niedermayer
-  dither.c                          [2] Michael Niedermayer
-  rematrix*.c                       [2] Michael Niedermayer
-  swresample*.c                     [2] Michael Niedermayer
+  audioconvert.c                        Michael Niedermayer
+  dither.c                              Michael Niedermayer
+  rematrix*.c                           Michael Niedermayer
+  swresample*.c                         Michael Niedermayer
 
 Resamplers:
-  resample*.c                       [2] Michael Niedermayer
+  resample*.c                           Michael Niedermayer
   soxr_resample.c                       Rob Sykes
 
 
 Operating systems / CPU architectures
 =====================================
 
-*BSD                                [2] Brad Smith
-Alpha                               [0]
+Alpha                                   Falk Hueffner
 MIPS                                    Manojkumar Bhosale, Shiyou Yin
-LoongArch                           [2] Shiyou Yin
-Darwin (macOS, iOS)                 [2] Marvin Scholz
-Mac OS X / PowerPC                  [0]
+LoongArch                               Shiyou Yin
+Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
-Linux / PowerPC                     [1] Lauri Kasanen
-RISC-V                              [2] Rémi Denis-Courmont
+Linux / PowerPC                         Lauri Kasanen
 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
@@ -541,7 +562,6 @@ Benjamin Larsson
 Bobby Bingham
 Daniel Verkamp
 Derek Buitenhuis
-Fei Wang
 Ganesh Ajjanagadde
 Henrik Gramner
 Ivan Uskov
@@ -549,7 +569,6 @@ James Darnley
 Jan Ekström
 Joakim Plate
 Jun Zhao
-Kacper Michajłow
 Kieran Kunhya
 Kirill Gavrilov
 Limin Wang
@@ -565,12 +584,10 @@ 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
 
@@ -591,15 +608,13 @@ Benoit Fouet                  B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8
 Clément Bœsch                 52D0 3A82 D445 F194 DB8B 2B16 87EE 2CB8 F4B8 FCF9
 Daniel Verkamp                78A6 07ED 782C 653E C628 B8B9 F0EB 8DD8 2F0E 21C7
 FFmpeg release signing key    FCF9 86EA 15E6 E293 A564 4F10 B432 2F04 D676 58D8
-Frank Plowman                 34E2 48D6 B7DF 4769 70C7 3304 03A8 4C6A 098F 2C6B
 Ganesh Ajjanagadde            C96A 848E 97C3 CEA2 AB72 5CE4 45F9 6A2D 3C36 FB1B
 Gwenole Beauchesne            2E63 B3A6 3E44 37E2 017D 2704 53C7 6266 B153 99C4
 Haihao Xiang (haihao)         1F0C 31E8 B4FE F7A4 4DC1 DC99 E0F5 76D4 76FC 437F
 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
+Leo Izen (thebombzen)         B6FD 3CFC 7ACF 83FC 9137 6945 5A71 C331 FD2F A19A
 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

Makefile

@@ -19,20 +19,14 @@ vpath %/fate_config.sh.template $(SRC_PATH)
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
 
-ALLFFLIBS =            \
-    avcodec            \
-    avdevice           \
-    avfilter           \
-    avformat           \
-    avutil             \
-    swscale            \
-    swresample         \
+ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale swresample
 
 # $(FFLIBS-yes) needs to be in linking order
 FFLIBS-$(CONFIG_AVDEVICE)   += avdevice
 FFLIBS-$(CONFIG_AVFILTER)   += avfilter
 FFLIBS-$(CONFIG_AVFORMAT)   += avformat
 FFLIBS-$(CONFIG_AVCODEC)    += avcodec
+FFLIBS-$(CONFIG_POSTPROC)   += postproc
 FFLIBS-$(CONFIG_SWRESAMPLE) += swresample
 FFLIBS-$(CONFIG_SWSCALE)    += swscale
 
@@ -53,14 +47,11 @@ FF_DEP_LIBS  := $(DEP_LIBS)
 FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
 
 $(TOOLS): %$(EXESUF): %.o
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter-out $(FF_DEP_LIBS), $^) $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
 
 target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
 
-target_enc_%_fuzzer$(EXESUF): target_enc_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-
 tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
 
@@ -73,16 +64,9 @@ 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/target_swr_fuzzer$(EXESUF): tools/target_swr_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)
-tools/enc_recon_frame_test$(EXESUF): $(FF_DEP_LIBS)
-tools/enc_recon_frame_test$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/scale_slice_test$(EXESUF): $(FF_DEP_LIBS)
 tools/scale_slice_test$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
@@ -109,8 +93,8 @@ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
                ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
                ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS                \
                MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
-               MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS    \
-               OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS
+               MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS              \
+               OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS
 
 define RESET
 $(1) :=
@@ -147,18 +131,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

RELEASE

@@ -1 +1 @@
-8.0.git
+6.0.2

RELEASE_NOTES

@@ -0,0 +1,15 @@
+
+            ┌────────────────────────────────────────────┐
+            │ RELEASE NOTES for FFmpeg 6.0 "Von Neumann" │
+            └────────────────────────────────────────────┘
+
+   The FFmpeg Project proudly presents FFmpeg 6.0 "Von Neumann", about 6
+   months after the release of FFmpeg 5.1.
+
+   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.

compat/atomics/gcc/stdatomic.h

@@ -0,0 +1,173 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * based on vlc_atomic.h from VLC
+ * Copyright (C) 2010 Rémi Denis-Courmont
+ */
+
+#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H
+#define COMPAT_ATOMICS_GCC_STDATOMIC_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define ATOMIC_FLAG_INIT 0
+
+#define ATOMIC_VAR_INIT(value) (value)
+
+#define atomic_init(obj, value) \
+do {                            \
+    *(obj) = (value);           \
+} while(0)
+
+#define kill_dependency(y) ((void)0)
+
+#define atomic_thread_fence(order) \
+    __sync_synchronize()
+
+#define atomic_signal_fence(order) \
+    ((void)0)
+
+#define atomic_is_lock_free(obj) 0
+
+typedef         _Bool      atomic_flag;
+typedef         _Bool      atomic_bool;
+typedef          char      atomic_char;
+typedef   signed char      atomic_schar;
+typedef unsigned char      atomic_uchar;
+typedef          short     atomic_short;
+typedef unsigned short     atomic_ushort;
+typedef          int       atomic_int;
+typedef unsigned int       atomic_uint;
+typedef          long      atomic_long;
+typedef unsigned long      atomic_ulong;
+typedef          long long atomic_llong;
+typedef unsigned long long atomic_ullong;
+typedef          wchar_t   atomic_wchar_t;
+typedef       int_least8_t atomic_int_least8_t;
+typedef      uint_least8_t atomic_uint_least8_t;
+typedef      int_least16_t atomic_int_least16_t;
+typedef     uint_least16_t atomic_uint_least16_t;
+typedef      int_least32_t atomic_int_least32_t;
+typedef     uint_least32_t atomic_uint_least32_t;
+typedef      int_least64_t atomic_int_least64_t;
+typedef     uint_least64_t atomic_uint_least64_t;
+typedef       int_fast8_t atomic_int_fast8_t;
+typedef      uint_fast8_t atomic_uint_fast8_t;
+typedef      int_fast16_t atomic_int_fast16_t;
+typedef     uint_fast16_t atomic_uint_fast16_t;
+typedef      int_fast32_t atomic_int_fast32_t;
+typedef     uint_fast32_t atomic_uint_fast32_t;
+typedef      int_fast64_t atomic_int_fast64_t;
+typedef     uint_fast64_t atomic_uint_fast64_t;
+typedef          intptr_t atomic_intptr_t;
+typedef         uintptr_t atomic_uintptr_t;
+typedef            size_t atomic_size_t;
+typedef         ptrdiff_t atomic_ptrdiff_t;
+typedef          intmax_t atomic_intmax_t;
+typedef         uintmax_t atomic_uintmax_t;
+
+#define atomic_store(object, desired)   \
+do {                                    \
+    *(object) = (desired);              \
+    __sync_synchronize();               \
+} while (0)
+
+#define atomic_store_explicit(object, desired, order) \
+    atomic_store(object, desired)
+
+#define atomic_load(object) \
+    (__sync_synchronize(), *(object))
+
+#define atomic_load_explicit(object, order) \
+    atomic_load(object)
+
+#define atomic_exchange(object, desired)                            \
+({                                                                  \
+    __typeof__(object) _obj = (object);                             \
+    __typeof__(*object) _old;                                       \
+    do                                                              \
+        _old = atomic_load(_obj);                                   \
+    while (!__sync_bool_compare_and_swap(_obj, _old, (desired)));   \
+    _old;                                                           \
+})
+
+#define atomic_exchange_explicit(object, desired, order) \
+    atomic_exchange(object, desired)
+
+#define atomic_compare_exchange_strong(object, expected, desired)   \
+({                                                                  \
+    __typeof__(object) _exp = (expected);                           \
+    __typeof__(*object) _old = *_exp;                               \
+    *_exp = __sync_val_compare_and_swap((object), _old, (desired)); \
+    *_exp == _old;                                                  \
+})
+
+#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak(object, expected, desired) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_weak(object, expected, desired)
+
+#define atomic_fetch_add(object, operand) \
+    __sync_fetch_and_add(object, operand)
+
+#define atomic_fetch_add_explicit(object, operand, order) \
+    atomic_fetch_add(object, operand)
+
+#define atomic_fetch_sub(object, operand) \
+    __sync_fetch_and_sub(object, operand)
+
+#define atomic_fetch_sub_explicit(object, operand, order) \
+    atomic_fetch_sub(object, operand)
+
+#define atomic_fetch_or(object, operand) \
+    __sync_fetch_and_or(object, operand)
+
+#define atomic_fetch_or_explicit(object, operand, order) \
+    atomic_fetch_or(object, operand)
+
+#define atomic_fetch_xor(object, operand) \
+    __sync_fetch_and_xor(object, operand)
+
+#define atomic_fetch_xor_explicit(object, operand, order) \
+    atomic_fetch_xor(object, operand)
+
+#define atomic_fetch_and(object, operand) \
+    __sync_fetch_and_and(object, operand)
+
+#define atomic_fetch_and_explicit(object, operand, order) \
+    atomic_fetch_and(object, operand)
+
+#define atomic_flag_test_and_set(object) \
+    atomic_exchange(object, 1)
+
+#define atomic_flag_test_and_set_explicit(object, order) \
+    atomic_flag_test_and_set(object)
+
+#define atomic_flag_clear(object) \
+    atomic_store(object, 0)
+
+#define atomic_flag_clear_explicit(object, order) \
+    atomic_flag_clear(object)
+
+#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */

compat/atomics/pthread/stdatomic.c

@@ -1,6 +1,4 @@
 /*
- * Copyright (c) 2024 Zhao Zhili
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -18,24 +16,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/*
+ * based on vlc_atomic.h from VLC
+ * Copyright (C) 2010 Rémi Denis-Courmont
+ */
+
+#include <pthread.h>
 #include <stdint.h>
 
-#include "libavutil/cpu_internal.h"
+#include "stdatomic.h"
 
-int ff_get_cpu_flags_wasm(void)
+static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
+
+void avpriv_atomic_lock(void)
 {
-    int flags = 0;
-#if HAVE_SIMD128
-    flags |= AV_CPU_FLAG_SIMD128;
-#endif
-    return flags;
+    pthread_mutex_lock(&atomic_lock);
 }
 
-size_t ff_get_cpu_max_align_wasm(void)
+void avpriv_atomic_unlock(void)
 {
-#if HAVE_SIMD128
-    return 16;
-#else
-    return 8;
-#endif
+    pthread_mutex_unlock(&atomic_lock);
 }

compat/atomics/pthread/stdatomic.h

@@ -0,0 +1,197 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * based on vlc_atomic.h from VLC
+ * Copyright (C) 2010 Rémi Denis-Courmont
+ */
+
+#ifndef COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
+#define COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
+
+#include <stdint.h>
+
+#define ATOMIC_FLAG_INIT 0
+
+#define ATOMIC_VAR_INIT(value) (value)
+
+#define atomic_init(obj, value) \
+do {                            \
+    *(obj) = (value);           \
+} while(0)
+
+#define kill_dependency(y) ((void)0)
+
+#define atomic_signal_fence(order) \
+    ((void)0)
+
+#define atomic_is_lock_free(obj) 0
+
+typedef intptr_t atomic_flag;
+typedef intptr_t atomic_bool;
+typedef intptr_t atomic_char;
+typedef intptr_t atomic_schar;
+typedef intptr_t atomic_uchar;
+typedef intptr_t atomic_short;
+typedef intptr_t atomic_ushort;
+typedef intptr_t atomic_int;
+typedef intptr_t atomic_uint;
+typedef intptr_t atomic_long;
+typedef intptr_t atomic_ulong;
+typedef intptr_t atomic_llong;
+typedef intptr_t atomic_ullong;
+typedef intptr_t atomic_wchar_t;
+typedef intptr_t atomic_int_least8_t;
+typedef intptr_t atomic_uint_least8_t;
+typedef intptr_t atomic_int_least16_t;
+typedef intptr_t atomic_uint_least16_t;
+typedef intptr_t atomic_int_least32_t;
+typedef intptr_t atomic_uint_least32_t;
+typedef intptr_t atomic_int_least64_t;
+typedef intptr_t atomic_uint_least64_t;
+typedef intptr_t atomic_int_fast8_t;
+typedef intptr_t atomic_uint_fast8_t;
+typedef intptr_t atomic_int_fast16_t;
+typedef intptr_t atomic_uint_fast16_t;
+typedef intptr_t atomic_int_fast32_t;
+typedef intptr_t atomic_uint_fast32_t;
+typedef intptr_t atomic_int_fast64_t;
+typedef intptr_t atomic_uint_fast64_t;
+typedef intptr_t atomic_intptr_t;
+typedef intptr_t atomic_uintptr_t;
+typedef intptr_t atomic_size_t;
+typedef intptr_t atomic_ptrdiff_t;
+typedef intptr_t atomic_intmax_t;
+typedef intptr_t atomic_uintmax_t;
+
+void avpriv_atomic_lock(void);
+void avpriv_atomic_unlock(void);
+
+static inline void atomic_thread_fence(int order)
+{
+    avpriv_atomic_lock();
+    avpriv_atomic_unlock();
+}
+
+static inline void atomic_store(intptr_t *object, intptr_t desired)
+{
+    avpriv_atomic_lock();
+    *object = desired;
+    avpriv_atomic_unlock();
+}
+
+#define atomic_store_explicit(object, desired, order) \
+    atomic_store(object, desired)
+
+static inline intptr_t atomic_load(intptr_t *object)
+{
+    intptr_t ret;
+    avpriv_atomic_lock();
+    ret = *object;
+    avpriv_atomic_unlock();
+    return ret;
+}
+
+#define atomic_load_explicit(object, order) \
+    atomic_load(object)
+
+static inline intptr_t atomic_exchange(intptr_t *object, intptr_t desired)
+{
+    intptr_t ret;
+    avpriv_atomic_lock();
+    ret     = *object;
+    *object = desired;
+    avpriv_atomic_unlock();
+    return ret;
+}
+
+#define atomic_exchange_explicit(object, desired, order) \
+    atomic_exchange(object, desired)
+
+static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
+                                                 intptr_t desired)
+{
+    int ret;
+    avpriv_atomic_lock();
+    if (*object == *expected) {
+        ret     = 1;
+        *object = desired;
+    } else {
+        ret = 0;
+        *expected = *object;
+    }
+    avpriv_atomic_unlock();
+    return ret;
+}
+
+#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak(object, expected, desired) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_weak(object, expected, desired)
+
+#define FETCH_MODIFY(opname, op)                                                   \
+static inline intptr_t atomic_fetch_ ## opname(intptr_t *object, intptr_t operand) \
+{                                                                                  \
+    intptr_t ret;                                                                  \
+    avpriv_atomic_lock();                                                          \
+    ret = *object;                                                                 \
+    *object = *object op operand;                                                  \
+    avpriv_atomic_unlock();                                                        \
+    return ret;                                                                    \
+}
+
+FETCH_MODIFY(add, +)
+FETCH_MODIFY(sub, -)
+FETCH_MODIFY(or,  |)
+FETCH_MODIFY(xor, ^)
+FETCH_MODIFY(and, &)
+
+#undef FETCH_MODIFY
+
+#define atomic_fetch_add_explicit(object, operand, order) \
+    atomic_fetch_add(object, operand)
+
+#define atomic_fetch_sub_explicit(object, operand, order) \
+    atomic_fetch_sub(object, operand)
+
+#define atomic_fetch_or_explicit(object, operand, order) \
+    atomic_fetch_or(object, operand)
+
+#define atomic_fetch_xor_explicit(object, operand, order) \
+    atomic_fetch_xor(object, operand)
+
+#define atomic_fetch_and_explicit(object, operand, order) \
+    atomic_fetch_and(object, operand)
+
+#define atomic_flag_test_and_set(object) \
+    atomic_exchange(object, 1)
+
+#define atomic_flag_test_and_set_explicit(object, order) \
+    atomic_flag_test_and_set(object)
+
+#define atomic_flag_clear(object) \
+    atomic_store(object, 0)
+
+#define atomic_flag_clear_explicit(object, order) \
+    atomic_flag_clear(object)
+
+#endif /* COMPAT_ATOMICS_PTHREAD_STDATOMIC_H */

compat/atomics/suncc/stdatomic.h

@@ -0,0 +1,186 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef COMPAT_ATOMICS_SUNCC_STDATOMIC_H
+#define COMPAT_ATOMICS_SUNCC_STDATOMIC_H
+
+#include <atomic.h>
+#include <mbarrier.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#define ATOMIC_FLAG_INIT 0
+
+#define ATOMIC_VAR_INIT(value) (value)
+
+#define atomic_init(obj, value) \
+do {                            \
+    *(obj) = (value);           \
+} while(0)
+
+#define kill_dependency(y) ((void)0)
+
+#define atomic_thread_fence(order) \
+    __machine_rw_barrier();
+
+#define atomic_signal_fence(order) \
+    ((void)0)
+
+#define atomic_is_lock_free(obj) 0
+
+typedef intptr_t atomic_flag;
+typedef intptr_t atomic_bool;
+typedef intptr_t atomic_char;
+typedef intptr_t atomic_schar;
+typedef intptr_t atomic_uchar;
+typedef intptr_t atomic_short;
+typedef intptr_t atomic_ushort;
+typedef intptr_t atomic_int;
+typedef intptr_t atomic_uint;
+typedef intptr_t atomic_long;
+typedef intptr_t atomic_ulong;
+typedef intptr_t atomic_llong;
+typedef intptr_t atomic_ullong;
+typedef intptr_t atomic_wchar_t;
+typedef intptr_t atomic_int_least8_t;
+typedef intptr_t atomic_uint_least8_t;
+typedef intptr_t atomic_int_least16_t;
+typedef intptr_t atomic_uint_least16_t;
+typedef intptr_t atomic_int_least32_t;
+typedef intptr_t atomic_uint_least32_t;
+typedef intptr_t atomic_int_least64_t;
+typedef intptr_t atomic_uint_least64_t;
+typedef intptr_t atomic_int_fast8_t;
+typedef intptr_t atomic_uint_fast8_t;
+typedef intptr_t atomic_int_fast16_t;
+typedef intptr_t atomic_uint_fast16_t;
+typedef intptr_t atomic_int_fast32_t;
+typedef intptr_t atomic_uint_fast32_t;
+typedef intptr_t atomic_int_fast64_t;
+typedef intptr_t atomic_uint_fast64_t;
+typedef intptr_t atomic_intptr_t;
+typedef intptr_t atomic_uintptr_t;
+typedef intptr_t atomic_size_t;
+typedef intptr_t atomic_ptrdiff_t;
+typedef intptr_t atomic_intmax_t;
+typedef intptr_t atomic_uintmax_t;
+
+static inline void atomic_store(intptr_t *object, intptr_t desired)
+{
+    *object = desired;
+    __machine_rw_barrier();
+}
+
+#define atomic_store_explicit(object, desired, order) \
+    atomic_store(object, desired)
+
+static inline intptr_t atomic_load(intptr_t *object)
+{
+    __machine_rw_barrier();
+    return *object;
+}
+
+#define atomic_load_explicit(object, order) \
+    atomic_load(object)
+
+#define atomic_exchange(object, desired) \
+    atomic_swap_ptr(object, desired)
+
+#define atomic_exchange_explicit(object, desired, order) \
+    atomic_exchange(object, desired)
+
+static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *expected,
+                                                 intptr_t desired)
+{
+    intptr_t  old = *expected;
+    *expected = (intptr_t)atomic_cas_ptr(object, (void *)old, (void *)desired);
+    return *expected == old;
+}
+
+#define atomic_compare_exchange_strong_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak(object, expected, desired) \
+    atomic_compare_exchange_strong(object, expected, desired)
+
+#define atomic_compare_exchange_weak_explicit(object, expected, desired, success, failure) \
+    atomic_compare_exchange_weak(object, expected, desired)
+
+static inline intptr_t atomic_fetch_add(intptr_t *object, intptr_t operand)
+{
+    return atomic_add_ptr_nv(object, operand) - operand;
+}
+
+#define atomic_fetch_sub(object, operand) \
+    atomic_fetch_add(object, -(operand))
+
+static inline intptr_t atomic_fetch_or(intptr_t *object, intptr_t operand)
+{
+    intptr_t old;
+    do {
+        old = atomic_load(object);
+    } while (!atomic_compare_exchange_strong(object, old, old | operand));
+    return old;
+}
+
+static inline intptr_t atomic_fetch_xor(intptr_t *object, intptr_t operand)
+{
+    intptr_t old;
+    do {
+        old = atomic_load(object);
+    } while (!atomic_compare_exchange_strong(object, old, old ^ operand));
+    return old;
+}
+
+static inline intptr_t atomic_fetch_and(intptr_t *object, intptr_t operand)
+{
+    intptr_t old;
+    do {
+        old = atomic_load(object);
+    } while (!atomic_compare_exchange_strong(object, old, old & operand));
+    return old;
+}
+
+#define atomic_fetch_add_explicit(object, operand, order) \
+    atomic_fetch_add(object, operand)
+
+#define atomic_fetch_sub_explicit(object, operand, order) \
+    atomic_fetch_sub(object, operand)
+
+#define atomic_fetch_or_explicit(object, operand, order) \
+    atomic_fetch_or(object, operand)
+
+#define atomic_fetch_xor_explicit(object, operand, order) \
+    atomic_fetch_xor(object, operand)
+
+#define atomic_fetch_and_explicit(object, operand, order) \
+    atomic_fetch_and(object, operand)
+
+#define atomic_flag_test_and_set(object) \
+    atomic_exchange(object, 1)
+
+#define atomic_flag_test_and_set_explicit(object, order) \
+    atomic_flag_test_and_set(object)
+
+#define atomic_flag_clear(object) \
+    atomic_store(object, 0)
+
+#define atomic_flag_clear_explicit(object, order) \
+    atomic_flag_clear(object)
+
+#endif /* COMPAT_ATOMICS_SUNCC_STDATOMIC_H */

compat/atomics/win32/stdatomic.h

@@ -19,6 +19,7 @@
 #ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H
 #define COMPAT_ATOMICS_WIN32_STDATOMIC_H
 
+#define WIN32_LEAN_AND_MEAN
 #include <stddef.h>
 #include <stdint.h>
 #include <windows.h>

compat/cuda/cuda_runtime.h

@@ -189,7 +189,4 @@ static inline __device__ float __cosf(float a) { return __nvvm_cos_approx_f(a);
 static inline __device__ float __expf(float a) { return __nvvm_ex2_approx_f(a * (float)__builtin_log2(__builtin_exp(1))); }
 static inline __device__ float __powf(float a, float b) { return __nvvm_ex2_approx_f(__nvvm_lg2_approx_f(a) * b); }
 
-// Misc helper functions
-extern "C" __device__ int printf(const char*, ...);
-
 #endif /* COMPAT_CUDA_CUDA_RUNTIME_H */

compat/getopt.c

@@ -38,7 +38,7 @@ static int optind = 1;
 static int optopt;
 static char *optarg;
 
-static int getopt(int argc, char *argv[], const char *opts)
+static int getopt(int argc, char *argv[], char *opts)
 {
     static int sp = 1;
     int c;

compat/solaris/make_sunver.pl

@@ -218,7 +218,7 @@ while (<F>) {
     # Lines of the form '} SOME_VERSION_NAME_1.0;'
     if (/^[ \t]*\}[ \tA-Z0-9_.a-z]+;[ \t]*$/) {
     $glob = 'glob';
-    # We tried to match symbols against this version, but none matched.
+    # We tried to match symbols agains this version, but none matched.
     # Emit dummy hidden symbol to avoid marking this version WEAK.
     if ($matches_attempted && $matched_symbols == 0) {
         print "  hidden:\n";

compat/stdbit/stdbit.h

@@ -1,599 +0,0 @@
-/*
- * Copyright (C) 2023 Rémi Denis-Courmont
- *
- * This program 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-#ifndef __STDC_VERSION_STDBIT_H__
-#define __STDC_VERSION_STDBIT_H__ 202311L
-
-#include <stdbool.h>
-#include <limits.h> /* CHAR_BIT */
-
-#define __STDC_ENDIAN_LITTLE__ 1234
-#define __STDC_ENDIAN_BIG__    4321
-
-#ifdef __BYTE_ORDER__
-# if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#  define __STDC_ENDIAN_NATIVE__ __STDC_ENDIAN_LITTLE__
-# elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#  define __STDC_ENDIAN_NATIVE__ __STDC_ENDIAN_BIG__
-# else
-#  define __STDC_ENDIAN_NATIVE__ 3412
-# endif
-#elif defined(_MSC_VER)
-#  define __STDC_ENDIAN_NATIVE__ __STDC_ENDIAN_LITTLE__
-#else
-# error Not implemented.
-#endif
-
-#define __stdbit_generic_type_func(func, value) \
-    _Generic (value, \
-        unsigned long long: stdc_##func##_ull((unsigned long long)(value)), \
-        unsigned long:      stdc_##func##_ul((unsigned long)(value)), \
-        unsigned int:       stdc_##func##_ui((unsigned int)(value)), \
-        unsigned short:     stdc_##func##_us((unsigned short)(value)), \
-        unsigned char:      stdc_##func##_uc((unsigned char)(value)))
-
-#if defined (__GNUC__) || defined (__clang__)
-static inline unsigned int stdc_leading_zeros_ull(unsigned long long value)
-{
-    return value ? __builtin_clzll(value) : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_ul(unsigned long value)
-{
-    return value ? __builtin_clzl(value) : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_ui(unsigned int value)
-{
-    return value ? __builtin_clz(value) : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_us(unsigned short value)
-{
-    return stdc_leading_zeros_ui(value)
-           - CHAR_BIT * (sizeof (int) - sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_uc(unsigned char value)
-{
-    return stdc_leading_zeros_ui(value) - (CHAR_BIT * (sizeof (int) - 1));
-}
-#else
-static inline unsigned int __stdc_leading_zeros(unsigned long long value,
-                                                unsigned int size)
-{
-    unsigned int zeros = size * CHAR_BIT;
-
-    while (value != 0) {
-        value >>= 1;
-        zeros--;
-    }
-
-    return zeros;
-}
-
-static inline unsigned int stdc_leading_zeros_ull(unsigned long long value)
-{
-    return __stdc_leading_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_ul(unsigned long value)
-{
-    return __stdc_leading_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_ui(unsigned int value)
-{
-    return __stdc_leading_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_us(unsigned short value)
-{
-    return __stdc_leading_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_leading_zeros_uc(unsigned char value)
-{
-    return __stdc_leading_zeros(value, sizeof (value));
-}
-#endif
-
-#define stdc_leading_zeros(value) \
-        __stdbit_generic_type_func(leading_zeros, value)
-
-static inline unsigned int stdc_leading_ones_ull(unsigned long long value)
-{
-    return stdc_leading_zeros_ull(~value);
-}
-
-static inline unsigned int stdc_leading_ones_ul(unsigned long value)
-{
-    return stdc_leading_zeros_ul(~value);
-}
-
-static inline unsigned int stdc_leading_ones_ui(unsigned int value)
-{
-    return stdc_leading_zeros_ui(~value);
-}
-
-static inline unsigned int stdc_leading_ones_us(unsigned short value)
-{
-    return stdc_leading_zeros_us(~value);
-}
-
-static inline unsigned int stdc_leading_ones_uc(unsigned char value)
-{
-    return stdc_leading_zeros_uc(~value);
-}
-
-#define stdc_leading_ones(value) \
-        __stdbit_generic_type_func(leading_ones, value)
-
-#if defined (__GNUC__) || defined (__clang__)
-static inline unsigned int stdc_trailing_zeros_ull(unsigned long long value)
-{
-    return value ? (unsigned int)__builtin_ctzll(value)
-                 : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_ul(unsigned long value)
-{
-    return value ? (unsigned int)__builtin_ctzl(value)
-                 : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_ui(unsigned int value)
-{
-    return value ? (unsigned int)__builtin_ctz(value)
-                 : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_us(unsigned short value)
-{
-    return value ? (unsigned int)__builtin_ctz(value)
-                 : (CHAR_BIT * sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_uc(unsigned char value)
-{
-    return value ? (unsigned int)__builtin_ctz(value)
-                 : (CHAR_BIT * sizeof (value));
-}
-#else
-static inline unsigned int __stdc_trailing_zeros(unsigned long long value,
-                                                 unsigned int size)
-{
-    unsigned int zeros = 0;
-
-    if (!value)
-        return size * CHAR_BIT;
-
-    while ((value & 1) == 0) {
-        value >>= 1;
-        zeros++;
-    }
-
-    return zeros;
-}
-
-static inline unsigned int stdc_trailing_zeros_ull(unsigned long long value)
-{
-    return __stdc_trailing_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_ul(unsigned long value)
-{
-    return __stdc_trailing_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_ui(unsigned int value)
-{
-    return __stdc_trailing_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_us(unsigned short value)
-{
-    return __stdc_trailing_zeros(value, sizeof (value));
-}
-
-static inline unsigned int stdc_trailing_zeros_uc(unsigned char value)
-{
-    return __stdc_trailing_zeros(value, sizeof (value));
-}
-#endif
-
-#define stdc_trailing_zeros(value) \
-        __stdbit_generic_type_func(trailing_zeros, value)
-
-static inline unsigned int stdc_trailing_ones_ull(unsigned long long value)
-{
-    return stdc_trailing_zeros_ull(~value);
-}
-
-static inline unsigned int stdc_trailing_ones_ul(unsigned long value)
-{
-    return stdc_trailing_zeros_ul(~value);
-}
-
-static inline unsigned int stdc_trailing_ones_ui(unsigned int value)
-{
-    return stdc_trailing_zeros_ui(~value);
-}
-
-static inline unsigned int stdc_trailing_ones_us(unsigned short value)
-{
-    return stdc_trailing_zeros_us(~value);
-}
-
-static inline unsigned int stdc_trailing_ones_uc(unsigned char value)
-{
-    return stdc_trailing_zeros_uc(~value);
-}
-
-#define stdc_trailing_ones(value) \
-        __stdbit_generic_type_func(trailing_ones, value)
-
-static inline unsigned int stdc_first_leading_one_ull(unsigned long long value)
-{
-    return value ? (stdc_leading_zeros_ull(value) + 1) : 0;
-}
-
-static inline unsigned int stdc_first_leading_one_ul(unsigned long value)
-{
-    return value ? (stdc_leading_zeros_ul(value) + 1) : 0;
-}
-
-static inline unsigned int stdc_first_leading_one_ui(unsigned int value)
-{
-    return value ? (stdc_leading_zeros_ui(value) + 1) : 0;
-}
-
-static inline unsigned int stdc_first_leading_one_us(unsigned short value)
-{
-    return value ? (stdc_leading_zeros_us(value) + 1) : 0;
-}
-
-static inline unsigned int stdc_first_leading_one_uc(unsigned char value)
-{
-    return value ? (stdc_leading_zeros_uc(value) + 1) : 0;
-}
-
-#define stdc_first_leading_one(value) \
-        __stdbit_generic_type_func(first_leading_one, value)
-
-static inline unsigned int stdc_first_leading_zero_ull(unsigned long long value)
-{
-    return stdc_leading_ones_ull(~value);
-}
-
-static inline unsigned int stdc_first_leading_zero_ul(unsigned long value)
-{
-    return stdc_leading_ones_ul(~value);
-}
-
-static inline unsigned int stdc_first_leading_zero_ui(unsigned int value)
-{
-    return stdc_leading_ones_ui(~value);
-}
-
-static inline unsigned int stdc_first_leading_zero_us(unsigned short value)
-{
-    return stdc_leading_ones_us(~value);
-}
-
-static inline unsigned int stdc_first_leading_zero_uc(unsigned char value)
-{
-    return stdc_leading_ones_uc(~value);
-}
-
-#define stdc_first_leading_zero(value) \
-        __stdbit_generic_type_func(first_leading_zero, value)
-
-#if defined (__GNUC__) || defined (__clang__)
-static inline unsigned int stdc_first_trailing_one_ull(unsigned long long value)
-{
-    return __builtin_ffsll(value);
-}
-
-static inline unsigned int stdc_first_trailing_one_ul(unsigned long value)
-{
-    return __builtin_ffsl(value);
-}
-
-static inline unsigned int stdc_first_trailing_one_ui(unsigned int value)
-{
-    return __builtin_ffs(value);
-}
-
-static inline unsigned int stdc_first_trailing_one_us(unsigned short value)
-{
-    return __builtin_ffs(value);
-}
-
-static inline unsigned int stdc_first_trailing_one_uc(unsigned char value)
-{
-    return __builtin_ffs(value);
-}
-#else
-static inline unsigned int stdc_first_trailing_one_ull(unsigned long long value)
-{
-    return value ? (1 + stdc_trailing_zeros_ull(value)) : 0;
-}
-
-static inline unsigned int stdc_first_trailing_one_ul(unsigned long value)
-{
-    return value ? (1 + stdc_trailing_zeros_ul(value)) : 0;
-}
-
-static inline unsigned int stdc_first_trailing_one_ui(unsigned int value)
-{
-    return value ? (1 + stdc_trailing_zeros_ui(value)) : 0;
-}
-
-static inline unsigned int stdc_first_trailing_one_us(unsigned short value)
-{
-    return value ? (1 + stdc_trailing_zeros_us(value)) : 0;
-}
-
-static inline unsigned int stdc_first_trailing_one_uc(unsigned char value)
-{
-    return value ? (1 + stdc_trailing_zeros_uc(value)) : 0;
-}
-#endif
-
-#define stdc_first_trailing_one(value) \
-        __stdbit_generic_type_func(first_trailing_one, value)
-
-static inline unsigned int stdc_first_trailing_zero_ull(unsigned long long value)
-{
-    return stdc_first_trailing_one_ull(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_ul(unsigned long value)
-{
-    return stdc_first_trailing_one_ul(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_ui(unsigned int value)
-{
-    return stdc_first_trailing_one_ui(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_us(unsigned short value)
-{
-    return stdc_first_trailing_one_us(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_uc(unsigned char value)
-{
-    return stdc_first_trailing_one_uc(~value);
-}
-
-#define stdc_first_trailing_zero(value) \
-        __stdbit_generic_type_func(first_trailing_zero, value)
-
-#if defined (__GNUC__) || defined (__clang__)
-static inline unsigned int stdc_count_ones_ull(unsigned long long value)
-{
-    return __builtin_popcountll(value);
-}
-
-static inline unsigned int stdc_count_ones_ul(unsigned long value)
-{
-    return __builtin_popcountl(value);
-}
-
-static inline unsigned int stdc_count_ones_ui(unsigned int value)
-{
-    return __builtin_popcount(value);
-}
-
-static inline unsigned int stdc_count_ones_us(unsigned short value)
-{
-    return __builtin_popcount(value);
-}
-
-static inline unsigned int stdc_count_ones_uc(unsigned char value)
-{
-    return __builtin_popcount(value);
-}
-#else
-static inline unsigned int __stdc_count_ones(unsigned long long value,
-                                             unsigned int size)
-{
-    unsigned int ones = 0;
-
-    for (unsigned int c = 0; c < (size * CHAR_BIT); c++) {
-         ones += value & 1;
-         value >>= 1;
-    }
-
-    return ones;
-}
-
-static inline unsigned int stdc_count_ones_ull(unsigned long long value)
-{
-    return __stdc_count_ones(value, sizeof (value));
-}
-
-static inline unsigned int stdc_count_ones_ul(unsigned long value)
-{
-    return __stdc_count_ones(value, sizeof (value));
-}
-
-static inline unsigned int stdc_count_ones_ui(unsigned int value)
-{
-    return __stdc_count_ones(value, sizeof (value));
-}
-
-static inline unsigned int stdc_count_ones_us(unsigned short value)
-{
-    return __stdc_count_ones(value, sizeof (value));
-}
-
-static inline unsigned int stdc_count_ones_uc(unsigned char value)
-{
-    return __stdc_count_ones(value, sizeof (value));
-}
-#endif
-
-#define stdc_count_ones(value) \
-        __stdbit_generic_type_func(count_ones, value)
-
-static inline unsigned int stdc_count_zeros_ull(unsigned long long value)
-{
-    return stdc_count_ones_ull(~value);
-}
-
-static inline unsigned int stdc_count_zeros_ul(unsigned long value)
-{
-    return stdc_count_ones_ul(~value);
-}
-
-static inline unsigned int stdc_count_zeros_ui(unsigned int value)
-{
-    return stdc_count_ones_ui(~value);
-}
-
-static inline unsigned int stdc_count_zeros_us(unsigned short value)
-{
-    return stdc_count_ones_us(~value);
-}
-
-static inline unsigned int stdc_count_zeros_uc(unsigned char value)
-{
-    return stdc_count_ones_uc(~value);
-}
-
-#define stdc_count_zeros(value) \
-        __stdbit_generic_type_func(count_zeros, value)
-
-static inline bool stdc_has_single_bit_ull(unsigned long long value)
-{
-    return value && (value & (value - 1)) == 0;
-}
-
-static inline bool stdc_has_single_bit_ul(unsigned long value)
-{
-    return value && (value & (value - 1)) == 0;
-}
-
-static inline bool stdc_has_single_bit_ui(unsigned int value)
-{
-    return value && (value & (value - 1)) == 0;
-}
-
-static inline bool stdc_has_single_bit_us(unsigned short value)
-{
-    return value && (value & (value - 1)) == 0;
-}
-
-static inline bool stdc_has_single_bit_uc(unsigned char value)
-{
-    return value && (value & (value - 1)) == 0;
-}
-
-#define stdc_has_single_bit(value) \
-        __stdbit_generic_type_func(has_single_bit, value)
-
-static inline unsigned int stdc_bit_width_ull(unsigned long long value)
-{
-    return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ull(value);
-}
-
-static inline unsigned int stdc_bit_width_ul(unsigned long value)
-{
-    return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ul(value);
-}
-
-static inline unsigned int stdc_bit_width_ui(unsigned int value)
-{
-    return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ui(value);
-}
-
-static inline unsigned int stdc_bit_width_us(unsigned short value)
-{
-    return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_us(value);
-}
-
-static inline unsigned int stdc_bit_width_uc(unsigned char value)
-{
-    return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_uc(value);
-}
-
-#define stdc_bit_width(value) \
-        __stdbit_generic_type_func(bit_width, value)
-
-static inline unsigned long long stdc_bit_floor_ull(unsigned long long value)
-{
-    return value ? (1ULL << (stdc_bit_width_ull(value) - 1)) : 0ULL;
-}
-
-static inline unsigned long stdc_bit_floor_ul(unsigned long value)
-{
-    return value ? (1UL << (stdc_bit_width_ul(value) - 1)) : 0UL;
-}
-
-static inline unsigned int stdc_bit_floor_ui(unsigned int value)
-{
-    return value ? (1U << (stdc_bit_width_ui(value) - 1)) : 0U;
-}
-
-static inline unsigned short stdc_bit_floor_us(unsigned short value)
-{
-    return value ? (1U << (stdc_bit_width_us(value) - 1)) : 0U;
-}
-
-static inline unsigned int stdc_bit_floor_uc(unsigned char value)
-{
-    return value ? (1U << (stdc_bit_width_uc(value) - 1)) : 0U;
-}
-
-#define stdc_bit_floor(value) \
-        __stdbit_generic_type_func(bit_floor, value)
-
-/* NOTE: Bit ceiling undefines overflow. */
-static inline unsigned long long stdc_bit_ceil_ull(unsigned long long value)
-{
-    return 1ULL << (value ? stdc_bit_width_ull(value - 1) : 0);
-}
-
-static inline unsigned long stdc_bit_ceil_ul(unsigned long value)
-{
-    return 1UL << (value ? stdc_bit_width_ul(value - 1) : 0);
-}
-
-static inline unsigned int stdc_bit_ceil_ui(unsigned int value)
-{
-    return 1U << (value ? stdc_bit_width_ui(value - 1) : 0);
-}
-
-static inline unsigned short stdc_bit_ceil_us(unsigned short value)
-{
-    return 1U << (value ? stdc_bit_width_us(value - 1) : 0);
-}
-
-static inline unsigned int stdc_bit_ceil_uc(unsigned char value)
-{
-    return 1U << (value ? stdc_bit_width_uc(value - 1) : 0);
-}
-
-#define stdc_bit_ceil(value) \
-        __stdbit_generic_type_func(bit_ceil, value)
-
-#endif /* __STDC_VERSION_STDBIT_H__ */

compat/w32dlfcn.h

@@ -26,7 +26,6 @@
 
 #include "config.h"
 #include "libavutil/macros.h"
-#include "libavutil/mem.h"
 #include "libavutil/wchar_filename.h"
 
 static inline wchar_t *get_module_filename(HMODULE module)

compat/w32pthreads.h

@@ -35,6 +35,7 @@
  * As most functions here are used without checking return values,
  * only implement return values as necessary. */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
 #include <time.h>
@@ -44,14 +45,13 @@
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/time.h"
-#include "libavutil/wchar_filename.h"
 
 typedef struct pthread_t {
     void *handle;
     void *(*func)(void* arg);
     void *arg;
     void *ret;
-} *pthread_t;
+} pthread_t;
 
 /* use light weight mutex/condition variable API for Windows Vista and later */
 typedef SRWLOCK pthread_mutex_t;
@@ -66,16 +66,9 @@ typedef CONDITION_VARIABLE pthread_cond_t;
 #define PTHREAD_CANCEL_ENABLE 1
 #define PTHREAD_CANCEL_DISABLE 0
 
-#if HAVE_WINRT
-#define THREADFUNC_RETTYPE DWORD
-#else
-#define THREADFUNC_RETTYPE unsigned
-#endif
-
-static av_unused THREADFUNC_RETTYPE
-__stdcall attribute_align_arg win32thread_worker(void *arg)
+static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg)
 {
-    pthread_t h = (pthread_t)arg;
+    pthread_t *h = (pthread_t*)arg;
     h->ret = h->func(h->arg);
     return 0;
 }
@@ -83,35 +76,21 @@ __stdcall attribute_align_arg win32thread_worker(void *arg)
 static av_unused int pthread_create(pthread_t *thread, const void *unused_attr,
                                     void *(*start_routine)(void*), void *arg)
 {
-    pthread_t ret;
-
-    ret = av_mallocz(sizeof(*ret));
-    if (!ret)
-        return EAGAIN;
-
-    ret->func   = start_routine;
-    ret->arg    = arg;
+    thread->func   = start_routine;
+    thread->arg    = arg;
 #if HAVE_WINRT
-    ret->handle = (void*)CreateThread(NULL, 0, win32thread_worker, ret,
-                                      0, NULL);
+    thread->handle = (void*)CreateThread(NULL, 0, win32thread_worker, thread,
+                                           0, NULL);
 #else
-    ret->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, ret,
-                                        0, NULL);
+    thread->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, thread,
+                                           0, NULL);
 #endif
-
-    if (!ret->handle) {
-        av_free(ret);
-        return EAGAIN;
-    }
-
-    *thread = ret;
-
-    return 0;
+    return !thread->handle;
 }
 
 static av_unused int pthread_join(pthread_t thread, void **value_ptr)
 {
-    DWORD ret = WaitForSingleObject(thread->handle, INFINITE);
+    DWORD ret = WaitForSingleObject(thread.handle, INFINITE);
     if (ret != WAIT_OBJECT_0) {
         if (ret == WAIT_ABANDONED)
             return EINVAL;
@@ -119,9 +98,8 @@ static av_unused int pthread_join(pthread_t thread, void **value_ptr)
             return EDEADLK;
     }
     if (value_ptr)
-        *value_ptr = thread->ret;
-    CloseHandle(thread->handle);
-    av_free(thread);
+        *value_ptr = thread.ret;
+    CloseHandle(thread.handle);
     return 0;
 }
 
@@ -210,38 +188,4 @@ static inline int pthread_setcancelstate(int state, int *oldstate)
     return 0;
 }
 
-static inline int win32_thread_setname(const char *name)
-{
-#if !HAVE_UWP
-    typedef HRESULT (WINAPI *SetThreadDescriptionFn)(HANDLE, PCWSTR);
-
-    // Although SetThreadDescription lives in kernel32.dll, on Windows Server 2016,
-    // Windows 10 LTSB 2016 and Windows 10 version 1607, it was only available in
-    // kernelbase.dll. So, load it from there for maximum coverage.
-    HMODULE kernelbase = GetModuleHandleW(L"kernelbase.dll");
-    if (!kernelbase)
-        return AVERROR(ENOSYS);
-
-    SetThreadDescriptionFn pSetThreadDescription =
-        (SetThreadDescriptionFn)GetProcAddress(kernelbase, "SetThreadDescription");
-    if (!pSetThreadDescription)
-        return AVERROR(ENOSYS);
-
-    wchar_t *wname;
-    if (utf8towchar(name, &wname) < 0)
-        return AVERROR(ENOMEM);
-
-    HRESULT hr = pSetThreadDescription(GetCurrentThread(), wname);
-    av_free(wname);
-    return SUCCEEDED(hr) ? 0 : AVERROR(EINVAL);
-#else
-    // UWP is not supported because we cannot use LoadLibrary/GetProcAddress to
-    // detect the availability of the SetThreadDescription API. There is a small
-    // gap in Windows builds 1507-1607 where it was not available. UWP allows
-    // querying the availability of APIs with QueryOptionalDelayLoadedAPI, but it
-    // requires /DELAYLOAD:kernel32.dll during linking, and we cannot enforce that.
-    return AVERROR(ENOSYS);
-#endif
-}
-
 #endif /* COMPAT_W32PTHREADS_H */

doc/APIchanges

@@ -1,678 +1,7 @@
-The last version increases of all libraries were on 2025-03-28
+The last version increases of all libraries were on 2023-02-09
 
 API changes, most recent first:
 
-2025-07-29 - 1c85a3832af - lavc 62.10.100 - smpte_436m.h
-  Add a new public header smpte_436m.h with API for
-  manipulating AV_CODEC_ID_SMPTE_436M_ANC data.
-
-2025-07-10 - a566fcb9dc0 - lavf 62.2.100
-  mxf [de]muxer now uses AV_CODEC_ID_SMPTE_436M_ANC for
-  the vbi_vanc_smpte_436M streams instead of AV_CODEC_ID_NONE.
-
-2025-07-10 - f4ff379baea - lavc 62.10.100 - codec_id.h
-  Add AV_CODEC_ID_SMPTE_436M_ANC.
-
-2025-08-08 - 83b36f54108 - lavc 62.9.100 - codec_id.h
-  Add AV_CODEC_ID_PRORES_RAW.
-
-2025-07-31 - 119d127d05c - lavu 60.7.100 - spherical.h
-  Add AV_SPHERICAL_PARAMETRIC_IMMERSIVE.
-
-2025-07-20 - 157d3b007e9 - lavu 60.6.100 - attributes.h, avstring.h
-  Add av_scanf_format() and use it on av_sscanf().
-
-2025-07-18 - fbda5ffb953 - lavu 60.5.100 - pixfmt.h
-  Add AV_PIX_FMT_OHCODEC.
-
-2025-07-18 - fbda5ffb953 - lavu 60.5.100 - hwcontext.h
-  Add AV_HWDEVICE_TYPE_OHCODEC and AVOHCodecDeviceContext.
-
-2025-07-14 - b24155cae11 - lavfi 11.2.100 - avfilter.h
-  Add AVFilterGraph->max_buffered_frames.
-
-2025-07-07 - eca477da52 - lavc 62.6.100 - packet.h
-  Add AV_PKT_DATA_RTCP_SR.
-
-2025-07-01 - 39d5a998bd - lavc 62.4.101 - packet.h
-  Add AV_PKT_DATA_3D_REFERENCE_DISPLAYS.
-
-2025-07-01 - b2e4b0e282 - lavu 60.4.101 - frame.h
-  Add AV_FRAME_DATA_3D_REFERENCE_DISPLAYS.
-
-2025-07-01 - 80a05bea4f - lavu 60.4.100 - tdrdi.h
-  Add AV3DReferenceDisplaysInfo and AV3DReferenceDisplay structs.
-  Add av_tdrdi_alloc() and av_tdrdi_get_display().
-
-2025-05-21 - 004cc60f0e3 - lavu 60.3.100 - avassert.h
-  Add av_unreachable() and av_assume() macros.
-
-2025-02-15 - e2f39671ae2 - lavfi 10.10.100 - avfilter.h
-  Add avfilter_link_get_hw_frames_ctx().
-
-2025-04-21 - bf1579c904a - lavu 60.2.100 - log.h
-  Add AV_CLASS_CATEGORY_HWDEVICE.
-
-2025-04-16 - c818c67991 - libpostproc 59.1.100 - postprocess.h
-  Deprecate PP_CPU_CAPS_3DNOW.
-
-2025-04-07 - 19e9a203b7 - lavu 60.01.100 - dict.h
-  Add AV_DICT_DEDUP.
-
-2025-03-17 - 49af9746e8f - lavu 59.60.100 - pixfmt.h
-  Add AV_PIX_FMT_GBRAP32BE and AV_PIX_FMT_GBRAP32LE.
-
-2025-03-10 - 61fc9b6fee1 - lavu 59.59.100 - pixfmt.h
-  Add AV_PIX_FMT_YAF16BE, AV_PIX_FMT_YAF16LE, AV_PIX_FMT_YAF32BE,
-  and AV_PIX_FMT_YAF32LE.
-
-2025-03-01 - 0245e9382c7 - lavu 59.58.100 - pixfmt.h
-  Add AV_PIX_FMT_GRAY32BE and AV_PIX_FMT_GRAY32LE.
-
-2025-02-04 - 0ef678f5c50 - lavu 59.56.000 - pixfmt.h
-  Add AV_PIX_FMT_AMF_SURFACE.
-
-2025-01-09 - a73760da537 - lavu 59.55.100 - pixfmt.h
-  Add AV_PIX_FMT_GBRPF16BE, AV_PIX_FMT_GBRPF16LE, AV_PIX_FMT_GBRAPF16BE,
-  AV_PIX_FMT_GBRAPF16LE, AV_PIX_FMT_GRAYF16BE, and AV_PIX_FMT_GRAYF16LE.
-
-2025-02-16 - c79cdae3777 - lavu 59.57.100 - log.h
-  Add flags AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME.
-
-2025-02-09 - 9fb806fa577 - lavc 61.32.100 - codec_id.h
-  Add AV_CODEC_ID_IVTV_VBI.
-
-2025-01-25 - ea3c3b42dff - lavu 59.56.100 - frame.h
-  Add AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT.
-
-2025-01-25 - 6707d970c04 - lavfi 10.9.100 - buffersink.h
-  Add av_buffersink_get_side_data().
-
-2025-01-25 - 7a025e1cb5f - lavfi 10.8.100 - buffersrc.h
-  Add AVBufferSrcParameters.side_data and AVBufferSrcParameters.nb_side_data
-
-2025-01-25 - ef1cb1c9c81 - lavfi 10.7.100 - avfilter.h
-  Add AVFilterLink.side_data and AVFilterLink.nb_side_data
-
-2025-01-05 - 42e72d5c8b5 - lavu 59.55.100 - frame.h
-  Add AV_FRAME_SIDE_DATA_FLAG_NEW_REF.
-
-2025-01-05 - 19c95ecbff8 - lavc 61.31.100 - avcodec.h
-  Deprecate AVCodecContext->properties.
-
-2025-01-05 - 2d91f89445d - lavc 61.30.100 - frame.h
-  Add AV_FRAME_FLAG_LOSSLESS.
-
-2025-01-03 - f3c40826455 - lavc 61.29.100 - codec_id.h
-  Add AV_CODEC_ID_JPEGXL_ANIM.
-
-2025-01-03 - da9dcaba69d - lavu 59.54.100 - frame.h
-  Add AV_CH_LAYOUT_5POINT1POINT2 and AV_CHANNEL_LAYOUT_5POINT1POINT2.
-
-2024-12-23 - b88944a8aa5 - lavu 59.53.100 - frame.h
-  Add av_frame_side_data_remove_by_props().
-
-2024-12-23 - 3428a8d8303 - lavu 59.52.100 - frame.h
-  Add AV_SIDE_DATA_PROP_SIZE_DEPENDENT and AV_FRAME_DATA_PROP_COLOR_DEPENDENT.
-
-2024-12-23 - 45f0a7ad338 - lsws 8.13.100 - swscale.h
-  Add enum SwsIntent and SwsContext.intent.
-
-2024-12-15 - 2ac34d08542 - lavc 61.27.100 packet.h
-  Add av_container_fifo_alloc_avpacket().
-
-2024-12-15 - 56ba57b6725 - lavu 59.51.100 - refstruct.h container_fifo.h
-  Add a new public header refstruct.h with new API for
-  reference-counted objects.
-
-  Add a new public header container_fifo.h with new API for
-  a FIFO of container objects (e.g. AVFrame or AVPacket).
-
-2024-12-13 - 6eb4bf04e92 - lavu 59.50.100 - channel_layout.h
-  Add AV_CH_LAYOUT_9POINT1POINT6 and AV_CHANNEL_LAYOUT_9POINT1POINT6.
-
-2024-12-05 - 06f084468e0 - lavu 59.49.100 - csp.h
-  Add av_csp_itu_eotf() and av_csp_itu_eotf_inv().
-
-2024-12-05 - bf0a6c41111 - lavu 59.48.100 - csp.h
-  Add av_csp_trc_func_inv_from_id().
-
-2024-11-25 - 2a091d4f2ee - lsws 8.12.100 - swscale.h
-  Allow using sws_frame_scale() dynamically, without first initializing the
-  SwsContext. Deprecate sws_init_context(). Add sws_frame_setup() instead.
-
-2024-11-25 - fb169640092 - lsws 8.11.100 - swscale.h
-  Replace #define-based SWS_* flags by enum SwsFlags.
-
-2024-11-25 - ed5dd675624 - lsws 8.10.100 - swscale.h
-  Publicly expose struct SwsContext, enum SwsDither, and enum SwsAlphaBlend.
-
-2024-11-16 - 46cb7b8d9dc - lavu 59.47.101 - frame.h
-  av_frame_get_buffer() now also aligns the data pointers according to
-  the requested alignment.
-
-2024-11-13 - 20af68b63a4 - lavu 59.47.100 - channel_layout.h
-  Add AV_CHAN_BINAURAL_LEFT, AV_CHAN_BINAURAL_RIGHT
-  Add AV_CH_BINAURAL_LEFT, AV_CH_BINAURAL_RIGHT
-  Add AV_CH_LAYOUT_BINAURAL, AV_CHANNEL_LAYOUT_BINAURAL
-
-2024-10-26 - e02a3b40a5e - lavu 59.46.100 - pixfmt.h
-  Add AV_PIX_FMT_XV48.
-
-2024-10-23 - b03c758600f - lsws 8.9.100 - swscale.h
-  Add sws_is_noop().
-
-2024-10-23 - 5e50a56b9c4 - lsws 8.8.100 - swscale.h
-  Add frame property testing API:
-    - sws_test_format()
-    - sws_test_colorspace()
-    - sws_test_primaries()
-    - sws_test_transfer()
-    - sws_test_frame()
-
-2024-10-23 - 87baf9ab2c2 - lsws 8.7.100 - swscale.h
-  Add sws_free_context().
-
-2024-10-23 - f462ba05f54 - lavu 59.45.100 - pixfmt.h
-  Add AV_PIX_FMT_Y216.
-
-2024-10-15 - 2336e685657 - lavu 59.44.100 - pixfmt.h
-  Add AV_PIX_FMT_RGB96 and AV_PIX_FMT_RGBA128.
-
-2024-10-14 - c993a91bea - lavu 59.43.100 - pixfmt.h
-  Add AV_PIX_FMT_RGBF16.
-
-2024-10-08 - 29ea34728f1 - lavu 59.42.100 - pixfmt.h
-  Add AV_PIX_FMT_AYUV, AV_PIX_FMT_UYVA, AV_PIX_FMT_VYU444,
-  and AV_PIX_FMT_V30X.
-
-2024-10-01 - 0548ab2e425 - lavu 59.41.100 - log.h
-  Add AVClass.state_flags_offset and AV_CLASS_STATE_INITIALIZED.
-
-2024-09-30 - 50d1b89fa0d - lavf 61.9.100 - avformat.h
-  Add {nb_}coded_side_data to AVStreamGroupTileGrid.
-
-2024-09-30 - df9b80d21a2 - lavu 59
-  Deprecate av_int_list_length_for_size(), av_int_list_length(), and
-  av_opt_set_int_list() without replacement. All AVOptions using these
-  should be replaced with AV_OPT_TYPE_FLAG_ARRAY.
-
-2024-09-30 - 1efcdbc54d9 - lavfi 10.6.100
-  Buffersink now has array-type options
-    - pixel_formats
-    - colorspaces
-    - colorranges
-  replacing the int-list options
-    - pix_fmts
-    - color_spaces
-    - color_ranges
-  abuffersink now has array-type options
-    - sample_formats
-    - samplerates
-    - channel_layouts
-  replacing the int-list/string options
-    - sample_fmts
-    - sample_rates
-    - ch_layouts
-
--------- 8< --------- FFmpeg 7.1 was cut here -------- 8< ---------
-
-2024-09-23 - 6940a6de2f0 - lavu 59.38.100 - frame.h
-  Add AV_FRAME_DATA_VIEW_ID.
-
-2024-09-23 - 6147385393a - lavc 61.18.100 - avcodec.h
-  Add a new flag AV_CODEC_EXPORT_DATA_ENHANCEMENTS for export_side_data.
-
-2024-09-18 - df609af8e44 - lavc 61.17.100 - packet.h
-  Add AV_PKT_DATA_LCEVC.
-
-2024-09-18 - ba0ef0860f0 - lavf 61.5.100 - avformat.h
-  Add AVStreamGroupLCEVC
-  Add AV_STREAM_GROUP_PARAMS_LCEVC
-  Add AVStreamGroup.params.lcevc
-
-2024-09-18 - 58963182294 - lavc 61.16.100 - avcodec.h
-  Add AV_CODEC_ID_LCEVC.
-
-2024-09-18 - 90d12c24c51 - lavu 59.37.100 - frame.h
-  Add AV_FRAME_DATA_LCEVC.
-
-2024-09-08 - 3305767560a - lavc 61.13.100 - avcodec.h
-  Add avcodec_get_supported_config() and enum AVCodecConfig; deprecate
-  AVCodec.pix_fmts, AVCodec.sample_fmts, AVCodec.supported_framerates,
-  AVCodec.supported_samplerates and AVCodec.ch_layouts.
-
-2024-09-06 - c35a51f4bb1 - lavc 61.12.100 - defs.h
-  Add AV_PROFILE_HEVC_MULTIVIEW_MAIN
-
-2024-09-06 - 450a3f58edb - lavu 59.36.100 - opt.h
-  Add av_opt_set_array() and AV_OPT_ARRAY_REPLACE.
-
-2024-08-27 - d89930f8666 - lavu 59.35.100 - opt.h
-  Add av_opt_get_array_size() and av_opt_get_array().
-
-2024-08-18 - 8657eb9c3f4 - lavc 61.11.100 - avcodec.h
-  Clarify the documentation for get_buffer*() functions, making it
-  clear that the memory returned by them should not contain sensitive
-  information. This is not a change in the API, it is how it already worked
-  before.
-
-2024-08-10 - 5f0f1f7b7a6 - lavu 59.34.100 - hwcontext_vulkan.h
-  Add qf and nb_qf to AVVulkanDeviceContext.
-  Deprecate queue_family_index, nb_graphics_queues,
-  queue_family_tx_index, nb_tx_queues.
-  queue_family_comp_index, nb_comp_queues.
-  queue_family_encode_index, nb_encode_queues.
-  queue_family_decode_index, and nb_decode_queues,
-  from AVVulkanDeviceContext.
-
-2024-07-30 - e0f9f4d4915 - lavu 59.32.100 - cpu.h
-  Deprecate AV_CPU_FLAG_RVF and AV_CPU_FLAG_RVD without replacement.
-  Deprecate AV_CPU_FLAG_RVB_ADDR, subsumed into AV_CPU_FLAG_RVB.
-
-2024-07-29 - 753f2aeed76 - lavu 59.31.100 - intreadwrite.h
-  Add AV_{R,W}{L,B}{16,32}A and AV_{R,W}B64A.
-
-2024-07-28 - cbea92c84d4 - lavu 59.30.100 - dovi_meta.h
-  Add AVDOVIDecoderConfigurationRecord.dv_md_compression.
-
-2024-07-25 - 45d7078a218 - lavu 59.29.100 - cpu.h
-  Add AV_CPU_FLAG_RVB.
-
-2024-07-xx - xxxxxxxxxx - lavf 61 - avformat.h
-  Deprecate avformat_transfer_internal_stream_timing_info()
-  and av_stream_get_codec_timebase() without replacement.
-
-2024-07-08 - 1b58f3af30c - lavc 61.10.100 - packet.h
-  Add AV_PKT_DATA_FRAME_CROPPING.
-
-2024-07-07 - 46f7ea44563 - lavf 61.5.100 - avformat.h
-  Add AV_DISPOSITION_MULTILAYER
-
-2024-07-02 - d822146f4fc - lavu 59.28.100 - hwcontext_d3d12va.h
-  Add AVD3D12VAFramesContext.flags
-
-2024-06-28 - 8af0919cc66 - lavu 59.27.100 - stereo3d.h
-  Add AV_STEREO3D_UNSPEC and AV_STEREO3D_VIEW_UNSPEC.
-
-2024-06-25 - e6baf4f3841 - lavu 59.26.100 - stereo3d.h
-  Add av_stereo3d_alloc_size().
-
-2024-06-19 - cc587e69c6f - lavu 59.25.100 - dovi_meta.h
-  Add AVDOVIRpuDataHeader.ext_mapping_idc_0_4 and ext_mapping_idc_5_7.
-
-2024-06-18 - cf2436a0b4d - lavu 59.24.100 - stereo3d.h
-  Add primary_eye, baseline, horizontal_disparity_adjustment, and
-  horizontal_field_of_view fields to AVStereo3D.
-  Add AVStereo3DPrimaryEye.
-  Add av_stereo3d_view_name.
-  Add av_stereo3d_view_from_name.
-  Add av_stereo3d_primary_eye_name.
-  Add av_stereo3d_primary_eye_from_name.
-
-2024-06-18 - 57bfba35d6b - lavu 59.23.100 - spherical.h
-  Add AV_SPHERICAL_HALF_EQUIRECTANGULAR, AV_SPHERICAL_RECTILINEAR, and
-  AV_SPHERICAL_FISHEYE values to AVSphericalProjection, and initialize
-  to AV_SPHERICAL_RECTILINEAR on alloc.
-
-2024-06-13 - 39c90d6466a - lavu 59.22.100 - common.h
-  Deprecate av_mod_uintp2[_c]() and replace it with av_zero_extend[_c]().
-
-2024-06-08 - 91fd6ca000c - lavc 61.7.100 - defs.h
-  Add AV_PROFILE_AAC_USAC.
-
-2024-06-02 - 63e166d8028 - lavu 59.21.100 - channel_layout.h
-  Add AV_CHAN_SIDE_SURROUND_RIGHT and AV_CH_SIDE_SURROUND_LEFT.
-  Add AV_CHAN_SIDE_SURROUND_RIGHT and AV_CH_SIDE_SURROUND_RIGHT.
-  Add AV_CHAN_TOP_SURROUND_LEFT and AV_CH_TOP_SURROUND_LEFT.
-  Add AV_CHAN_TOP_SURROUND_RIGHT and AV_CH_TOP_SURROUND_RIGHT.
-
-2024-05-23 - 8c974494822 - lavu 59.20.100 - channel_layout.h
-  Add av_channel_layout_ambisonic_order().
-
-2024-05-20 - 4c0bb7d4a91 - lavu 59.19.100 - hwcontext_qsv.h
-  Add AVQSVFramesContext.info
-
-2024-05-10 - 01c5f4ad9fa - lavu 59.18.100 - cpu.h
-  Add AV_CPU_FLAG_RV_ZVBB.
-
-2024-05-04 - d053290d8dd - lavu 59.17.100 - opt.h
-  Add AV_OPT_TYPE_UINT and av_opt_eval_uint().
-
-2024-04-24 - 8616cfe0890 - lavu 59.16.100 - opt.h
-  Add AV_OPT_SERIALIZE_SEARCH_CHILDREN.
-
-2024-04-11 - 6d0c89980c7 - lavc 61.5.102 - avcodec.h
-  AVCodecContext.decoded_side_data may now be set by libavcodec after
-  calling avcodec_open2().
-
-2024-04-11 - 6d760c666d5 - lavu 59.15.100 - frame.h
-  Add av_mastering_display_metadata_alloc_size().
-
-2024-04-11 - adb67bba064 - lavu 59.14.100 - frame.h
-  Add av_frame_side_data_add() and av_frame_side_data_remove().
-  Add AV_FRAME_SIDE_DATA_FLAG_REPLACE.
-
-2024-04-03 - 29561c8e2d4 - lavu 59.13.100 - pixfmt.h
-  Add AVCOL_SPC_IPT_C2, AVCOL_SPC_YCGCO_RE and AVCOL_SPC_YCGCO_RO
-  to map new matrix coefficients defined by H.273 v3.
-
-2024-04-03 - 4f55e16f2bc - lavu 59.12.100 - dovi_meta.h
-  Add AVDOVIMetadata.ext_block_{offset,size}, AVDOVIMetadata.num_ext_blocks,
-  AVDOVIDmData and AVDOVIDmLevel{1..6,8..11,254..255}, av_dovi_get_ext()
-  and av_dovi_find_level().
-
-2024-04-03 - 78076ede296 - lavu 59.11.100 - dovi_meta.h
-  Add AVDOVIDataMapping.nlq_pivots.
-
-2024-03-29 - ed9363052f4 - lavf 61.3.100 - avformat.h
-  Add AVFormatContext.duration_probesize.
-
-2024-03-27 - 2621be35397 - lavu 59.10.100 - frame.h
-  Add AVSideDataDescriptor, enum AVSideDataProps, and
-  av_frame_side_data_desc().
-
--------- 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
-  Add AV_CH_LAYOUT_3POINT1POINT2 and AV_CHANNEL_LAYOUT_3POINT1POINT2.
-  Add AV_CH_LAYOUT_5POINT1POINT2_BACK and AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK.
-  Add AV_CH_LAYOUT_5POINT1POINT4_BACK and AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK.
-  Add AV_CH_LAYOUT_7POINT1POINT2 and AV_CHANNEL_LAYOUT_7POINT1POINT2.
-  Add AV_CH_LAYOUT_7POINT1POINT4_BACK and AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK.
-
-2023-10-06 - 804be7f9e3c - lavc 60.30.101 - avcodec.h
-  AVCodecContext.coded_side_data may now be used during decoding, to be set
-  by user before calling avcodec_open2() for initialization.
-
-2023-10-06 - 5432d2aacad - lavc 60.15.100 - avformat.h
-  Deprecate AVFormatContext.{nb_,}side_data, av_stream_add_side_data(),
-  av_stream_new_side_data(), and av_stream_get_side_data(). Side data fields
-  from AVFormatContext.codecpar should be used from now on.
-
-2023-10-06 - 21d7cc6fa9a - lavc 60.30.100 - codec_par.h
-  Added {nb_,}coded_side_data to AVCodecParameters.
-  The AVCodecParameters helpers will copy it to and from its AVCodecContext
-  namesake.
-
-2023-10-06 - 74279227dd2 - lavc 60.29.100 - packet.h
-  Added av_packet_side_data_new(), av_packet_side_data_add(),
-  av_packet_side_data_get(), av_packet_side_data_remove, and
-  av_packet_side_data_free().
-
-2023-10-03 - ea14e8bc302 - lavc 60.28.100 - codec_par.h defs.h
-  Move the definition of enum AVFieldOrder from codec_par.h to defs.h.
-
-2023-10-03 - dd48e49d547 - lavf 60.14.100 - avformat.h
-  Deprecate AVFMT_ALLOW_FLUSH without replacement. Users can always
-  flush any muxer by sending a NULL packet.
-
-2023-09-28 - 8e1ef7c38f6 - lavu 58.27.100 - pixfmt.h
-  Add AV_PIX_FMT_GBRAP14BE, AV_PIX_FMT_GBRAP14LE pixel formats.
-
-2023-09-28 - 05f8b2ca0f7 - lavu 58.26.100 - hwcontext_cuda.h
-  Add AV_CUDA_USE_CURRENT_CONTEXT.
-
-2023-09-19 - ba9cd06c763 - lavu 58.25.100 - avutil.h
-  Make AV_TIME_BASE_Q compatible with C++.
-
-2023-09-18 - 85e075587dc - lavf 60 - avformat.h
-  Deprecate AVFMT_FLAG_SHORTEST without replacement.
-
-2023-09-07 - 423b6a7e493 - lavu 58.24.100 - imgutils.h
-  Add av_image_copy2(), a wrapper around the av_image_copy()
-  to overcome limitations of automatic conversions.
-
-2023-09-07 - 5094d1f429e - lavu 58.23.100 - fifo.h
-  Constify the AVFifo pointees in av_fifo_peek() and av_fifo_peek_to_cb().
-
-2023-09-07 - fa4bf5793a0 - lavu 58.22.100 - audio_fifo.h
-  Constify some pointees in av_audio_fifo_write(), av_audio_fifo_read(),
-  av_audio_fifo_peek() and av_audio_fifo_peek_at().
-
-2023-09-07 - 9bf31f60960 - lavu 58.21.100 - samplefmt.h
-  Constify some pointees in av_samples_copy() and av_samples_set_silence().
-
-2023-09-07 - 41285890e03 - lavu 58.20.100 - imgutils.h
-  Constify some pointees in av_image_copy(), av_image_copy_uc_from() and
-  av_image_fill_black().
-
-2023-09-07 - 2a68d945cd7 - lavf 60.12.100 - avio.h
-  Constify the buffer pointees in the write_packet and write_data_type
-  callbacks of AVIOContext on the next major bump.
-
-2023-09-07 - 8238bc0b5e3 - lavc 60.26.100 - defs.h
-  Add AV_PROFILE_* and AV_LEVEL_* replacements in defs.h for the
-  defines from avcodec.h. The latter are deprecated.
-
-2023-09-06 - b6627a57f41 - lavc 60.25.101 - avcodec.h
-  AVCodecContext.rc_buffer_size may now be set by decoders.
-
-2023-09-02 - 25ecc94d58f - lavu 58.19.100 - executor.h
-  Add AVExecutor API
-
-2023-09-01 - 139e54911c8 - lavc 60.25.100 - avfft.h
-  The entire header will be deprecated and removed in two major bumps.
-  For a replacement to av_dct, av_rdft, av_fft and av_mdct, use
-  the new API from libavutil/tx.h.
-
-2023-09-01 - 11e22730e1e - lavu 58.18.100 - tx.h
-  Add AV_TX_REAL_TO_REAL and AV_TX_REAL_TO_IMAGINARY
-
-2023-08-18 - ff094f5ebbd - lavu 58.17.100 - channel_layout.h
-  All AV_CHANNEL_LAYOUT_* macros are now compatible with C++ 17 and older.
-
-2023-08-08 - 5012b4ab4ca - lavu 58.15.100 - video_hint.h
-  Add AVVideoHint API.
-
-2023-08-08 - 5012b4ab4ca - lavc 60 - avcodec.h
-  Deprecate AV_CODEC_FLAG_DROPCHANGED without replacement.
-
-2023-07-05 - d694c25b44c - lavu 58.14.100 - random_seed.h
-  Add av_random_bytes()
-
-2023-05-29 - 637afea88ed - lavc 60.16.100 - avcodec.h codec_id.h
-  Add AV_CODEC_ID_EVC, FF_PROFILE_EVC_BASELINE, and FF_PROFILE_EVC_MAIN.
-
-2023-05-29 - 75918016ab1 - lavu 58.12.100 - mathematics.h
-  Add av_bessel_i0()
-
-2023-05-29 - f3795e18574 - lavc 60.15.100 - avcodec.h
-  Add AVHWAccel.update_thread_context, AVHWAccel.free_frame_priv,
-  AVHWAccel.flush.
-
-2023-05-29 - db1d0227812 - lavu 58.11.100 - hwcontext_vulkan.h
-  Add AVVulkanDeviceContext.lock_queue, AVVulkanDeviceContext.unlock_queue,
-  AVVulkanFramesContext.format, AVVulkanFramesContext.lock_frame,
-  AVVulkanFramesContext.unlock_frame, AVVkFrame.queue_family.
-  Deprecate AV_VK_FRAME_FLAG_CONTIGUOUS_MEMORY (use multiplane images instead).
-
-2023-05-29 - bef86ba86cc - lavu 58.10.100 - pixfmt.h
-  Add AV_PIX_FMT_P212BE, AV_PIX_FMT_P212LE, AV_PIX_FMT_P412BE,
-  AV_PIX_FMT_P412LE.
-
-2023-05-18 - 01d444c077e - lavu 58.8.100 - frame.h
-  Add av_frame_replace().
-
-2023-05-18 - 63767b79a57 - lavu 58 - frame.h
-  Deprecate AVFrame.palette_has_changed without replacement.
-
-2023-05-15 - 7d1d61cc5f5 - lavc 60 - avcodec.h
-  Deprecate AVCodecContext.ticks_per_frame in favor of
-  AVCodecContext.framerate (encoding) and
-  AV_CODEC_PROP_FIELDS (decoding).
-
-2023-05-15 - 70433abf7fb - lavc 60.12.100 - codec_desc.h
-  Add AV_CODEC_PROP_FIELDS.
-
-2023-05-15 - 8b20d0dcb5c - lavc 60 - codec.h
-  Deprecate AV_CODEC_CAP_SUBFRAMES without replacement.
-
-2023-05-07 - c2ae8e30b7f - lavc 60.11.100 - codec_par.h
-  Add AVCodecParameters.framerate.
-
-2023-05-04 - 0fc9c1f6828 - lavu 58.7.100 - frame.h
-  Deprecate AVFrame.interlaced_frame, AVFrame.top_field_first, and
-  AVFrame.key_frame.
-  Add AV_FRAME_FLAG_INTERLACED, AV_FRAME_FLAG_TOP_FIELD_FIRST, and
-  AV_FRAME_FLAG_KEY flags as replacement.
-
-2023-04-10 - 4eaaa38d3df - lavu 58.6.100 - frame.h
-  av_frame_get_plane_buffer() now accepts const AVFrame*.
-
-2023-04-04 - 61b27b15fc9 - lavu 58.6.100 - hdr_dynamic_metadata.h
-  Add AV_HDR_PLUS_MAX_PAYLOAD_SIZE.
-  av_dynamic_hdr_plus_create_side_data() now accepts a user provided
-  buffer.
-
-2023-03-24 - 632c3499319 - lavfi 9.5.100 - avfilter.h
-  Add AVFILTER_FLAG_HWDEVICE.
-
-2023-03-21 - 0a3ce5f7384 - lavu 58.5.100 - hdr_dynamic_metadata.h
-  Add av_dynamic_hdr_plus_from_t35() and av_dynamic_hdr_plus_to_t35()
-  functions to convert between raw T.35 payloads containing dynamic
-  HDR10+ metadata and their parsed representations as AVDynamicHDRPlus.
-
-2023-03-17 - 3be46ee7672 - lavu 58.4.100 - hdr_dynamic_vivid_metadata.h
-  Add two group of three spline params.
-  Deprecate previous define which only supports one group of params.
-
-2023-03-02 - 373ef1c4fae - lavc 60.6.100 - avcodec.h
-  Add FF_PROFILE_EAC3_DDP_ATMOS, FF_PROFILE_TRUEHD_ATMOS,
-  FF_PROFILE_DTS_HD_MA_X and FF_PROFILE_DTS_HD_MA_X_IMAX.
-
-2023-02-25 - f4593775436 - lavc 60.5.100 - avcodec.h
-  Add FF_PROFILE_HEVC_SCC.
-
 -------- 8< --------- FFmpeg 6.0 was cut here -------- 8< ---------
 
 2023-02-16 - 927042b409 - lavf 60.2.100 - avformat.h

doc/Doxyfile

@@ -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.0.2
 
 # 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
@@ -1093,7 +1093,7 @@ HTML_STYLESHEET        =
 # cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
+# standard style sheet and is therefor more robust against future updates.
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra stylesheet files is of importance (e.g. the last
 # stylesheet in the list overrules the setting of the previous ones in the
@@ -1636,7 +1636,7 @@ EXTRA_PACKAGES         =
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
 # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
 # for the replacement values of the other commands the user is referred to
 # HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

doc/Makefile

@@ -19,7 +19,6 @@ MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
 MANPAGES    = $(MANPAGES1) $(MANPAGES3)
 PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
 HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
-              doc/community.html                                        \
               doc/developer.html                                        \
               doc/faq.html                                              \
               doc/fate.html                                             \
@@ -60,7 +59,7 @@ GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
 
 $(GENTEXI): TAG = GENTEXI
 $(GENTEXI): doc/avoptions_%.texi: doc/print_options$(HOSTEXESUF)
-	$(M)doc/print_options$(HOSTEXESUF) $* > $@
+	$(M)doc/print_options $* > $@
 
 doc/%.html: TAG = HTML
 doc/%-all.html: TAG = HTML

doc/bitstream_filters.texi

@@ -101,29 +101,6 @@ Remove zero padding at the end of a packet.
 Extract the core from a DCA/DTS stream, dropping extensions such as
 DTS-HD.
 
-@section dovi_rpu
-
-Manipulate Dolby Vision metadata in a HEVC/AV1 bitstream, optionally enabling
-metadata compression.
-
-@table @option
-@item strip
-If enabled, strip all Dolby Vision metadata (configuration record + RPU data
-blocks) from the stream.
-@item compression
-Which compression level to enable.
-@table @samp
-@item none
-No metadata compression.
-@item limited
-Limited metadata compression scheme. Should be compatible with most devices.
-This is the default.
-@item extended
-Extended metadata compression. Devices are not required to support this. Note
-that this level currently behaves the same as @samp{limited} in libavcodec.
-@end table
-@end table
-
 @section dump_extra
 
 Add extradata to the beginning of the filtered packets except when
@@ -189,52 +166,6 @@ see page 44-46 or section 5.5 of
 
 Extract the core from a E-AC-3 stream, dropping extra channels.
 
-@section eia608_to_smpte436m
-
-Convert from a @code{EIA_608} stream to a @code{SMPTE_436M_ANC} data stream, wrapping the closed captions in CTA-708 CDP VANC packets.
-
-@table @option
-@item line_number
-Choose which line number the generated VANC packets should go on. You generally want either line 9 (the default) or 11.
-@item wrapping_type
-Choose the SMPTE 436M wrapping type, defaults to @samp{vanc_frame}.
-It accepts the values:
-@table @samp
-@item vanc_frame
-VANC frame (interlaced or segmented progressive frame)
-@item vanc_field_1
-@item vanc_field_2
-@item vanc_progressive_frame
-@end table
-@item sample_coding
-Choose the SMPTE 436M sample coding, defaults to @samp{8bit_luma}.
-It accepts the values:
-@table @samp
-@item 8bit_luma
-8-bit component luma samples
-@item 8bit_color_diff
-8-bit component color difference samples
-@item 8bit_luma_and_color_diff
-8-bit component luma and color difference samples
-@item 10bit_luma
-10-bit component luma samples
-@item 10bit_color_diff
-10-bit component color difference samples
-@item 10bit_luma_and_color_diff
-10-bit component luma and color difference samples
-@item 8bit_luma_parity_error
-8-bit component luma samples with parity error
-@item 8bit_color_diff_parity_error
-8-bit component color difference samples with parity error
-@item 8bit_luma_and_color_diff_parity_error
-8-bit component luma and color difference samples with parity error
-@end table
-@item initial_cdp_sequence_cntr
-The initial value of the CDP's 16-bit unsigned integer @code{cdp_hdr_sequence_cntr} and @code{cdp_ftr_sequence_cntr} fields. Defaults to 0.
-@item cdp_frame_rate
-Set the CDP's @code{cdp_frame_rate} field. This doesn't actually change the timing of the data stream, it just changes the values inserted in that field in the generated CDP packets. Defaults to @samp{30000/1001}.
-@end table
-
 @section extract_extradata
 
 Extract the in-band extradata.
@@ -268,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.
@@ -289,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.
@@ -469,21 +378,9 @@ Please note that this filter is auto-inserted for MPEG-TS (muxer
 
 @section h264_redundant_pps
 
-This applies a specific fixup to some Blu-ray BDMV H264 streams
-which contain redundant PPSs. The PPSs modify irrelevant parameters
-of the stream, confusing other transformations which require
-the correct extradata.
-
-The encoder used on these impacted streams adds extra PPSs throughout
-the stream, varying the initial QP and whether weighted prediction
-was enabled. This causes issues after copying the stream into
-a global header container, as the starting PPS is not suitable
-for the rest of the stream. One side effect, for example,
-is seeking will return garbled output until a new PPS appears.
-
-This BSF removes the extra PPSs and rewrites the slice headers
-such that the stream uses a single leading PPS in the global header,
-which resolves the issue.
+This applies a specific fixup to some Blu-ray streams which contain
+redundant PPSs modifying irrelevant parameters of the stream which
+confuse other transformations which require correct extradata.
 
 @section hevc_metadata
 
@@ -537,10 +434,6 @@ will replace the current ones if the stream is already cropped.
 These fields are set in pixels.  Note that some sizes may not be
 representable if the chroma is subsampled (H.265 section 7.4.3.2.1).
 
-@item width
-@item height
-Set width and height after crop.
-
 @item level
 Set the level in the VPS and SPS.  See H.265 section A.4 and tables
 A.6 and A.7.
@@ -635,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.
@@ -754,12 +651,12 @@ ffmpeg -i INPUT -c copy -bsf noise=1 output.mkv
 Drop every video packet not marked as a keyframe after timestamp 30s but do not
 modify any of the remaining packets.
 @example
-ffmpeg -i INPUT -c copy -bsf:v noise=drop='gt(pts*tb\,30)*not(key)' output.mkv
+ffmpeg -i INPUT -c copy -bsf:v noise=drop='gt(t\,30)*not(key)' output.mkv
 @end example
 
 Drop one second of audio every 10 seconds and add some random noise to the rest.
 @example
-ffmpeg -i INPUT -c copy -bsf:a noise=amount=-1:drop='between(mod(pts*tb\,10)\,9\,10)' output.mkv
+ffmpeg -i INPUT -c copy -bsf:a noise=amount=-1:drop='between(mod(t\,10)\,9\,10)' output.mkv
 @end example
 
 @section null
@@ -985,20 +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.
-
-@section smpte436m_to_eia608
-
-Convert from a @code{SMPTE_436M_ANC} data stream to a @code{EIA_608} stream,
-extracting the closed captions from CTA-708 CDP VANC packets, and ignoring all other data.
-
 @anchor{text2movsub}
 @section text2movsub
 

doc/build_system.txt

@@ -30,13 +30,6 @@ fate
 fate-list
     List all fate/regression test targets.
 
-fate-list-failing
-    List the fate tests that failed the last time they were executed.
-
-fate-clear-reports
-    Remove the test reports from previous test executions (getting rid of
-    potentially stale results from fate-list-failing).
-
 install
     Install headers, libraries and programs.
 
@@ -70,3 +63,4 @@ 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.
+

doc/codecs.texi

@@ -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,
@@ -664,8 +664,6 @@ for codecs that support it. At present, those are H.264 and VP9.
 @item film_grain
 Export film grain parameters through frame side data (see @code{AV_FRAME_DATA_FILM_GRAIN_PARAMS}).
 Supported at present by AV1 decoders.
-@item enhancements
-Export picture enhancement metadata through frame side data, e.g. LCEVC (see @code{AV_FRAME_DATA_LCEVC}).
 @end table
 
 @item threads @var{integer} (@emph{decoding/encoding,video})
@@ -699,13 +697,10 @@ profiles are documented in the relevant encoder documentation.
 
 @item level @var{integer} (@emph{encoding,audio,video})
 
-Set the encoder level. This level depends on the specific codec, and
-might correspond to the profile level. It is set by default to
-@samp{unknown}.
-
 Possible values:
 @table @samp
 @item unknown
+
 @end table
 
 @item lowres @var{integer} (@emph{decoding,audio,video})
@@ -769,11 +764,18 @@ 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})
+@item ticks_per_frame @var{integer} (@emph{decoding/encoding,audio,video})
 
 @item color_primaries @var{integer} (@emph{decoding/encoding,video})
 Possible values:
@@ -888,11 +890,9 @@ Possible values:
 @table @samp
 @item tv
 @item mpeg
-@item limited
 MPEG (219*2^(n-8))
 @item pc
 @item jpeg
-@item full
 JPEG (2^n-1)
 @end table
 

doc/community.texi

@@ -1,182 +0,0 @@
-\input texinfo @c -*- texinfo -*-
-@documentencoding UTF-8
-
-@settitle Community
-@titlepage
-@center @titlefont{Community}
-@end titlepage
-
-@top
-
-@contents
-
-@anchor{Organisation}
-@chapter Organisation
-
-The FFmpeg project is organized through a community working on global consensus.
-
-Decisions are taken by the ensemble of active members, through voting and are aided by two committees.
-
-@anchor{General Assembly}
-@chapter General Assembly
-
-The ensemble of active members is called the General Assembly (GA).
-
-The General Assembly is sovereign and legitimate for all its decisions regarding the FFmpeg project.
-
-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.
-
-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.
-
-A script to generate the current members of the general assembly (minus members voted in) can be found in `tools/general_assembly.pl`.
-
-@anchor{Voting}
-@chapter Voting
-
-Voting is done using a ranked voting system, currently running on https://vote.ffmpeg.org/ .
-
-Majority vote means more than 50% of the expressed ballots.
-
-@anchor{Technical Committee}
-@chapter Technical Committee
-
-The Technical Committee (TC) is here to arbitrate and make decisions when technical conflicts occur in the project. They will consider the merits of all the positions, judge them and make a decision.
-
-The TC resolves technical conflicts but is not a technical steering committee.
-
-Decisions by the TC are binding for all the contributors.
-
-Decisions made by the TC can be re-opened after 1 year or by a majority vote of the General Assembly, requested by one of the member of the GA.
-
-The TC is elected by the General Assembly for a duration of 1 year, and is composed of 5 members. Members can be re-elected if they wish. A majority vote in the General Assembly can trigger a new election of the TC.
-
-The members of the TC can be elected from outside of the GA. Candidates for election can either be suggested or self-nominated.
-
-The conflict resolution process is detailed in the resolution process document.
-
-The TC can be contacted at <tc@@ffmpeg>.
-
-@anchor{Resolution Process}
-@section Resolution Process
-
-The Technical Committee (TC) is here to arbitrate and make decisions when technical conflicts occur in the project.
-
-The TC main role is to resolve technical conflicts. It is therefore not a technical steering committee, but it is understood that some decisions might impact the future of the project.
-
-@subsection Seizing
-
-The TC can take possession of any technical matter that it sees fit.
-
-To involve the TC in a matter, email tc@ or CC them on an ongoing discussion.
-
-As members of TC are developers, they also can email tc@ to raise an issue.
-@subsection Announcement
-
-The TC, once seized, must announce itself on the main mailing list, with a [TC] tag.
-
-The TC has 2 modes of operation: a RFC one and an internal one.
-
-If the TC thinks it needs the input from the larger community, the TC can call for a RFC. Else, it can decide by itself.
-
-The decision to use a RFC process or an internal discussion is a discretionary decision of the TC.
-
-The TC can also reject a seizure for a few reasons such as: the matter was not discussed enough previously; it lacks expertise to reach a beneficial decision on the matter; or the matter is too trivial.
-@subsection RFC call
-
-In the RFC mode, one person from the TC posts on the mailing list the technical question and will request input from the community.
-
-The mail will have the following specification:
-
-    a precise title
-    a specific tag [TC RFC]
-    a top-level email
-    contain a precise question that does not exceed 100 words and that is answerable by developers
-    may have an extra description, or a link to a previous discussion, if deemed necessary,
-    contain a precise end date for the answers.
-
-The answers from the community must be on the main mailing list and must have the following specification:
-
-    keep the tag and the title unchanged
-    limited to 400 words
-    a first-level, answering directly to the main email
-    answering to the question.
-
-Further replies to answers are permitted, as long as they conform to the community standards of politeness, they are limited to 100 words, and are not nested more than once. (max-depth=2)
-
-After the end-date, mails on the thread will be ignored.
-
-Violations of those rules will be escalated through the Community Committee.
-
-After all the emails are in, the TC has 96 hours to give its final decision. Exceptionally, the TC can request an extra delay, that will be notified on the mailing list.
-@subsection Within TC
-
-In the internal case, the TC has 96 hours to give its final decision. Exceptionally, the TC can request an extra delay.
-@subsection Decisions
-
-The decisions from the TC will be sent on the mailing list, with the [TC] tag.
-
-Internally, the TC should take decisions with a majority, or using ranked-choice voting.
-
-Each TC member must vote on such decision according to what is, in their view, best for the project.
-
-If a TC member feels they are affected by a conflict of interest with regards to the case, they should announce it and recuse themselves from the TC
-discussion and vote.
-
-A conflict of interest is presumed to occur when a TC member has a personal interest (e.g. financial) in a specific outcome of the case.
-
-The decision from the TC should be published with a summary of the reasons that lead to this decision.
-
-The decisions from the TC are final, until the matters are reopened after no less than one year.
-
-@anchor{Community Committee}
-@chapter Community Committee
-
-The Community Committee (CC) is here to arbitrage and make decisions when inter-personal conflicts occur in the project. It will decide quickly and take actions, for the sake of the project.
-
-The CC can remove privileges of offending members, including removal of commit access and temporary ban from the community.
-
-Decisions made by the CC can be re-opened after 1 year or by a majority vote of the General Assembly. Indefinite bans from the community must be confirmed by the General Assembly, in a majority vote.
-
-The CC is elected by the General Assembly for a duration of 1 year, and is composed of 5 members. Members can be re-elected if they wish. A majority vote in the General Assembly can trigger a new election of the CC.
-
-The members of the CC can be elected from outside of the GA. Candidates for election can either be suggested or self-nominated.
-
-The CC is governed by and responsible for enforcing the Code of Conduct.
-
-The CC can be contacted at <cc@@ffmpeg>.
-
-@anchor{Code of Conduct}
-@chapter Code of Conduct
-
-Be friendly and respectful towards others and third parties.
-Treat others the way you yourself want to be treated.
-
-Be considerate. Not everyone shares the same viewpoint and priorities as you do.
-Different opinions and interpretations help the project.
-Looking at issues from a different perspective assists development.
-
-Do not assume malice for things that can be attributed to incompetence. Even if
-it is malice, it's rarely good to start with that as initial assumption.
-
-Stay friendly even if someone acts contrarily. Everyone has a bad day
-once in a while.
-If you yourself have a bad day or are angry then try to take a break and reply
-once you are calm and without anger if you have to.
-
-Try to help other team members and cooperate if you can.
-
-The goal of software development is to create technical excellence, not for any
-individual to be better and "win" against the others. Large software projects
-are only possible and successful through teamwork.
-
-If someone struggles do not put them down. Give them a helping hand
-instead and point them in the right direction.
-
-Finally, keep in mind the immortal words of Bill and Ted,
-"Be excellent to each other."
-
-@bye

doc/decoders.texi

@@ -38,51 +38,6 @@ Select an operating point of a scalable AV1 bitstream (0 - 31). Default is 0.
 
 @end table
 
-@section hevc
-HEVC (AKA ITU-T H.265 or ISO/IEC 23008-2) decoder.
-
-The decoder supports MV-HEVC multiview streams with at most two views. Views to
-be output are selected by supplying a list of view IDs to the decoder (the
-@option{view_ids} option). This option may be set either statically before
-decoder init, or from the @code{get_format()} callback - useful for the case
-when the view count or IDs change dynamically during decoding.
-
-Only the base layer is decoded by default.
-
-Note that if you are using the @code{ffmpeg} CLI tool, you should be using view
-specifiers as documented in its manual, rather than the options documented here.
-
-@subsection Options
-
-@table @option
-
-@item view_ids (MV-HEVC)
-Specify a list of view IDs that should be output. This option can also be set to
-a single '-1', which will cause all views defined in the VPS to be decoded and
-output.
-
-@item view_ids_available (MV-HEVC)
-This option may be read by the caller to retrieve an array of view IDs available
-in the active VPS. The array is empty for single-layer video.
-
-The value of this option is guaranteed to be accurate when read from the
-@code{get_format()} callback. It may also be set at other times (e.g. after
-opening the decoder), but the value is informational only and may be incorrect
-(e.g. when the stream contains multiple distinct VPS NALUs).
-
-@item view_pos_available (MV-HEVC)
-This option may be read by the caller to retrieve an array of view positions
-(left, right, or unspecified) available in the active VPS, as
-@code{AVStereo3DView} values. When the array is available, its elements apply to
-the corresponding elements of @option{view_ids_available}, i.e.
-@code{view_pos_available[i]} contains the position of view with ID
-@code{view_ids_available[i]}.
-
-Same validity restrictions as for @option{view_ids_available} apply to
-this option.
-
-@end table
-
 @section rawvideo
 
 Raw video decoder.
@@ -175,34 +130,10 @@ 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,
-JPEG/MJPEG, VP8, VP9, AV1, VVC).
+JPEG/MJPEG, VP8, VP9, AV1).
 
 @subsection Common Options
 
@@ -395,7 +326,7 @@ without this library.
 @c man end AUDIO DECODERS
 
 @chapter Subtitles Decoders
-@c man begin SUBTITLES DECODERS
+@c man begin SUBTILES DECODERS
 
 @section libaribb24
 
@@ -422,169 +353,6 @@ Enabled by default.
 
 @end table
 
-@section libaribcaption
-
-Yet another ARIB STD-B24 caption decoder using external @dfn{libaribcaption}
-library.
-
-Implements profiles A and C of the Japanese ARIB STD-B24 standard,
-Brazilian ABNT NBR 15606-1, and Philippines version of ISDB-T.
-
-Requires the presence of the libaribcaption headers and library
-(@url{https://github.com/xqq/libaribcaption}) during configuration.
-You need to explicitly configure the build with @code{--enable-libaribcaption}.
-If both @dfn{libaribb24} and @dfn{libaribcaption} are enabled, @dfn{libaribcaption}
-decoder precedes.
-
-@subsection libaribcaption Decoder Options
-
-@table @option
-
-@item -sub_type @var{subtitle_type}
-Specifies the format of the decoded subtitles.
-
-@table @samp
-@item bitmap
-Graphical image.
-@item ass
-ASS formatted text.
-@item text
-Simple text based output without formatting.
-@end table
-
-The default is @dfn{ass} as same as @dfn{libaribb24} decoder.
-Some present players (e.g., @dfn{mpv}) expect ASS format for ARIB caption.
-
-@item -caption_encoding @var{encoding_scheme}
-Specifies the encoding scheme of input subtitle text.
-
-@table @samp
-@item auto
-Automatically detect text encoding (default).
-@item jis
-8bit-char JIS encoding defined in ARIB STD B24.
-This encoding used in Japan for ISDB captions.
-@item utf8
-UTF-8 encoding defined in ARIB STD B24.
-This encoding is used in Philippines for ISDB-T captions.
-@item latin
-Latin character encoding defined in ABNT NBR 15606-1.
-This encoding is used in South America for SBTVD / ISDB-Tb captions.
-@end table
-
-@item -font @var{font_name[,font_name2,...]}
-Specify comma-separated list of font family names to be used for @dfn{bitmap}
-or @dfn{ass} type subtitle rendering.
-Only first font name is used for @dfn{ass} type subtitle.
-
-If not specified, use internally defined default font family.
-
-@item -ass_single_rect @var{boolean}
-ARIB STD-B24 specifies that some captions may be displayed at different
-positions at a time (multi-rectangle subtitle).
-Since some players (e.g., old @dfn{mpv}) can't handle multiple ASS rectangles
-in a single AVSubtitle, or multiple ASS rectangles of indeterminate duration
-with the same start timestamp, this option can change the behavior so that
-all the texts are displayed in a single ASS rectangle.
-
-The default is @var{false}.
-
-If your player cannot handle AVSubtitles with multiple ASS rectangles properly,
-set this option to @var{true} or define @env{ASS_SINGLE_RECT=1} to change
-default behavior at compilation.
-
-@item -force_outline_text @var{boolean}
-Specify whether always render outline text for all characters regardless of
-the indication by character style.
-
-The default is @var{false}.
-
-@item -outline_width @var{number} (0.0 - 3.0)
-Specify width for outline text, in dots (relative).
-
-The default is @var{1.5}.
-
-@item -ignore_background @var{boolean}
-Specify whether to ignore background color rendering.
-
-The default is @var{false}.
-
-@item -ignore_ruby @var{boolean}
-Specify whether to ignore rendering for ruby-like (furigana) characters.
-
-The default is @var{false}.
-
-@item -replace_drcs @var{boolean}
-Specify whether to render replaced DRCS characters as Unicode characters.
-
-The default is @var{true}.
-
-@item -replace_msz_ascii @var{boolean}
-Specify whether to replace MSZ (Middle Size; half width) fullwidth
-alphanumerics with halfwidth alphanumerics.
-
-The default is @var{true}.
-
-@item -replace_msz_japanese @var{boolean}
-Specify whether to replace some MSZ (Middle Size; half width) fullwidth
-japanese special characters with halfwidth ones.
-
-The default is @var{true}.
-
-@item -replace_msz_glyph @var{boolean}
-Specify whether to replace MSZ (Middle Size; half width) characters
-with halfwidth glyphs if the fonts supports it.
-This option works under FreeType or DirectWrite renderer
-with Adobe-Japan1 compliant fonts.
-e.g., IBM Plex Sans JP, Morisawa BIZ UDGothic, Morisawa BIZ UDMincho,
-Yu Gothic, Yu Mincho, and Meiryo.
-
-The default is @var{true}.
-
-@item -canvas_size @var{image_size}
-Specify the resolution of the canvas to render subtitles to; usually, this
-should be frame size of input video.
-This only applies when @code{-subtitle_type} is set to @var{bitmap}.
-
-The libaribcaption decoder assumes input frame size for bitmap rendering as below:
-@enumerate
-@item
-PROFILE_A : 1440 x 1080 with SAR (PAR) 4:3
-@item
-PROFILE_C : 320 x 180 with SAR (PAR) 1:1
-@end enumerate
-
-If actual frame size of input video does not match above assumption,
-the rendered captions may be distorted.
-To make the captions undistorted, add @code{-canvas_size} option to specify
-actual input video size.
-
-Note that the @code{-canvas_size} option is not required for video with
-different size but same aspect ratio.
-In such cases, the caption will be stretched or shrunk to actual video size
-if @code{-canvas_size} option is not specified.
-If @code{-canvas_size} option is specified with different size,
-the caption will be stretched or shrunk as specified size with calculated SAR.
-
-@end table
-
-@subsection libaribcaption decoder usage examples
-
-Display MPEG-TS file with ARIB subtitle by @code{ffplay} tool:
-@example
-ffplay -sub_type bitmap MPEG.TS
-@end example
-
-Display MPEG-TS file with input frame size 1920x1080 by @code{ffplay} tool:
-@example
-ffplay -sub_type bitmap -canvas_size 1920x1080 MPEG.TS
-@end example
-
-Embed ARIB subtitle in transcoded video:
-@example
-ffmpeg -sub_type bitmap -i src.m2t -filter_complex "[0:v][0:s]overlay" -vcodec h264 dest.mp4
-@end example
-
 @section dvbsub
 
 @subsection Options
@@ -696,4 +464,4 @@ box and an end box, typically subtitles. Default value is 0 if
 
 @end table
 
-@c man end SUBTITLES DECODERS
+@c man end SUBTILES DECODERS

doc/demuxers.texi

@@ -285,165 +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).
-
-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 1, 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 1, menu of the first VTS.
-
-@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 1, the first PG of the PGC.
-
-@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}.
-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.
@@ -466,15 +307,7 @@ stream which contains the alpha channel in addition to the ordinary video.
 
 Interoperable Master Format demuxer.
 
-This demuxer presents audio and video streams found in an IMF Composition, as
-specified in @url{https://doi.org/10.5594/SMPTE.ST2067-2.2020, SMPTE ST 2067-2}.
-
-@example
-ffmpeg [-assetmaps <path of ASSETMAP1>,<path of ASSETMAP2>,...] -i <path of CPL> ...
-@end example
-
-If @code{-assetmaps} is not specified, the demuxer looks for a file called
-@file{ASSETMAP.xml} in the same directory as the CPL.
+This demuxer presents audio and video streams found in an IMF Composition.
 
 @section flv, live_flv, kux
 
@@ -564,13 +397,6 @@ 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.
@@ -855,32 +681,6 @@ Set the sample rate for libopenmpt to output.
 Range is from 1000 to INT_MAX. The value default is 48000.
 @end table
 
-@anchor{mccdec}
-@section mcc
-
-Demuxer for MacCaption MCC files, it supports MCC versions 1.0 and 2.0.
-MCC files store VANC data, which can include closed captions (EIA-608 and CEA-708), ancillary time code, pan-scan data, etc.
-By default, for backward compatibility, the MCC demuxer extracts just the EIA-608 and CEA-708 closed captions and returns a @code{EIA_608} stream, ignoring all other VANC data.
-You can change it to return all VANC data in a @code{SMPTE_436M_ANC} data stream by setting @option{-eia608_extract 0}
-
-@subsection Examples
-
-@itemize
-@item
-Convert a MCC file to Scenarist (SCC) format:
-@example
-ffmpeg -i CC.mcc -c:s copy CC.scc
-@end example
-Note that the SCC format only supports EIA-608, so this will discard all other data such as CEA-708 extensions.
-
-@item
-Merge a MCC file into a MXF file:
-@example
-ffmpeg -i video_and_audio.mxf -eia608_extract 0 -i CC.mcc -c copy -map 0 -map 1 out.mxf
-@end example
-This retains all VANC data and inserts it into the output MXF file as a @code{SMPTE_436M_ANC} data stream.
-@end itemize
-
 @section mov/mp4/3gp
 
 Demuxer for Quicktime File Format & ISO/IEC Base Media File Format (ISO/IEC 14496-12 or MPEG-4 Part 12, ISO/IEC 15444-12 or JPEG 2000 Part 12).
@@ -969,15 +769,8 @@ 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
-Interleave packets from multiple tracks at demuxer level. For badly interleaved files, this prevents playback issues
-caused by large gaps between packets in different tracks, as MOV/MP4 do not have packet placement requirements.
-However, this can cause excessive seeking on very badly interleaved files, due to seeking between tracks, so disabling
-it may prevent I/O issues, at the expense of playback.
-
 @end table
 
 @subsection Audible AAX
@@ -1016,7 +809,7 @@ to 1 (-1 means automatic setting, 1 means enabled, 0 means
 disabled). Default value is -1.
 
 @item merge_pmt_versions
-Reuse existing streams when a PMT's version is updated and elementary
+Re-use existing streams when a PMT's version is updated and elementary
 streams move to different PIDs. Default value is 0.
 
 @item max_packet_size
@@ -1068,36 +861,6 @@ the command:
 ffplay -f rawvideo -pixel_format rgb24 -video_size 320x240 -framerate 10 input.raw
 @end example
 
-@anchor{rcwtdec}
-@section rcwt
-
-RCWT (Raw Captions With Time) is a format native to ccextractor, a commonly
-used open source tool for processing 608/708 Closed Captions (CC) sources.
-For more information on the format, see @ref{rcwtenc,,,ffmpeg-formats}.
-
-This demuxer implements the specification as of March 2024, which has
-been stable and unchanged since April 2014.
-
-@subsection Examples
-
-@itemize
-@item
-Render CC to ASS using the built-in decoder:
-@example
-ffmpeg -i CC.rcwt.bin CC.ass
-@end example
-Note that if your output appears to be empty, you may have to manually
-set the decoder's @option{data_field} option to pick the desired CC substream.
-
-@item
-Convert an RCWT backup to Scenarist (SCC) format:
-@example
-ffmpeg -i CC.rcwt.bin -c:s copy CC.scc
-@end example
-Note that the SCC format does not support all of the possible CC extensions
-that can be stored in RCWT (such as EIA-708).
-@end itemize
-
 @section sbg
 
 SBaGen script demuxer.
@@ -1165,27 +928,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

doc/dev_community/community.md

@@ -0,0 +1,82 @@
+# FFmpeg project
+
+## Organisation
+
+The FFmpeg project is organized through a community working on global consensus.
+
+Decisions are taken by the ensemble of active members, through voting and
+are aided by two committees.
+
+## General Assembly
+
+The ensemble of active members is called the General Assembly (GA).
+
+The General Assembly is sovereign and legitimate for all its decisions
+regarding the FFmpeg project.
+
+The General Assembly is made up of active contributors.
+
+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.
+
+A script to generate the current members of the general assembly (minus members
+voted in) can be found in `tools/general_assembly.pl`.
+
+## Voting
+
+Voting is done using a ranked voting system, currently running on https://vote.ffmpeg.org/ .
+
+Majority vote means more than 50% of the expressed ballots.
+
+## Technical Committee
+
+The Technical Committee (TC) is here to arbitrate and make decisions when
+technical conflicts occur in the project.
+They will consider the merits of all the positions, judge them and make a
+decision.
+
+The TC resolves technical conflicts but is not a technical steering committee.
+
+Decisions by the TC are binding for all the contributors.
+
+Decisions made by the TC can be re-opened after 1 year or by a majority vote
+of the General Assembly, requested by one of the member of the GA.
+
+The TC is elected by the General Assembly for a duration of 1 year, and
+is composed of 5 members.
+Members can be re-elected if they wish. A majority vote in the General Assembly
+can trigger a new election of the TC.
+
+The members of the TC can be elected from outside of the GA.
+Candidates for election can either be suggested or self-nominated.
+
+The conflict resolution process is detailed in the [resolution process](resolution_process.md) document.
+
+## Community committee
+
+The Community Committee (CC) is here to arbitrage and make decisions when
+inter-personal conflicts occur in the project. It will decide quickly and
+take actions, for the sake of the project.
+
+The CC can remove privileges of offending members, including removal of
+commit access and temporary ban from the community.
+
+Decisions made by the CC can be re-opened after 1 year or by a majority vote
+of the General Assembly. Indefinite bans from the community must be confirmed
+by the General Assembly, in a majority vote.
+
+The CC is elected by the General Assembly for a duration of 1 year, and is
+composed of 5 members.
+Members can be re-elected if they wish. A majority vote in the General Assembly
+can trigger a new election of the CC.
+
+The members of the CC can be elected from outside of the GA.
+Candidates for election can either be suggested or self-nominated.
+
+The CC is governed by and responsible for enforcing the Code of Conduct.

doc/dev_community/resolution_process.md

@@ -0,0 +1,91 @@
+# Technical Committee
+
+_This document only makes sense with the rules from [the community document](community)_.
+
+The Technical Committee (**TC**) is here to arbitrate and make decisions when
+technical conflicts occur in the project.
+
+The TC main role is to resolve technical conflicts.
+It is therefore not a technical steering committee, but it is understood that
+some decisions might impact the future of the project.
+
+# Process
+
+## Seizing
+
+The TC can take possession of any technical matter that it sees fit.
+
+To involve the TC in a matter, email tc@ or CC them on an ongoing discussion.
+
+As members of TC are developers, they also can email tc@ to raise an issue.
+
+## Announcement
+
+The TC, once seized, must announce itself on the main mailing list, with a _[TC]_ tag.
+
+The TC has 2 modes of operation: a RFC one and an internal one.
+
+If the TC thinks it needs the input from the larger community, the TC can call
+for a RFC. Else, it can decide by itself.
+
+If the disagreement involves a member of the TC, that member should recuse
+themselves from the decision.
+
+The decision to use a RFC process or an internal discussion is a discretionary
+decision of the TC.
+
+The TC can also reject a seizure for a few reasons such as:
+the matter was not discussed enough previously; it lacks expertise to reach a
+beneficial decision on the matter; or the matter is too trivial.
+
+### RFC call
+
+In the RFC mode, one person from the TC posts on the mailing list the
+technical question and will request input from the community.
+
+The mail will have the following specification:
+* a precise title
+* a specific tag [TC RFC]
+* a top-level email
+* contain a precise question that does not exceed 100 words and that is answerable by developers
+* may have an extra description, or a link to a previous discussion, if deemed necessary,
+* contain a precise end date for the answers.
+
+The answers from the community must be on the main mailing list and must have
+the following specification:
+* keep the tag and the title unchanged
+* limited to 400 words
+* a first-level, answering directly to the main email
+* answering to the question.
+
+Further replies to answers are permitted, as long as they conform to the
+community standards of politeness, they are limited to 100 words, and are not
+nested more than once. (max-depth=2)
+
+After the end-date, mails on the thread will be ignored.
+
+Violations of those rules will be escalated through the Community Committee.
+
+After all the emails are in, the TC has 96 hours to give its final decision.
+Exceptionally, the TC can request an extra delay, that will be notified on the
+mailing list.
+
+### Within TC
+
+In the internal case, the TC has 96 hours to give its final decision.
+Exceptionally, the TC can request an extra delay.
+
+
+## Decisions
+
+The decisions from the TC will be sent on the mailing list, with the _[TC]_ tag.
+
+Internally, the TC should take decisions with a majority, or using
+ranked-choice voting.
+
+The decision from the TC should be published with a summary of the reasons that
+lead to this decision.
+
+The decisions from the TC are final, until the matters are reopened after
+no less than one year.
+

doc/developer.texi

@@ -24,10 +24,6 @@ generated from the headers
 the examples under @file{doc/examples}
 @end itemize
 
-For more detailed legal information about the use of FFmpeg in
-external programs read the @file{LICENSE} file in the source tree and
-consult @url{https://ffmpeg.org/legal.html}.
-
 If you modify FFmpeg code for your own use case, you are highly encouraged to
 @emph{submit your changes back to us}, using this document as a guide. There are
 both pragmatic and ideological reasons to do so:
@@ -44,6 +40,12 @@ By supporting the project you find useful you ensure it continues to be
 maintained and developed.
 @end itemize
 
+For more detailed legal information about the use of FFmpeg in
+external programs read the @file{LICENSE} file in the source tree and
+consult @url{https://ffmpeg.org/legal.html}.
+
+@section Contributing code
+
 All proposed code changes should be submitted for review to
 @url{mailto:ffmpeg-devel@@ffmpeg.org, the development mailing list}, as
 described in more detail in the @ref{Submitting patches} chapter. The code
@@ -54,10 +56,16 @@ and should try to fix issues their commit causes.
 @anchor{Coding Rules}
 @chapter Coding Rules
 
-@section Language
+@section C language features
 
-FFmpeg is mainly programmed in the ISO C11 language, except for the public
-headers which must stay C99 compatible.
+FFmpeg is 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
@@ -70,49 +78,14 @@ variable-length arrays;
 
 @item
 complex numbers;
-@end itemize
-
-@subsection SIMD/DSP
-@anchor{SIMD/DSP}
-
-As modern compilers are unable to generate efficient SIMD or other
-performance-critical DSP code from plain C, handwritten assembly is used.
-Usually such code is isolated in a separate function. Then the standard approach
-is writing multiple versions of this function – a plain C one that works
-everywhere and may also be useful for debugging, and potentially multiple
-architecture-specific optimized implementations. Initialization code then
-chooses the best available version at runtime and loads it into a function
-pointer; the function in question is then always called through this pointer.
-
-The specific syntax used for writing assembly is:
-@itemize @bullet
-@item
-NASM on x86;
 
 @item
-GAS on ARM and RISC-V.
-@end itemize
-
-A unit testing framework for assembly called @code{checkasm} lives under
-@file{tests/checkasm}. All new assembly should come with @code{checkasm} tests;
-adding tests for existing assembly that lacks them is also strongly encouraged.
-
-@subsection Other languages
-
-Other languages than C may be used in special cases:
-@itemize @bullet
-@item
-Compiler intrinsics or inline assembly when the code in question cannot be
-written in the standard way described in the @ref{SIMD/DSP} section. This
-typically applies to code that needs to be inlined.
-
-@item
-Objective-C where required for interacting with macOS-specific interfaces.
+mixed statements and declarations.
 @end itemize
 
 @section Code formatting conventions
 
-There are the following guidelines regarding the code style in files:
+There are the following guidelines regarding the indentation in files:
 
 @itemize @bullet
 @item
@@ -132,104 +105,6 @@ K&R coding style is used.
 @end itemize
 The presentation is one inspired by 'indent -i4 -kr -nut'.
 
-@subsection Examples
-Some notable examples to illustrate common code style in FFmpeg:
-
-@itemize @bullet
-
-@item
-Space around assignments and after
-@code{if}/@code{do}/@code{while}/@code{for} keywords:
-
-@example c, good
-// Good
-if (condition)
-    av_foo();
-@end example
-
-@example c, good
-// Good
-for (size_t i = 0; i < len; i++)
-    av_bar(i);
-@end example
-
-@example c, good
-// Good
-size_t size = 0;
-@end example
-
-However no spaces between the parentheses and condition, unless it helps
-readability of complex conditions, so the following should not be done:
-
-@example c, bad
-// Bad style
-if ( condition )
-    av_foo();
-@end example
-
-@item
-No unnecessary parentheses, unless it helps readability:
-
-@example c, good
-// Good
-int fields = ilace ? 2 : 1;
-@end example
-
-@item
-Don't wrap single-line blocks in braces. Use braces only if there is an accompanying else statement. This keeps future code changes easier to keep track of.
-
-@example c, good
-// Good
-if (bits_pixel == 24) @{
-    avctx->pix_fmt = AV_PIX_FMT_BGR24;
-@} else if (bits_pixel == 8) @{
-    avctx->pix_fmt = AV_PIX_FMT_GRAY8;
-@} else
-    return AVERROR_INVALIDDATA;
-
-@end example
-
-@item
-Avoid assignments in conditions where it makes sense:
-
-@example c, good
-// Good
-video_enc->chroma_intra_matrix = av_mallocz(sizeof(*video_enc->chroma_intra_matrix) * 64)
-if (!video_enc->chroma_intra_matrix)
-    return AVERROR(ENOMEM);
-@end example
-
-@example c, bad
-// Bad style
-if (!(video_enc->chroma_intra_matrix = av_mallocz(sizeof(*video_enc->chroma_intra_matrix) * 64)))
-    return AVERROR(ENOMEM);
-@end example
-
-@example c, good
-// Ok
-while ((entry = av_dict_iterate(options, entry)))
-    av_log(ctx, AV_LOG_INFO, "Item '%s': '%s'\n", entry->key, entry->value);
-@end example
-
-@item
-When declaring a pointer variable, the @code{*} goes with the variable not the type:
-
-@example c, good
-// Good
-AVStream *stream;
-@end example
-
-@example c, bad
-// Bad style
-AVStream* stream;
-@end example
-
-@end itemize
-
-If you work on a file that does not follow these guidelines consistently,
-change the parts that you are editing to follow these guidelines but do
-not make unrelated changes in the file to make it conform to these.
-
 @subsection Vim configuration
 In order to configure Vim to follow FFmpeg formatting conventions, paste
 the following snippet into your @file{.vimrc}:
@@ -304,7 +179,6 @@ int myfunc(int my_parameter)
 ...
 @end example
 
-@anchor{Naming conventions}
 @section Naming conventions
 
 Names of functions, variables, and struct members must be lowercase, using
@@ -363,6 +237,10 @@ symbols. If in doubt, just avoid names starting with @code{_} altogether.
 @section Miscellaneous conventions
 
 @itemize @bullet
+@item
+fprintf and printf are forbidden in libavformat and libavcodec,
+please use av_log() instead.
+
 @item
 Casts should be used only when necessary. Unneeded parentheses
 should also be avoided if they don't make the code easier to understand.
@@ -371,42 +249,6 @@ should also be avoided if they don't make the code easier to understand.
 @anchor{Development Policy}
 @chapter Development Policy
 
-@section Code behaviour
-
-@subheading Correctness
-The code must be valid. It must not crash, abort, access invalid pointers, leak
-memory, cause data races or signed integer overflow, or otherwise cause
-undefined behaviour. Error codes should be checked and, when applicable,
-forwarded to the caller.
-
-@subheading Thread- and library-safety
-Our libraries may be called by multiple independent callers in the same process.
-These calls may happen from any number of threads and the different call sites
-may not be aware of each other - e.g. a user program may be calling our
-libraries directly, and use one or more libraries that also call our libraries.
-The code must behave correctly under such conditions.
-
-@subheading Robustness
-The code must treat as untrusted any bytestream received from a caller or read
-from a file, network, etc. It must not misbehave when arbitrary data is sent to
-it - typically it should print an error message and return
-@code{AVERROR_INVALIDDATA} on encountering invalid input data.
-
-@subheading Memory allocation
-The code must use the @code{av_malloc()} family of functions from
-@file{libavutil/mem.h} to perform all memory allocation, except in special cases
-(e.g. when interacting with an external library that requires a specific
-allocator to be used).
-
-All allocations should be checked and @code{AVERROR(ENOMEM)} returned on
-failure. A common mistake is that error paths leak memory - make sure that does
-not happen.
-
-@subheading stdio
-Our libraries must not access the stdio streams stdin/stdout/stderr directly
-(e.g. via @code{printf()} family of functions), as that is not library-safe. For
-logging, use @code{av_log()}.
-
 @section Patches/Committing
 @subheading Licenses for patches must be compatible with FFmpeg.
 Contributions should be licensed under the
@@ -429,24 +271,13 @@ missing samples or an implementation with a small subset of features.
 Always check the mailing list for any reviewers with issues and test
 FATE before you push.
 
-@subheading Commit messages
-Commit messages are highly important tools for informing other developers on
-what a given change does and why. Every commit must always have a properly
-filled out commit message with the following format:
-@example
-area changed: short 1 line description
-
-details describing what and why and giving references.
-@end example
-
-If the commit addresses a known bug on our bug tracker or other external issue
-(e.g. CVE), the commit message should include the relevant bug ID(s) or other
-external identifiers. Note that this should be done in addition to a proper
-explanation and not instead of it. Comments such as "fixed!" or "Changed it."
-are not acceptable.
-
-When applying patches that have been discussed at length on the mailing list,
-reference the thread in the commit message.
+@subheading Keep the main commit message short with an extended description below.
+The commit message should have a short first line in the form of
+a @samp{topic: short description} as a header, separated by a newline
+from the body consisting of an explanation of why the change is necessary.
+If the commit fixes a known bug on the bug tracker, the commit message
+should include its bug ID. Referring to the issue on the bug tracker does
+not exempt you from writing an excerpt of the bug in the commit message.
 
 @subheading Testing must be adequate but not excessive.
 If it works for you, others, and passes FATE then it should be OK to commit
@@ -465,6 +296,15 @@ later on.
 Also if you have doubts about splitting or not splitting, do not hesitate to
 ask/discuss it on the developer mailing list.
 
+@subheading Ask before you change the build system (configure, etc).
+Do not commit changes to the build system (Makefiles, configure script)
+which change behavior, defaults etc, without asking first. The same
+applies to compiler warning fixes, trivial looking fixes and to code
+maintained by other developers. We usually have a reason for doing things
+the way we do. Send your changes as patches to the ffmpeg-devel mailing
+list, and if the code maintainers say OK, you may commit. This does not
+apply to files you wrote and/or maintain.
+
 @subheading Cosmetic changes should be kept in separate patches.
 We refuse source indentation and other cosmetic changes if they are mixed
 with functional changes, such commits will be rejected and removed. Every
@@ -479,15 +319,27 @@ NOTE: If you had to put if()@{ .. @} over a large (> 5 lines) chunk of code,
 then either do NOT change the indentation of the inner part within (do not
 move it to the right)! or do so in a separate commit
 
+@subheading Commit messages should always be filled out properly.
+Always fill out the commit log message. Describe in a few lines what you
+changed and why. You can refer to mailing list postings if you fix a
+particular bug. Comments such as "fixed!" or "Changed it." are unacceptable.
+Recommended format:
+
+@example
+area changed: Short 1 line description
+
+details describing what and why and giving references.
+@end example
+
 @subheading Credit the author of the patch.
 Make sure the author of the commit is set correctly. (see git commit --author)
 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 Complex patches should refer to discussion surrounding them.
+When applying patches that have been discussed (at length) on the mailing
+list, reference the thread in the log message.
 
 @subheading Always wait long enough before pushing changes
 Do NOT commit to code actively maintained by others without permission.
@@ -497,6 +349,22 @@ time-frame (12h for build failures and security fixes, 3 days small changes,
 Also note, the maintainer can simply ask for more time to review!
 
 @section Code
+@subheading API/ABI changes should be discussed before they are made.
+Do not change behavior of the programs (renaming options etc) or public
+API or ABI without first discussing it on the ffmpeg-devel mailing list.
+Do not remove widely used functionality or features (redundant code can be removed).
+
+@subheading Remember to check if you need to bump versions for libav*.
+Depending on the change, you may need to change the version integer.
+Incrementing the first component means no backward compatibility to
+previous versions (e.g. removal of a function from the public API).
+Incrementing the second component means backward compatible change
+(e.g. addition of a function to the public API or extension of an
+existing data structure).
+Incrementing the third component means a noteworthy binary compatible
+change (e.g. encoder bug fix that matters for the decoder). The third
+component always starts at 100 to distinguish FFmpeg from Libav.
+
 @subheading Warnings for correct code may be disabled if there is no other option.
 Compiler warnings indicate potential bugs or code with bad style. If a type of
 warning always points to correct and clean code, that warning should
@@ -506,150 +374,10 @@ If it is a bug, the bug has to be fixed. If it is not, the code should
 be changed to not generate a warning unless that causes a slowdown
 or obfuscates the code.
 
-@section Library public interfaces
-Every library in FFmpeg provides a set of public APIs in its installed headers,
-which are those listed in the variable @code{HEADERS} in that library's
-@file{Makefile}. All identifiers defined in those headers (except for those
-explicitly documented otherwise), and corresponding symbols exported from
-compiled shared or static libraries are considered public interfaces and must
-comply with the API and ABI compatibility rules described in this section.
-
-Public APIs must be backward compatible within a given major version. I.e. any
-valid user code that compiles and works with a given library version must still
-compile and work with any later version, as long as the major version number is
-unchanged. "Valid user code" here means code that is calling our APIs in a
-documented and/or intended manner and is not relying on any undefined behavior.
-Incrementing the major version may break backward compatibility, but only to the
-extent described in @ref{Major version bumps}.
-
-We also guarantee backward ABI compatibility for shared and static libraries.
-I.e. it should be possible to replace a shared or static build of our library
-with a build of any later version (re-linking the user binary in the static
-case) without breaking any valid user binaries, as long as the major version
-number remains unchanged.
-
-@subsection Adding new interfaces
-Any new public identifiers in installed headers are considered new API - this
-includes new functions, structs, macros, enum values, typedefs, new fields in
-existing structs, new installed headers, etc. Consider the following
-guidelines when adding new APIs.
-
-@subsubheading Motivation
-While new APIs can be added relatively easily, changing or removing them is much
-harder due to abovementioned compatibility requirements. You should then
-consider carefully whether the functionality you are adding really needs to be
-exposed to our callers as new public API.
-
-Your new API should have at least one well-established use case outside of the
-library that cannot be easily achieved with existing APIs. Every library in
-FFmpeg also has a defined scope - your new API must fit within it.
-
-@subsubheading Replacing existing APIs
-If your new API is replacing an existing one, it should be strictly superior to
-it, so that the advantages of using the new API outweigh the cost to the
-callers of changing their code. After adding the new API you should then
-deprecate the old one and schedule it for removal, as described in
-@ref{Removing interfaces}.
-
-If you deem an existing API deficient and want to fix it, the preferred approach
-in most cases is to add a differently-named replacement and deprecate the
-existing API rather than modify it. It is important to make the changes visible
-to our callers (e.g. through compile- or run-time deprecation warnings) and make
-it clear how to transition to the new API (e.g. in the Doxygen documentation or
-on the wiki).
-
-@subsubheading API design
-The FFmpeg libraries are used by a variety of callers to perform a wide range of
-multimedia-related processing tasks. You should therefore - within reason - try
-to design your new API for the broadest feasible set of use cases and avoid
-unnecessarily limiting it to a specific type of callers (e.g. just media
-playback or just transcoding).
-
-@subsubheading Consistency
-Check whether similar APIs already exist in FFmpeg. If they do, try to model
-your new addition on them to achieve better overall consistency.
-
-The naming of your new identifiers should follow the @ref{Naming conventions}
-and be aligned with other similar APIs, if applicable.
-
-@subsubheading Extensibility
-You should also consider how your API might be extended in the future in a
-backward-compatible way. If you are adding a new struct @code{AVFoo}, the
-standard approach is requiring the caller to always allocate it through a
-constructor function, typically named @code{av_foo_alloc()}. This way new fields
-may be added to the end of the struct without breaking ABI compatibility.
-Typically you will also want a destructor - @code{av_foo_free(AVFoo**)} that
-frees the indirectly supplied object (and its contents, if applicable) and
-writes @code{NULL} to the supplied pointer, thus eliminating the potential
-dangling pointer in the caller's memory.
-
-If you are adding new functions, consider whether it might be desirable to tweak
-their behavior in the future - you may want to add a flags argument, even though
-it would be unused initially.
-
-@subsubheading Documentation
-All new APIs must be documented as Doxygen-formatted comments above the
-identifiers you add to the public headers. You should also briefly mention the
-change in @file{doc/APIchanges}.
-
-@subsubheading Bump the version
-Backward-incompatible API or ABI changes require incrementing (bumping) the
-major version number, as described in @ref{Major version bumps}. Major
-bumps are significant events that happen on a schedule - so if your change
-strictly requires one you should add it under @code{#if} preprocessor guards that
-disable it until the next major bump happens.
-
-New APIs that can be added without breaking API or ABI compatibility require
-bumping the minor version number.
-
-Incrementing the third (micro) version component means a noteworthy binary
-compatible change (e.g. encoder bug fix that matters for the decoder). The third
-component always starts at 100 to distinguish FFmpeg from Libav.
-
-@anchor{Removing interfaces}
-@subsection Removing interfaces
-Due to abovementioned compatibility guarantees, removing APIs is an involved
-process that should only be undertaken with good reason. Typically a deficient,
-restrictive, or otherwise inadequate API is replaced by a superior one, though
-it does at times happen that we remove an API without any replacement (e.g. when
-the feature it provides is deemed not worth the maintenance effort, out of scope
-of the project, fundamentally flawed, etc.).
-
-The removal has two steps - first the API is deprecated and scheduled for
-removal, but remains present and functional. The second step is actually
-removing the API - this is described in @ref{Major version bumps}.
-
-To deprecate an API you should signal to our users that they should stop using
-it. E.g. if you intend to remove struct members or functions, you should mark
-them with @code{attribute_deprecated}. When this cannot be done, it may be
-possible to detect the use of the deprecated API at runtime and print a warning
-(though take care not to print it too often). You should also document the
-deprecation (and the replacement, if applicable) in the relevant Doxygen
-documentation block.
-
-Finally, you should define a deprecation guard along the lines of
-@code{#define FF_API_<FOO> (LIBAVBAR_VERSION_MAJOR < XX)} (where XX is the major
-version in which the API will be removed) in @file{libavbar/version_major.h}
-(@file{version.h} in case of @code{libavutil}). Then wrap all uses of the
-deprecated API in @code{#if FF_API_<FOO> .... #endif}, so that the code will
-automatically get disabled once the major version reaches XX. You can also use
-@code{FF_DISABLE_DEPRECATION_WARNINGS} and @code{FF_ENABLE_DEPRECATION_WARNINGS}
-to suppress compiler deprecation warnings inside these guards. You should test
-that the code compiles and works with the guard macro evaluating to both true
-and false.
-
-@anchor{Major version bumps}
-@subsection Major version bumps
-A major version bump signifies an API and/or ABI compatibility break. To reduce
-the negative effects on our callers, who are required to adapt their code,
-backward-incompatible changes during a major bump should be limited to:
-@itemize @bullet
-@item
-Removing previously deprecated APIs.
-
-@item
-Performing ABI- but not API-breaking changes, like reordering struct contents.
-@end itemize
+@subheading Check untrusted input properly.
+Never write to unallocated memory, never write over the end of arrays,
+always check values read from some untrusted source before using them
+as array index or other risky things.
 
 @section Documentation/Other
 @subheading Subscribe to the ffmpeg-devel mailing list.
@@ -693,6 +421,35 @@ finding a new maintainer and also don't forget to update the @file{MAINTAINERS}
 
 We think our rules are not too hard. If you have comments, contact us.
 
+@chapter Code of conduct
+
+Be friendly and respectful towards others and third parties.
+Treat others the way you yourself want to be treated.
+
+Be considerate. Not everyone shares the same viewpoint and priorities as you do.
+Different opinions and interpretations help the project.
+Looking at issues from a different perspective assists development.
+
+Do not assume malice for things that can be attributed to incompetence. Even if
+it is malice, it's rarely good to start with that as initial assumption.
+
+Stay friendly even if someone acts contrarily. Everyone has a bad day
+once in a while.
+If you yourself have a bad day or are angry then try to take a break and reply
+once you are calm and without anger if you have to.
+
+Try to help other team members and cooperate if you can.
+
+The goal of software development is to create technical excellence, not for any
+individual to be better and "win" against the others. Large software projects
+are only possible and successful through teamwork.
+
+If someone struggles do not put them down. Give them a helping hand
+instead and point them in the right direction.
+
+Finally, keep in mind the immortal words of Bill and Ted,
+"Be excellent to each other."
+
 @anchor{Submitting patches}
 @chapter Submitting patches
 
@@ -733,11 +490,6 @@ 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
@@ -782,7 +534,7 @@ number) in @file{libavcodec/version.h} or @file{libavformat/version.h}?
 Did you register it in @file{allcodecs.c} or @file{allformats.c}?
 
 @item
-Did you add the AVCodecID to @file{codec_id.h}?
+Did you add the AVCodecID to @file{avcodec.h}?
 When adding new codec IDs, also add an entry to the codec descriptor
 list in @file{libavcodec/codec_desc.c}.
 
@@ -797,7 +549,7 @@ already being compiled by some other rule, like a raw demuxer.
 
 @item
 Did you add an entry to the table of supported formats or codecs in
-@file{doc/general_contents.texi}?
+@file{doc/general.texi}?
 
 @item
 Did you add an entry in the Changelog?
@@ -914,13 +666,15 @@ Lines with similar content should be aligned vertically when doing so
 improves readability.
 
 @item
-Consider adding a regression test for your code. All new modules
-should be covered by tests. That includes demuxers, muxers, decoders, encoders
-filters, bitstream filters, parsers. If its not possible to do that, add
-an explanation why to your patchset, its ok to not test if there's a reason.
+Consider adding a regression test for your code.
 
 @item
-If you added NASM code please check that things still work with --disable-x86asm.
+If you added YASM code please check that things still work with --disable-yasm.
+
+@item
+Make sure you check the return values of function and return appropriate
+error codes. Especially memory allocation functions like @code{av_malloc()}
+are notoriously left unchecked, which is a serious problem.
 
 @item
 Test your code with valgrind and or Address Sanitizer to ensure it's free
@@ -971,8 +725,6 @@ accordingly].
 
 @section Adding files to the fate-suite dataset
 
-If you need a sample uploaded send a mail to samples-request.
-
 When there is no muxer or encoder available to generate test media for a
 specific test then the media has to be included in the fate-suite.
 First please make sure that the sample file is as small as possible to test the
@@ -1022,25 +774,6 @@ 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
 

doc/encoders.texi

@@ -106,8 +106,15 @@ debugging by setting the option to "disable".
 Enables the use of the long term prediction extension which increases coding
 efficiency in very low bandwidth situations such as encoding of voice or
 solo piano music by extending constant harmonic peaks in bands throughout
-frames. This option is implied by profile:a aac_low.
-Use in conjunction with @option{-ar} to decrease the samplerate.
+frames. This option is implied by profile:a aac_low and is incompatible with
+aac_pred. Use in conjunction with @option{-ar} to decrease the samplerate.
+
+@item aac_pred
+Enables the use of a more traditional style of prediction where the spectral
+coefficients transmitted are replaced by the difference of the current
+coefficients minus the previous "predicted" coefficients. In theory and sometimes
+in practice this can improve quality for low to mid bitrate audio.
+This option implies the aac_main profile and is incompatible with aac_ltp.
 
 @item profile
 Sets the encoding profile, possible values:
@@ -125,6 +132,10 @@ MPEG4 specifications.
 Long term prediction profile, is enabled by and will enable the @option{aac_ltp}
 option. Introduced in MPEG4.
 
+@item aac_main
+Main-type prediction profile, is enabled by and will enable the @option{aac_pred}
+option. Introduced in MPEG2.
+
 @end table
 If this option is unspecified it is set to @samp{aac_low}.
 @end table
@@ -133,7 +144,8 @@ If this option is unspecified it is set to @samp{aac_low}.
 
 AC-3 audio encoders.
 
-These encoders implement part of ATSC A/52:2010 and ETSI TS 102 366.
+These encoders implement part of ATSC A/52:2010 and ETSI TS 102 366, as well as
+the undocumented RealAudio 3 (a.k.a. dnet).
 
 The @var{ac3} encoder uses floating-point math, while the @var{ac3_fixed}
 encoder only uses fixed-point integer math. This does not mean that one is
@@ -603,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.
 
@@ -777,11 +789,6 @@ about 80-96 kbps/channel
 @end table
 
 Default value is 0.
-
-@item frame_length
-Set the audio frame length in samples. Default value is the internal
-default of the library. Refer to the library's documentation for information
-about supported values.
 @end table
 
 @subsection Examples
@@ -802,63 +809,6 @@ ffmpeg -i input.wav -c:a libfdk_aac -profile:a aac_he -b:a 64k output.m4a
 @end example
 @end itemize
 
-@anchor{liblc3-enc}
-@section liblc3
-
-liblc3 LC3 (Low Complexity Communication Codec) encoder wrapper.
-
-Requires the presence of the liblc3 headers and library during configuration.
-You need to explicitly configure the build with @code{--enable-liblc3}.
-
-This encoder has support for the Bluetooth SIG LC3 codec for the LE Audio
-protocol, and the following features of LC3plus:
-@itemize
-@item
-Frame duration of 2.5 and 5ms.
-@item
-High-Resolution mode, 48 KHz, and 96 kHz sampling rates.
-@end itemize
-
-For more information see the liblc3 project at
-@url{https://github.com/google/liblc3}.
-
-@subsection Options
-
-The following options are mapped on the shared FFmpeg codec options.
-
-@table @option
-@item b @var{bitrate}
-Set the bit rate in bits/s. This will determine the fixed size of the encoded
-frames, for a selected frame duration.
-
-@item ar @var{frequency}
-Set the audio sampling rate (in Hz).
-
-@item channels
-Set the number of audio channels.
-
-@item frame_duration
-Set the audio frame duration in milliseconds. Default value is 10ms.
-Allowed frame durations are 2.5ms, 5ms, 7.5ms and 10ms.
-LC3 (Bluetooth LE Audio), allows 7.5ms and 10ms; and LC3plus 2.5ms, 5ms
-and 10ms.
-
-The 10ms frame duration is available in LC3 and LC3 plus standard.
-In this mode, the produced bitstream can be referenced either as LC3 or LC3plus.
-
-@item high_resolution @var{boolean}
-Enable the high-resolution mode if set to 1. The high-resolution mode is
-available with all LC3plus frame durations and for a sampling rate of 48 KHz,
-and 96 KHz.
-
-The encoder automatically turns off this mode at lower sampling rates and
-activates it at 96 KHz.
-
-This mode should be preferred at high bitrates. In this mode, the audio
-bandwidth is always up to the Nyquist frequency, compared to LC3 at 48 KHz,
-which limits the bandwidth to 20 KHz.
-@end table
-
 @anchor{libmp3lame}
 @section libmp3lame
 
@@ -909,13 +859,6 @@ Enable the encoder to use ABR when set to 1. The @command{lame}
 @option{--abr} sets the target bitrate, while this options only
 tells FFmpeg to use ABR still relies on @option{b} to set bitrate.
 
-@item copyright (@emph{-c})
-Set MPEG audio copyright flag when set to 1. The default value is 0
-(disabled).
-
-@item original (@emph{-o})
-Set MPEG audio original flag when set to 1. The default value is 1
-(enabled).
 @end table
 
 @section libopencore-amrnb
@@ -1022,23 +965,20 @@ Favor improved speech intelligibility.
 @item audio
 Favor faithfulness to the input (the default).
 @item lowdelay
-Restrict to only the lowest delay modes by disabling voice-optimized
-modes.
+Restrict to only the lowest delay modes.
 @end table
 
 @item cutoff (N.A.)
 Set cutoff bandwidth in Hz. The argument must be exactly one of the
 following: 4000, 6000, 8000, 12000, or 20000, corresponding to
 narrowband, mediumband, wideband, super wideband, and fullband
-respectively. The default is 0 (cutoff disabled). Note that libopus
-forces a wideband cutoff for bitrates < 15 kbps, unless CELT-only
-(@option{application} set to @samp{lowdelay}) mode is used.
+respectively. The default is 0 (cutoff disabled).
 
 @item mapping_family (@emph{mapping_family})
 Set channel mapping family to be used by the encoder. The default value of -1
 uses mapping family 0 for mono and stereo inputs, and mapping family 1
 otherwise. The default also disables the surround masking and LFE bandwidth
-optimizations in libopus, and requires that the input contains 8 channels or
+optimzations in libopus, and requires that the input contains 8 channels or
 fewer.
 
 Other values include 0 for mono and stereo, 1 for surround sound with masking
@@ -1380,48 +1320,6 @@ Higher is better but slower.
 
 @end table
 
-@anchor{ffv1}
-@section ffv1
-
-FFv1 Encoder
-
-@subsection Options
-
-The following options are supported by FFmpeg's FFv1 encoder.
-
-@table @option
-@item context
-Sets the context size, 0 (default) is small, 1 is big.
-
-@item coder
-Set the coder,
-@table @samp
-@item rice
-Golomb rice coder
-@item range_def
-Range coder with default table
-@item range_tab
-Range coder with custom table
-@end table
-
-@item slicecrc
--1 (default, automatic), 1 use crc with zero initial and final state, 2 use crc with non zero initial and final state
-
-@item qtable
-@table @samp
-@item default
-default, automatic
-@item 8bit
-use 8bit default
-@item greater8bit
-use >8bit default
-@end table
-
-@item remap_optimizer
-0 - 5, default 3, how much effort the encoder puts into optimizing the remap table.
-
-@end table
-
 @section GIF
 
 GIF image/animation encoder.
@@ -1889,42 +1787,6 @@ ffmpeg -i input -c:v libaom-av1 -b:v 500K -aom-params tune=psnr:enable-tpl-model
 
 @end table
 
-@section liboapv
-
-Advanced Professional Video codec encoder wrapper.
-
-This encoder requires the presence of the liboapv headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-liboapv}.
-
-@float NOTE
-Many liboapv encoder options are mapped to FFmpeg global codec options,
-while unique encoder options are provided through private options.
-@end float
-
-The apv project website is at @url{https://github.com/AcademySoftwareFoundation/openapv}.
-
-@subsection Options
-
-The following options are supported by the liboapv wrapper.
-
-@float NOTE
-To get a more extensive documentation of the liboapv options, consult the
-liboapv documentation.
-@end float
-
-@table @option
-@item preset
-Set the quality-speed tradeoff [fastest, fast, medium, slow, placebo, default]
-
-@item qp
-Set the quantization parameter value for CQP rate control mode.
-
-@item oapv-params (@emph{parse_apv_params})
-Set liboapvenc options using a list of @var{key}=@var{value} pairs separated
-by ":". See the liboapv encoder user guide for a list of accepted parameters.
-@end table
-
 @section libsvtav1
 
 SVT-AV1 encoder wrapper.
@@ -2360,12 +2222,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
@@ -2445,70 +2301,6 @@ Indicates frame duration
 For more information about libvpx see:
 @url{http://www.webmproject.org/}
 
-@section libvvenc
-
-VVenC H.266/VVC encoder wrapper.
-
-This encoder requires the presence of the libvvenc headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-libvvenc}.
-
-The VVenC project website is at
-@url{https://github.com/fraunhoferhhi/vvenc}.
-
-@subsection Supported Pixel Formats
-
-VVenC supports only 10-bit color spaces as input. But the internal (encoded)
-bit depth can be set to 8-bit or 10-bit at runtime.
-
-@subsection Options
-
-@table @option
-@item b
-Sets target video bitrate.
-
-@item g
-Set the GOP size. Currently support for g=1 (Intra only) or default.
-
-@item preset
-Set the VVenC preset.
-
-@item levelidc
-Set level idc.
-
-@item tier
-Set vvc tier.
-
-@item qp
-Set constant quantization parameter.
-
-@item subopt @var{boolean}
-Set subjective (perceptually motivated) optimization. Default is 1 (on).
-
-@item bitdepth8 @var{boolean}
-Set 8bit coding mode instead of using 10bit. Default is 0 (off).
-
-@item period
-set (intra) refresh period in seconds.
-
-@item vvenc-params
-Set vvenc options using a list of @var{key}=@var{value} couples separated
-by ":". See @command{vvencapp --fullhelp} or @command{vvencFFapp --fullhelp} for a list of options.
-
-For example, the options might be provided as:
-
-@example
-intraperiod=64:decodingrefreshtype=idr:poc0idr=1:internalbitdepth=8
-@end example
-
-For example the encoding options might be provided with @option{-vvenc-params}:
-
-@example
-ffmpeg -i input -c:v libvvenc -b 1M -vvenc-params intraperiod=64:decodingrefreshtype=idr:poc0idr=1:internalbitdepth=8 output.mp4
-@end example
-
-@end table
-
 @section libwebp
 
 libwebp WebP Image encoder wrapper
@@ -2614,10 +2406,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
@@ -2625,19 +2413,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
@@ -2646,21 +2432,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}.
-
-@item level (@emph{level})
-Set the @code{x264_param_t.i_level_idc} value in case the value is
-positive, it is ignored otherwise.
-
-This value can be set using the @code{AVCodecContext} API (e.g. by
-setting the @code{AVCodecContext} value directly), and is specified as
-an integer mapped on a corresponding level (e.g. the value 31 maps
-to H.264 level IDC "3.1", as defined in the @code{x264_levels}
-table). It is ignored when set to a non positive value.
-
-Alternatively it can be set as a private option, overriding the value
-set in @code{AVCodecContext}, and in this case must be specified as
-the level IDC identifier (e.g. "3.1"), as defined by H.264 Annex A.
+Number of reference frames each P-frame can use. The range is from @var{0-16}.
 
 @item sc_threshold (@emph{scenecut})
 Sets the threshold for the scene change detection.
@@ -2668,8 +2440,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.
@@ -2750,7 +2521,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.
@@ -2796,7 +2566,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.
 
@@ -2828,7 +2598,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.
@@ -2879,8 +2649,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
@@ -2936,32 +2706,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).
@@ -2969,9 +2726,19 @@ Only the mpeg2 and h264 decoders provide these. Default is 1 (on).
 @item udu_sei @var{boolean}
 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
@@ -3111,75 +2878,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.
@@ -3232,6 +2930,9 @@ Enable high quality AC prediction.
 @item gray
 Only encode grayscale.
 
+@item gmc
+Enable the use of global motion compensation (GMC).
+
 @item qpel
 Enable quarter-pixel motion compensation.
 
@@ -3243,28 +2944,29 @@ Place global headers in extradata instead of every keyframe.
 
 @end table
 
-@item gmc
-Enable the use of global motion compensation (GMC).  Default is 0
-(disabled).
+@item trellis
 
-@item me_quality
-Set motion estimation quality level. Possible values in decreasing order of
+@item me_method
+Set motion estimation method. Possible values in decreasing order of
 speed and increasing order of quality:
 
 @table @samp
-@item 0
+@item zero
 Use no motion estimation (default).
 
-@item 1, 2
+@item phods
+@item x1
+@item log
 Enable advanced diamond zonal search for 16x16 blocks and half-pixel
-refinement for 16x16 blocks.
+refinement for 16x16 blocks. @samp{x1} and @samp{log} are aliases for
+@samp{phods}.
 
-@item 3, 4
+@item epzs
 Enable all of the things described above, plus advanced diamond zonal
-search for 8x8 blocks and half-pixel refinement for 8x8 blocks, also
-enable motion estimation on chroma planes for P and B-frames.
+search for 8x8 blocks, half-pixel refinement for 8x8 blocks, and motion
+estimation on chroma planes.
 
-@item 5, 6
+@item full
 Enable all of the things described above, plus extended 16x16 and 8x8
 blocks search.
 @end table
@@ -3300,9 +3002,6 @@ be better than any of the two specified individually. In other
 words, the resulting quality will be the worse one of the two
 effects.
 
-@item trellis
-Set rate-distortion optimal quantization.
-
 @item ssim
 Set structural similarity (SSIM) displaying method. Possible values:
 
@@ -3342,75 +3041,6 @@ fastest.
 
 @end table
 
-@section MediaCodec
-
-MediaCodec encoder wrapper enables hardware-accelerated video encoding on
-Android device. It supports H.264, H.265 (HEVC), VP8, VP9, MPEG-4, and AV1
-encoding (whether works or not is device dependent).
-
-Android provides two sets of APIs: Java MediaCodec and NDK MediaCodec. The
-MediaCodec encoder wrapper supports both. Note that the NDK MediaCodec API
-operates without requiring JVM, but may fail to function outside the JVM
-environment due to dependencies on system framework services, particularly
-after Android 15.
-
-@table @option
-@item ndk_codec @var{boolean}
-Use the NDK-based MediaCodec API instead of the Java API. Enabled by default
-if @code{av_jni_get_java_vm()} return NULL.
-
-@item ndk_async @var{boolean}
-Use NDK MediaCodec in async mode. Async mode has less overhead than poll in a
-loop in sync mode. The drawback of async mode is AV_CODEC_FLAG_GLOBAL_HEADER
-doesn't work (use extract_extradata bsf when necessary). It doesn't work and
-will be disabled automatically on devices below Android 8.0.
-
-@item codec_name @var{string}
-A codec type can have multiple implementations on a single device, this option
-specify which backend to use (via MediaCodec createCodecByName API). It's NULL
-by default, and encoder is created by createEncoderByType.
-
-@item bitrate_mode @var{integer}
-
-Possible values:
-@table @samp
-@item cq
-Constant quality mode
-@item vbr
-Variable bitrate mode
-@item cbr
-Constant bitrate mode
-@item cbr_fd
-Constant bitrate mode with frame drops
-@end table
-
-@item pts_as_dts @var{boolean}
-Use PTS as DTS. This is a workaround since MediaCodec API doesn't provide
-decoding timestamp. It is enabled automatically if B frame is 0.
-
-@item operating_rate @var{integer}
-The desired operating rate that the codec will need to operate at, zero for
-unspecified. This is used for cases like high-speed/slow-motion video capture,
-where the video encoder format contains the target playback rate (e.g. 30fps),
-but the component must be able to handle the high operating capture rate (e.g.
-240fps). This rate will be used by codec for resource planning and setting the
-operating points.
-
-@item qp_i_min @var{integer}
-Minimum quantization parameter for I frame.
-@item qp_p_min @var{integer}
-Minimum quantization parameter for P frame.
-@item qp_b_min @var{integer}
-Minimum quantization parameter for B frame.
-@item qp_i_max @var{integer}
-Maximum quantization parameter for I frame.
-@item qp_p_max @var{integer}
-Maximum quantization parameter for P frame.
-@item qp_b_max @var{integer}
-Maximum quantization parameter for B frame.
-
-@end table
-
 @section MediaFoundation
 
 This provides wrappers to encoders (both audio and video) in the
@@ -3419,20 +3049,6 @@ Video encoders can take input in either of nv12 or yuv420p form
 (some encoders support both, some support only either - in practice,
 nv12 is the safer choice, especially among HW encoders).
 
-@section Microsoft RLE
-
-Microsoft RLE aka MSRLE encoder.
-Only 8-bit palette mode supported.
-Compatible with Windows 3.1 and Windows 95.
-
-@subsection Options
-
-@table @option
-@item g @var{integer}
-Keyframe interval.
-A keyframe is inserted at least every @code{-g} frames, sometimes sooner.
-@end table
-
 @section mpeg2
 
 MPEG-2 video encoder.
@@ -3493,13 +3109,6 @@ Default is 1 (on).
 
 PNG image encoder.
 
-@subsection Options
-
-@table @option
-@item compression_level
-Sets the compression level, from 0 to 9(default)
-@end table
-
 @subsection Private options
 
 @table @option
@@ -3507,8 +3116,6 @@ Sets the compression level, from 0 to 9(default)
 Set physical density of pixels, in dots per inch, unset by default
 @item dpm @var{integer}
 Set physical density of pixels, in dots per meter, unset by default
-@item pred @var{method}
-Set prediction method (none, sub, up, avg, paeth, mixed), default is paeth
 @end table
 
 @section ProRes
@@ -3581,8 +3188,8 @@ recommended value) and do not set a size constraint.
 
 @section QSV Encoders
 
-The family of Intel QuickSync Video encoders (MPEG-2, H.264, HEVC, JPEG/MJPEG,
-VP9, AV1)
+The family of Intel QuickSync Video encoders (MPEG-2, H.264, HEVC, JPEG/MJPEG
+and VP9)
 
 @subsection Ratecontrol Method
 The ratecontrol method is selected as follows:
@@ -3605,8 +3212,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.
@@ -3627,9 +3234,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
@@ -3703,7 +3307,7 @@ For encoders set this flag to ON to reduce power consumption and GPU usage.
 @end table
 
 @subsection Runtime Options
-Following options can be used during qsv encoding.
+Following options can be used durning qsv encoding.
 
 @table @option
 @item @var{global_quality}
@@ -3740,7 +3344,7 @@ Supported in h264_qsv.
 Change these value to reset qsv codec's max/min qp configuration.
 
 @item @var{low_delay_brc}
-Supported in h264_qsv, hevc_qsv and av1_qsv.
+Supported in h264_qsv and hevc_qsv.
 Change this value to reset qsv codec's low_delay_brc configuration.
 
 @item @var{framerate}
@@ -3755,20 +3359,6 @@ Change these value to reset qsv codec's bitrate control configuration.
 @item @var{pic_timing_sei}
 Supported in h264_qsv and hevc_qsv.
 Change this value to reset qsv codec's pic_timing_sei configuration.
-
-@item @var{qsv_params}
-Set QSV encoder parameters as a colon-separated list of key-value pairs.
-
-The @option{qsv_params} should be formatted as @code{key1=value1:key2=value2:...}.
-
-These parameters are passed directly to the underlying Intel Quick Sync Video (QSV) encoder using the MFXSetParameter function.
-
-Example:
-@example
-ffmpeg -i input.mp4 -c:v h264_qsv -qsv_params "CodingOption1=1:CodingOption2=2" output.mp4
-@end example
-
-This option allows fine-grained control over various encoder-specific settings provided by the QSV encoder.
 @end table
 
 @subsection H264 options
@@ -3813,7 +3403,7 @@ improves subjective visual quality. Enabling this flag may have negative impact
 on performance and objective visual quality metric.
 
 @item @var{low_delay_brc}
-Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
+Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides
 more accurate bitrate control to minimize the variance of bitstream size frame
 by frame. Value: -1-default 0-off 1-on
 
@@ -4012,7 +3602,7 @@ improves subjective visual quality. Enabling this flag may have negative impact
 on performance and objective visual quality metric.
 
 @item @var{low_delay_brc}
-Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
+Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides
 more accurate bitrate control to minimize the variance of bitstream size frame
 by frame. Value: -1-default 0-off 1-on
 
@@ -4246,22 +3836,14 @@ Extended bitrate control.
 Depth of look ahead in number frames, available when extbrc option is enabled.
 
 @item @var{low_delay_brc}
-Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
+Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides
 more accurate bitrate control to minimize the variance of bitstream size frame
 by frame. Value: -1-default 0-off 1-on
 
-@item @var{max_frame_size}
+@item max_frame_size
 Set the allowed max size in bytes for each frame. If the frame size exceeds
 the limitation, encoder will adjust the QP value to control the frame size.
 Invalid in CQP rate control mode.
-
-@item @var{max_frame_size_i}
-Maximum encoded frame size for I frames in bytes. If this value is set as larger
-than zero, then for I frames the value set by max_frame_size is ignored.
-
-@item @var{max_frame_size_p}
-Maximum encoded frame size for P frames in bytes. If this value is set as larger
-than zero, then for P frames the value set by max_frame_size is ignored.
 @end table
 
 @section snow
@@ -4378,29 +3960,11 @@ 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:
 @table @option
 
-@item av1_vaapi
-@option{profile} sets the value of @emph{seq_profile}.
-@option{tier} sets the value of @emph{seq_tier}.
-@option{level} sets the value of @emph{seq_level_idx}.
-
-@table @option
-@item tiles
-Set the number of tiles to encode the input video with, as columns x rows.
-(default is auto, which means use minimal tile column/row number).
-@item tile_groups
-Set tile groups number. All the tiles will be distributed as evenly as possible to
-each tile group. (default is 1).
-@end table
-
 @item h264_vaapi
 @option{profile} sets the value of @emph{profile_idc} and the @emph{constraint_set*_flag}s.
 @option{level} sets the value of @emph{level_idc}.
@@ -4602,25 +4166,6 @@ Reduces detail but attempts to preserve color at extremely low bitrates.
 @chapter Subtitles Encoders
 @c man begin SUBTITLES ENCODERS
 
-@section dvbsub
-
-This codec encodes the bitmap subtitle format that is used in DVB
-broadcasts and recordings. The bitmaps are typically embedded in a
-container such as MPEG-TS as a separate stream.
-
-@subsection Options
-
-@table @option
-@item min_bpp @var{integer (2, 4, or 8)}
-Set a minimum bits-per-pixel value for the subtitle color lookup tables.
-
-DVB supports 2, 4, and 8 bits-per-pixel color lookup tables.  This
-option enables forcing a particular bits-per-pixel value regardless of
-the number of colors.  Since not all players support or properly
-support 2 bits-per-pixel, this value defaults to 4.
-
-@end table
-
 @section dvdsub
 
 This codec encodes the bitmap subtitle format that is used in DVDs.
@@ -4648,18 +4193,4 @@ one byte per subtitle on average.
 By default, this work-around is disabled.
 @end table
 
-@section lrc
-
-This codec encodes the LRC lyrics format.
-
-@subsection Options
-
-@table @option
-@item precision
-Specify the precision of the fractional part of the timestamp. Time base is
-determined based on this value.
-
-Defaults to 2 for centiseconds.
-@end table
-
 @c man end SUBTITLES ENCODERS

doc/examples/avio_read_callback.c

@@ -32,7 +32,6 @@
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 #include <libavutil/file.h>
-#include <libavutil/mem.h>
 
 struct buffer_data {
     uint8_t *ptr;
@@ -96,7 +95,6 @@ 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;
     }

doc/examples/decode_audio.c

@@ -128,10 +128,6 @@ 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);
@@ -165,7 +161,7 @@ int main(int argc, char **argv)
     }
     outfile = fopen(outfilename, "wb");
     if (!outfile) {
-        fprintf(stderr, "Could not open %s\n", outfilename);
+        av_free(c);
         exit(1);
     }
 

doc/examples/decode_filter_audio.c

@@ -30,12 +30,13 @@
  * file to be played with ffplay.
  */
 
+#include <unistd.h>
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
 #include <libavutil/channel_layout.h>
-#include <libavutil/mem.h>
 #include <libavutil/opt.h>
 
 static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono";
@@ -94,7 +95,8 @@ static int init_filters(const char *filters_descr)
     const AVFilter *abuffersink = avfilter_get_by_name("abuffersink");
     AVFilterInOut *outputs = avfilter_inout_alloc();
     AVFilterInOut *inputs  = avfilter_inout_alloc();
-    static const int out_sample_rate = 8000;
+    static const enum AVSampleFormat out_sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 };
+    static const int out_sample_rates[] = { 8000, -1 };
     const AVFilterLink *outlink;
     AVRational time_base = fmt_ctx->streams[audio_stream_index]->time_base;
 
@@ -120,40 +122,34 @@ static int init_filters(const char *filters_descr)
     }
 
     /* buffer audio sink: to terminate the filter chain. */
-    buffersink_ctx = avfilter_graph_alloc_filter(filter_graph, abuffersink, "out");
-    if (!buffersink_ctx) {
+    ret = avfilter_graph_create_filter(&buffersink_ctx, abuffersink, "out",
+                                       NULL, NULL, filter_graph);
+    if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n");
-        ret = AVERROR(ENOMEM);
         goto end;
     }
 
-    ret = av_opt_set(buffersink_ctx, "sample_formats", "s16",
-                     AV_OPT_SEARCH_CHILDREN);
+    ret = av_opt_set_int_list(buffersink_ctx, "sample_fmts", out_sample_fmts, -1,
+                              AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output sample format\n");
         goto end;
     }
 
-    ret = av_opt_set(buffersink_ctx, "channel_layouts", "mono",
-                     AV_OPT_SEARCH_CHILDREN);
+    ret = av_opt_set(buffersink_ctx, "ch_layouts", "mono",
+                              AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output channel layout\n");
         goto end;
     }
 
-    ret = av_opt_set_array(buffersink_ctx, "samplerates", AV_OPT_SEARCH_CHILDREN,
-                           0, 1, AV_OPT_TYPE_INT, &out_sample_rate);
+    ret = av_opt_set_int_list(buffersink_ctx, "sample_rates", out_sample_rates, -1,
+                              AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output sample rate\n");
         goto end;
     }
 
-    ret = avfilter_init_dict(buffersink_ctx, NULL);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot initialize audio buffer sink\n");
-        goto end;
-    }
-
     /*
      * Set the endpoints for the filter graph. The filter_graph will
      * be linked to the graph described by filters_descr.
@@ -283,25 +279,6 @@ int main(int argc, char **argv)
         }
         av_packet_unref(packet);
     }
-    if (ret == AVERROR_EOF) {
-        /* signal EOF to the filtergraph */
-        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
-            goto end;
-        }
-
-        /* pull remaining frames from the filtergraph */
-        while (1) {
-            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
-            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-                break;
-            if (ret < 0)
-                goto end;
-            print_frame(filt_frame);
-            av_frame_unref(filt_frame);
-        }
-    }
-
 end:
     avfilter_graph_free(&filter_graph);
     avcodec_free_context(&dec_ctx);

doc/examples/decode_filter_video.c

@@ -27,6 +27,8 @@
  * @example decode_filter_video.c
  */
 
+#define _XOPEN_SOURCE 600 /* for usleep */
+#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -34,9 +36,7 @@
 #include <libavformat/avformat.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
-#include <libavutil/mem.h>
 #include <libavutil/opt.h>
-#include <libavutil/time.h>
 
 const char *filter_descr = "scale=78:24,transpose=cclock";
 /* other way:
@@ -98,6 +98,7 @@ static int init_filters(const char *filters_descr)
     AVFilterInOut *outputs = avfilter_inout_alloc();
     AVFilterInOut *inputs  = avfilter_inout_alloc();
     AVRational time_base = fmt_ctx->streams[video_stream_index]->time_base;
+    enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
 
     filter_graph = avfilter_graph_alloc();
     if (!outputs || !inputs || !filter_graph) {
@@ -120,26 +121,20 @@ static int init_filters(const char *filters_descr)
     }
 
     /* buffer video sink: to terminate the filter chain. */
-    buffersink_ctx = avfilter_graph_alloc_filter(filter_graph, buffersink, "out");
-    if (!buffersink_ctx) {
+    ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
+                                       NULL, NULL, filter_graph);
+    if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n");
-        ret = AVERROR(ENOMEM);
         goto end;
     }
 
-    ret = av_opt_set(buffersink_ctx, "pixel_formats", "gray8",
-                     AV_OPT_SEARCH_CHILDREN);
+    ret = av_opt_set_int_list(buffersink_ctx, "pix_fmts", pix_fmts,
+                              AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN);
     if (ret < 0) {
         av_log(NULL, AV_LOG_ERROR, "Cannot set output pixel format\n");
         goto end;
     }
 
-    ret = avfilter_init_dict(buffersink_ctx, NULL);
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Cannot initialize buffer sink\n");
-        goto end;
-    }
-
     /*
      * Set the endpoints for the filter graph. The filter_graph will
      * be linked to the graph described by filters_descr.
@@ -194,7 +189,7 @@ static void display_frame(const AVFrame *frame, AVRational time_base)
             delay = av_rescale_q(frame->pts - last_pts,
                                  time_base, AV_TIME_BASE_Q);
             if (delay > 0 && delay < 1000000)
-                av_usleep(delay);
+                usleep(delay);
         }
         last_pts = frame->pts;
     }
@@ -281,25 +276,6 @@ int main(int argc, char **argv)
         }
         av_packet_unref(packet);
     }
-    if (ret == AVERROR_EOF) {
-        /* signal EOF to the filtergraph */
-        if (av_buffersrc_add_frame_flags(buffersrc_ctx, NULL, 0) < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Error while closing the filtergraph\n");
-            goto end;
-        }
-
-        /* pull remaining frames from the filtergraph */
-        while (1) {
-            ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
-            if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
-                break;
-            if (ret < 0)
-                goto end;
-            display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
-            av_frame_unref(filt_frame);
-        }
-    }
-
 end:
     avfilter_graph_free(&filter_graph);
     avcodec_free_context(&dec_ctx);

doc/examples/demux_decode.c

@@ -78,9 +78,9 @@ static int output_video_frame(AVFrame *frame)
 
     /* copy decoded frame to destination buffer:
      * this is required since rawvideo expects non aligned data */
-    av_image_copy2(video_dst_data, video_dst_linesize,
-                   frame->data, frame->linesize,
-                   pix_fmt, width, height);
+    av_image_copy(video_dst_data, video_dst_linesize,
+                  (const uint8_t **)(frame->data), frame->linesize,
+                  pix_fmt, width, height);
 
     /* write to rawvideo file */
     fwrite(video_dst_data[0], 1, video_dst_bufsize, video_dst_file);
@@ -138,9 +138,11 @@ static int decode_packet(AVCodecContext *dec, const AVPacket *pkt)
             ret = output_audio_frame(frame);
 
         av_frame_unref(frame);
+        if (ret < 0)
+            return ret;
     }
 
-    return ret;
+    return 0;
 }
 
 static int open_codec_context(int *stream_idx,

doc/examples/filter_audio.c

@@ -41,15 +41,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libavutil/channel_layout.h>
-#include <libavutil/md5.h>
-#include <libavutil/mem.h>
-#include <libavutil/opt.h>
-#include <libavutil/samplefmt.h>
+#include "libavutil/channel_layout.h"
+#include "libavutil/md5.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
 
-#include <libavfilter/avfilter.h>
-#include <libavfilter/buffersink.h>
-#include <libavfilter/buffersrc.h>
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersink.h"
+#include "libavfilter/buffersrc.h"
 
 #define INPUT_SAMPLERATE     48000
 #define INPUT_FORMAT         AV_SAMPLE_FMT_FLTP
@@ -270,6 +270,7 @@ int main(int argc, char *argv[])
     AVFilterGraph *graph;
     AVFilterContext *src, *sink;
     AVFrame *frame;
+    uint8_t errstr[1024];
     float duration;
     int err, nb_frames, i;
 
@@ -294,7 +295,6 @@ int main(int argc, char *argv[])
 
     md5 = av_md5_alloc();
     if (!md5) {
-        av_frame_free(&frame);
         fprintf(stderr, "Error allocating the MD5 context\n");
         return 1;
     }
@@ -302,10 +302,8 @@ int main(int argc, char *argv[])
     /* Set up the filtergraph. */
     err = init_filter_graph(&graph, &src, &sink);
     if (err < 0) {
-        av_frame_free(&frame);
-        av_freep(&md5);
         fprintf(stderr, "Unable to init filter graph:");
-        return 1;
+        goto fail;
     }
 
     /* the main filtering loop */
@@ -356,10 +354,7 @@ int main(int argc, char *argv[])
     return 0;
 
 fail:
-    avfilter_graph_free(&graph);
-    av_frame_free(&frame);
-    av_freep(&md5);
-
-    fprintf(stderr, "%s\n", av_err2str(err));
+    av_strerror(err, errstr, sizeof(errstr));
+    fprintf(stderr, "%s\n", errstr);
     return 1;
 }

doc/examples/hw_decode.c

@@ -35,7 +35,6 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavutil/mem.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/hwcontext.h>
 #include <libavutil/opt.h>

doc/examples/mux.c

@@ -347,7 +347,8 @@ 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 = swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_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);
         av_assert0(dst_nb_samples == frame->nb_samples);
 
         /* when we pass a frame to the encoder, it may keep a reference to it
@@ -378,27 +379,27 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
 /**************************************************************/
 /* video output */
 
-static AVFrame *alloc_frame(enum AVPixelFormat pix_fmt, int width, int height)
+static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
 {
-    AVFrame *frame;
+    AVFrame *picture;
     int ret;
 
-    frame = av_frame_alloc();
-    if (!frame)
+    picture = av_frame_alloc();
+    if (!picture)
         return NULL;
 
-    frame->format = pix_fmt;
-    frame->width  = width;
-    frame->height = height;
+    picture->format = pix_fmt;
+    picture->width  = width;
+    picture->height = height;
 
     /* allocate the buffers for the frame data */
-    ret = av_frame_get_buffer(frame, 0);
+    ret = av_frame_get_buffer(picture, 0);
     if (ret < 0) {
         fprintf(stderr, "Could not allocate frame data.\n");
         exit(1);
     }
 
-    return frame;
+    return picture;
 }
 
 static void open_video(AVFormatContext *oc, const AVCodec *codec,
@@ -418,8 +419,8 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec,
         exit(1);
     }
 
-    /* allocate and init a reusable frame */
-    ost->frame = alloc_frame(c->pix_fmt, c->width, c->height);
+    /* allocate and init a re-usable frame */
+    ost->frame = alloc_picture(c->pix_fmt, c->width, c->height);
     if (!ost->frame) {
         fprintf(stderr, "Could not allocate video frame\n");
         exit(1);
@@ -430,9 +431,9 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec,
      * output format. */
     ost->tmp_frame = NULL;
     if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
-        ost->tmp_frame = alloc_frame(AV_PIX_FMT_YUV420P, c->width, c->height);
+        ost->tmp_frame = alloc_picture(AV_PIX_FMT_YUV420P, c->width, c->height);
         if (!ost->tmp_frame) {
-            fprintf(stderr, "Could not allocate temporary video frame\n");
+            fprintf(stderr, "Could not allocate temporary picture\n");
             exit(1);
         }
     }

doc/examples/qsv_decode.c

@@ -28,18 +28,20 @@
  * GPU video surfaces, write the decoded frames to an output file.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
+#include "libavformat/avformat.h"
+#include "libavformat/avio.h"
 
-#include <libavcodec/avcodec.h>
+#include "libavcodec/avcodec.h"
 
-#include <libavutil/buffer.h>
-#include <libavutil/error.h>
-#include <libavutil/hwcontext.h>
-#include <libavutil/hwcontext_qsv.h>
-#include <libavutil/mem.h>
+#include "libavutil/buffer.h"
+#include "libavutil/error.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_qsv.h"
+#include "libavutil/mem.h"
 
 static int get_format(AVCodecContext *avctx, const enum AVPixelFormat *pix_fmts)
 {
@@ -219,8 +221,11 @@ int main(int argc, char **argv)
     ret = decode_packet(decoder_ctx, frame, sw_frame, NULL, output_ctx);
 
 finish:
-    if (ret < 0)
-        fprintf(stderr, "%s\n", av_err2str(ret));
+    if (ret < 0) {
+        char buf[1024];
+        av_strerror(ret, buf, sizeof(buf));
+        fprintf(stderr, "%s\n", buf);
+    }
 
     avformat_close_input(&input_ctx);
 

doc/examples/qsv_transcode.c

@@ -38,7 +38,6 @@
 #include <errno.h>
 
 #include <libavutil/hwcontext.h>
-#include <libavutil/mem.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/opt.h>
@@ -63,10 +62,10 @@ static int str_to_dict(char* optstr, AVDictionary **opt)
         return 0;
     key = strtok(optstr, " ");
     if (key == NULL)
-        return AVERROR(EINVAL);
+        return AVERROR(ENAVAIL);
     value = strtok(NULL, " ");
     if (value == NULL)
-        return AVERROR(EINVAL);
+        return AVERROR(ENAVAIL);
     av_dict_set(opt, key, value, 0);
     do {
         key = strtok(NULL, " ");
@@ -74,9 +73,10 @@ static int str_to_dict(char* optstr, AVDictionary **opt)
             return 0;
         value = strtok(NULL, " ");
         if (value == NULL)
-            return AVERROR(EINVAL);
+            return AVERROR(ENAVAIL);
         av_dict_set(opt, key, value, 0);
-    } while(1);
+    } while(key != NULL);
+    return 0;
 }
 
 static int dynamic_set_parameter(AVCodecContext *avctx)
@@ -88,7 +88,7 @@ static int dynamic_set_parameter(AVCodecContext *avctx)
     if (current_setting_number < setting_number &&
         frame_number == dynamic_setting[current_setting_number].frame_number) {
         AVDictionaryEntry *e = NULL;
-        ret = str_to_dict(dynamic_setting[current_setting_number++].optstr, &opts);
+        ret = str_to_dict(dynamic_setting[current_setting_number].optstr, &opts);
         if (ret < 0) {
             fprintf(stderr, "The dynamic parameter is wrong\n");
             goto fail;
@@ -101,7 +101,7 @@ static int dynamic_set_parameter(AVCodecContext *avctx)
         /* Set codec specific option */
         if ((ret = av_opt_set_dict(avctx->priv_data, &opts)) < 0)
             goto fail;
-        /* There is no "framerate" option in common option list. Use "-r" to set
+        /* There is no "framerate" option in commom option list. Use "-r" to set
          * framerate, which is compatible with ffmpeg commandline. The video is
          * assumed to be average frame rate, so set time_base to 1/framerate. */
         e = av_dict_get(opts, "r", NULL, 0);
@@ -180,8 +180,8 @@ static int open_input_file(char *filename)
         decoder = avcodec_find_decoder_by_name("mjpeg_qsv");
         break;
     default:
-        fprintf(stderr, "Codec is not supported by qsv\n");
-        return AVERROR(EINVAL);
+        fprintf(stderr, "Codec is not supportted by qsv\n");
+        return AVERROR(ENAVAIL);
     }
 
     if (!(decoder_ctx = avcodec_alloc_context3(decoder)))
@@ -289,7 +289,7 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec, char *optstr)
                 fprintf(stderr, "Failed to set encoding parameter.\n");
                 goto fail;
             }
-            /* There is no "framerate" option in common option list. Use "-r" to
+            /* There is no "framerate" option in commom option list. Use "-r" to
             * set framerate, which is compatible with ffmpeg commandline. The
             * video is assumed to be average frame rate, so set time_base to
             * 1/framerate. */
@@ -334,15 +334,17 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec, char *optstr)
 
 fail:
         av_frame_free(&frame);
+        if (ret < 0)
+            return ret;
     }
-    return ret;
+    return 0;
 }
 
 int main(int argc, char **argv)
 {
     const AVCodec *enc_codec;
     int ret = 0;
-    AVPacket *dec_pkt = NULL;
+    AVPacket *dec_pkt;
 
     if (argc < 5 || (argc - 5) % 2) {
         av_log(NULL, AV_LOG_ERROR, "Usage: %s <input file> <encoder> <output file>"

doc/examples/remux.c

@@ -28,7 +28,6 @@
  * input to the output without transcoding.
  */
 
-#include <libavutil/mem.h>
 #include <libavutil/timestamp.h>
 #include <libavformat/avformat.h>
 

doc/examples/transcode.c

@@ -35,7 +35,6 @@
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
 #include <libavutil/channel_layout.h>
-#include <libavutil/mem.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
 
@@ -98,11 +97,6 @@ static int open_input_file(const char *filename)
                    "for stream #%u\n", i);
             return ret;
         }
-
-        /* Inform the decoder about the timebase for the packet timestamps.
-         * This is highly recommended, but not mandatory. */
-        codec_ctx->pkt_timebase = stream->time_base;
-
         /* Reencode video & audio and remux subtitles etc. */
         if (codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO
                 || codec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) {
@@ -171,38 +165,23 @@ static int open_output_file(const char *filename)
              * sample rate etc.). These properties can be changed for output
              * streams easily using filters */
             if (dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-                const enum AVPixelFormat *pix_fmts = NULL;
-
                 enc_ctx->height = dec_ctx->height;
                 enc_ctx->width = dec_ctx->width;
                 enc_ctx->sample_aspect_ratio = dec_ctx->sample_aspect_ratio;
-
-                ret = avcodec_get_supported_config(dec_ctx, NULL,
-                                                   AV_CODEC_CONFIG_PIX_FORMAT, 0,
-                                                   (const void**)&pix_fmts, NULL);
-
                 /* take first format from list of supported formats */
-                enc_ctx->pix_fmt = (ret >= 0 && pix_fmts) ?
-                                   pix_fmts[0] : dec_ctx->pix_fmt;
-
+                if (encoder->pix_fmts)
+                    enc_ctx->pix_fmt = encoder->pix_fmts[0];
+                else
+                    enc_ctx->pix_fmt = dec_ctx->pix_fmt;
                 /* video time_base can be set to whatever is handy and supported by encoder */
                 enc_ctx->time_base = av_inv_q(dec_ctx->framerate);
             } else {
-                const enum AVSampleFormat *sample_fmts = NULL;
-
                 enc_ctx->sample_rate = dec_ctx->sample_rate;
                 ret = av_channel_layout_copy(&enc_ctx->ch_layout, &dec_ctx->ch_layout);
                 if (ret < 0)
                     return ret;
-
-                ret = avcodec_get_supported_config(dec_ctx, NULL,
-                                                   AV_CODEC_CONFIG_SAMPLE_FORMAT, 0,
-                                                   (const void**)&sample_fmts, NULL);
-
                 /* take first format from list of supported formats */
-                enc_ctx->sample_fmt = (ret >= 0 && sample_fmts) ?
-                                      sample_fmts[0] : dec_ctx->sample_fmt;
-
+                enc_ctx->sample_fmt = encoder->sample_fmts[0];
                 enc_ctx->time_base = (AVRational){1, enc_ctx->sample_rate};
             }
 
@@ -212,7 +191,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);
@@ -287,7 +266,7 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
         snprintf(args, sizeof(args),
                 "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
                 dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt,
-                dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den,
+                dec_ctx->time_base.num, dec_ctx->time_base.den,
                 dec_ctx->sample_aspect_ratio.num,
                 dec_ctx->sample_aspect_ratio.den);
 
@@ -298,10 +277,10 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
             goto end;
         }
 
-        buffersink_ctx = avfilter_graph_alloc_filter(filter_graph, buffersink, "out");
-        if (!buffersink_ctx) {
+        ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
+                NULL, NULL, filter_graph);
+        if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Cannot create buffer sink\n");
-            ret = AVERROR(ENOMEM);
             goto end;
         }
 
@@ -312,12 +291,6 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
             av_log(NULL, AV_LOG_ERROR, "Cannot set output pixel format\n");
             goto end;
         }
-
-        ret = avfilter_init_dict(buffersink_ctx, NULL);
-        if (ret < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Cannot initialize buffer sink\n");
-            goto end;
-        }
     } else if (dec_ctx->codec_type == AVMEDIA_TYPE_AUDIO) {
         char buf[64];
         buffersrc = avfilter_get_by_name("abuffer");
@@ -333,7 +306,7 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
         av_channel_layout_describe(&dec_ctx->ch_layout, buf, sizeof(buf));
         snprintf(args, sizeof(args),
                 "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s",
-                dec_ctx->pkt_timebase.num, dec_ctx->pkt_timebase.den, dec_ctx->sample_rate,
+                dec_ctx->time_base.num, dec_ctx->time_base.den, dec_ctx->sample_rate,
                 av_get_sample_fmt_name(dec_ctx->sample_fmt),
                 buf);
         ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in",
@@ -343,10 +316,10 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
             goto end;
         }
 
-        buffersink_ctx = avfilter_graph_alloc_filter(filter_graph, buffersink, "out");
-        if (!buffersink_ctx) {
+        ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
+                NULL, NULL, filter_graph);
+        if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Cannot create audio buffer sink\n");
-            ret = AVERROR(ENOMEM);
             goto end;
         }
 
@@ -373,15 +346,6 @@ static int init_filter(FilteringContext* fctx, AVCodecContext *dec_ctx,
             av_log(NULL, AV_LOG_ERROR, "Cannot set output sample rate\n");
             goto end;
         }
-
-        if (enc_ctx->frame_size > 0)
-            av_buffersink_set_frame_size(buffersink_ctx, enc_ctx->frame_size);
-
-        ret = avfilter_init_dict(buffersink_ctx, NULL);
-        if (ret < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Cannot initialize audio buffer sink\n");
-            goto end;
-        }
     } else {
         ret = AVERROR_UNKNOWN;
         goto end;
@@ -472,10 +436,6 @@ static int encode_write_frame(unsigned int stream_index, int flush)
     /* encode filtered frame */
     av_packet_unref(enc_pkt);
 
-    if (filt_frame && filt_frame->pts != AV_NOPTS_VALUE)
-        filt_frame->pts = av_rescale_q(filt_frame->pts, filt_frame->time_base,
-                                       stream->enc_ctx->time_base);
-
     ret = avcodec_send_frame(stream->enc_ctx, filt_frame);
 
     if (ret < 0)
@@ -530,7 +490,6 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index)
             break;
         }
 
-        filter->filtered_frame->time_base = av_buffersink_get_time_base(filter->buffersink_ctx);;
         filter->filtered_frame->pict_type = AV_PICTURE_TYPE_NONE;
         ret = encode_write_frame(stream_index, 0);
         av_frame_unref(filter->filtered_frame);
@@ -585,6 +544,9 @@ int main(int argc, char **argv)
 
             av_log(NULL, AV_LOG_DEBUG, "Going to reencode&filter the frame\n");
 
+            av_packet_rescale_ts(packet,
+                                 ifmt_ctx->streams[stream_index]->time_base,
+                                 stream->dec_ctx->time_base);
             ret = avcodec_send_packet(stream->dec_ctx, packet);
             if (ret < 0) {
                 av_log(NULL, AV_LOG_ERROR, "Decoding failed\n");
@@ -616,38 +578,11 @@ int main(int argc, char **argv)
         av_packet_unref(packet);
     }
 
-    /* flush decoders, filters and encoders */
+    /* flush filters and encoders */
     for (i = 0; i < ifmt_ctx->nb_streams; i++) {
-        StreamContext *stream;
-
+        /* flush filter */
         if (!filter_ctx[i].filter_graph)
             continue;
-
-        stream = &stream_ctx[i];
-
-        av_log(NULL, AV_LOG_INFO, "Flushing stream %u decoder\n", i);
-
-        /* flush decoder */
-        ret = avcodec_send_packet(stream->dec_ctx, NULL);
-        if (ret < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Flushing decoding failed\n");
-            goto end;
-        }
-
-        while (ret >= 0) {
-            ret = avcodec_receive_frame(stream->dec_ctx, stream->dec_frame);
-            if (ret == AVERROR_EOF)
-                break;
-            else if (ret < 0)
-                goto end;
-
-            stream->dec_frame->pts = stream->dec_frame->best_effort_timestamp;
-            ret = filter_encode_write_frame(stream->dec_frame, i);
-            if (ret < 0)
-                goto end;
-        }
-
-        /* flush filter */
         ret = filter_encode_write_frame(NULL, i);
         if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR, "Flushing filter failed\n");

doc/examples/transcode_aac.c

@@ -29,20 +29,19 @@
 
 #include <stdio.h>
 
-#include <libavutil/mem.h>
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
+#include "libavformat/avformat.h"
+#include "libavformat/avio.h"
 
-#include <libavcodec/avcodec.h>
+#include "libavcodec/avcodec.h"
 
-#include <libavutil/audio_fifo.h>
-#include <libavutil/avassert.h>
-#include <libavutil/avstring.h>
-#include <libavutil/channel_layout.h>
-#include <libavutil/frame.h>
-#include <libavutil/opt.h>
+#include "libavutil/audio_fifo.h"
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
 
-#include <libswresample/swresample.h>
+#include "libswresample/swresample.h"
 
 /* The output bit rate in bit/s */
 #define OUTPUT_BIT_RATE 96000
@@ -448,17 +447,26 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
     int error;
 
     /* Allocate as many pointers as there are audio channels.
-     * Each pointer will point to the audio samples of the corresponding
+     * Each pointer will later point to the audio samples of the corresponding
      * channels (although it may be NULL for interleaved formats).
-     * Allocate memory for the samples of all channels in one consecutive
+     */
+    if (!(*converted_input_samples = calloc(output_codec_context->ch_layout.nb_channels,
+                                            sizeof(**converted_input_samples)))) {
+        fprintf(stderr, "Could not allocate converted input sample pointers\n");
+        return AVERROR(ENOMEM);
+    }
+
+    /* Allocate memory for the samples of all channels in one consecutive
      * block for convenience. */
-    if ((error = av_samples_alloc_array_and_samples(converted_input_samples, NULL,
+    if ((error = av_samples_alloc(*converted_input_samples, NULL,
                                   output_codec_context->ch_layout.nb_channels,
                                   frame_size,
                                   output_codec_context->sample_fmt, 0)) < 0) {
         fprintf(stderr,
                 "Could not allocate converted input samples (error '%s')\n",
                 av_err2str(error));
+        av_freep(&(*converted_input_samples)[0]);
+        free(*converted_input_samples);
         return error;
     }
     return 0;
@@ -590,9 +598,10 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
     ret = 0;
 
 cleanup:
-    if (converted_input_samples)
+    if (converted_input_samples) {
         av_freep(&converted_input_samples[0]);
-    av_freep(&converted_input_samples);
+        free(converted_input_samples);
+    }
     av_frame_free(&input_frame);
 
     return ret;

doc/examples/vaapi_encode.c

@@ -88,10 +88,6 @@ 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:

doc/examples/vaapi_transcode.c

@@ -215,8 +215,10 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec)
 
 fail:
         av_frame_free(&frame);
+        if (ret < 0)
+            return ret;
     }
-    return ret;
+    return 0;
 }
 
 int main(int argc, char **argv)

doc/faq.texi

@@ -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

doc/fate.texi

@@ -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
@@ -208,13 +200,6 @@ Download/synchronize sample files to the configured samples directory.
 @item fate-list
 Will list all fate/regression test targets.
 
-@item fate-list-failing
-List the fate tests that failed the last time they were executed.
-
-@item fate-clear-reports
-Remove the test reports from previous test executions (getting rid of
-potentially stale results from fate-list-failing).
-
 @item fate
 Run the FATE test suite (requires the fate-suite dataset).
 @end table
@@ -238,14 +223,6 @@ meaning only while running the regression tests.
 Specify how many threads to use while running regression tests, it is
 quite useful to detect thread-related regressions.
 
-This variable may be set to the string "random", optionally followed by a
-number, like "random99", This will cause each test to use a random number of
-threads. If a number is specified, it is used as a maximum number of threads,
-otherwise 16 is the maximum.
-
-In case a test fails, the thread count used for it will be written into the
-errfile.
-
 @item THREAD_TYPE
 Specify which threading strategy test, either @samp{slice} or @samp{frame},
 by default @samp{slice+frame}

doc/fate_config.sh.template

@@ -1,5 +1,5 @@
 slot=                                    # some unique identifier
-repo=https://git.ffmpeg.org/ffmpeg.git   # the source repository
+repo=git://source.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
@@ -31,25 +31,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"

doc/ffplay.texi

@@ -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

doc/ffprobe.texi

@@ -41,15 +41,15 @@ ffprobe will show it.
 
 ffprobe output is designed to be easily parsable by a textual filter,
 and consists of one or more sections of a form defined by the selected
-writer, which is specified by the @option{output_format} option.
+writer, which is specified by the @option{print_format} option.
 
 Sections may contain other nested sections, and are identified by a
 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
 
@@ -83,7 +83,7 @@ Use sexagesimal format HH:MM:SS.MICROSECONDS for time values.
 Prettify the format of the displayed values, it corresponds to the
 options "-unit -prefix -byte_binary_prefix -sexagesimal".
 
-@item -output_format, -of, -print_format @var{writer_name}[=@var{writer_options}]
+@item -of, -print_format @var{writer_name}[=@var{writer_options}]
 Set the output printing format.
 
 @var{writer_name} specifies the name of the writer, and
@@ -91,7 +91,7 @@ Set the output printing format.
 
 For example for printing the output in JSON format, specify:
 @example
--output_format json
+-print_format json
 @end example
 
 For more details on the available output printing formats, see the
@@ -139,6 +139,13 @@ stream.
 All the container format information is printed within a section with
 name "FORMAT".
 
+@item -show_format_entry @var{name}
+Like @option{-show_format}, but only prints the specified entry of the
+container format information, rather than all. This option may be given more
+than once, then all specified entries will be shown.
+
+This option is deprecated, use @code{show_entries} instead.
+
 @item -show_entries @var{section_entries}
 Set list of entries to show.
 
@@ -225,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.
 
@@ -344,19 +344,6 @@ while other writers always print them. This option enables one to control this b
 Valid values are @code{always}/@code{1}, @code{never}/@code{0} and @code{auto}/@code{-1}.
 Default is @var{auto}.
 
-@item -analyze_frames
-Analyze frames and/or their side data up to the provided read interval,
-providing additional information that may be useful at a stream level.
-Must be paired with the @option{-show_streams} option or it will have no effect.
-
-Currently, the additional fields provided by this option when enabled are the
-@code{closed_captions} and @code{film_grain} fields.
-
-For example, to analyze the first 20 seconds and populate these fields:
-@example
-ffprobe -show_streams -analyze_frames -read_intervals "%+20" INPUT
-@end example
-
 @item -bitexact
 Force bitexact output, useful to produce output which is not dependent
 on the specific build.
@@ -368,12 +355,6 @@ Read @var{input_url}.
 Write output to @var{output_url}. If not specified, the output is sent
 to stdout.
 
-@item -c:@var{media_specifier} @var{codec_name}
-@itemx -codec:@var{media_specifier} @var{codec_name}
-Force a specific decoder implementation for the stream identified by
-@var{media_specifier}, which can assume the values @code{a} (audio),
-@code{v} (video), @code{s} (subtitle), and @code{d} (data).
-
 @end table
 @c man end
 
@@ -434,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.
 

doc/ffprobe.xsd

@@ -1,529 +1,389 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://www.ffmpeg.org/schema/ffprobe"
-            xmlns:ffprobe="http://www.ffmpeg.org/schema/ffprobe">
-
-  <xsd:element name="ffprobe" type="ffprobe:ffprobeType"/>
-
-  <xsd:complexType name="ffprobeType">
-    <xsd:sequence>
-      <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1" />
-      <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="pixel_formats"    type="ffprobe:pixelFormatsType"    minOccurs="0" maxOccurs="1" />
-      <xsd:element name="packets"  type="ffprobe:packetsType" minOccurs="0" maxOccurs="1" />
-      <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" />
-      <xsd:element name="error"    type="ffprobe:errorType"   minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="packetsType">
-    <xsd:sequence>
-      <xsd:element name="packet" type="ffprobe:packetType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="framesType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="frame"    type="ffprobe:frameType"/>
-      <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="packetsAndFramesType">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="packet"   type="ffprobe:packetType"/>
-      <xsd:element name="frame"    type="ffprobe:frameType"/>
-      <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="tagsType">
-    <xsd:sequence>
-      <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="packetType">
-    <xsd:sequence>
-      <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="side_data_list" type="ffprobe:packetSideDataListType"   minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-
-    <xsd:attribute name="codec_type"    type="xsd:string" use="required" />
-    <xsd:attribute name="stream_index"  type="xsd:int" use="required" />
-    <xsd:attribute name="pts"           type="xsd:long"  />
-    <xsd:attribute name="pts_time"      type="xsd:float" />
-    <xsd:attribute name="dts"           type="xsd:long"  />
-    <xsd:attribute name="dts_time"      type="xsd:float" />
-    <xsd:attribute name="duration"      type="xsd:long"  />
-    <xsd:attribute name="duration_time" type="xsd:float" />
-    <xsd:attribute name="size"          type="xsd:long" use="required" />
-    <xsd:attribute name="pos"           type="xsd:long"  />
-    <xsd:attribute name="flags"         type="xsd:string" use="required" />
-    <xsd:attribute name="data"          type="xsd:string" />
-    <xsd:attribute name="data_hash"     type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="packetSideDataListType">
-    <xsd:sequence>
-      <xsd:element name="side_data" type="ffprobe:packetSideDataType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="packetSideDataType">
-    <xsd:sequence>
-      <xsd:element name="side_datum" type="ffprobe:packetSideDatumType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="type" type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="packetSideDatumType">
-    <xsd:attribute name="key"   type="xsd:string"/>
-    <xsd:attribute name="value" type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameType">
-    <xsd:sequence>
-      <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="logs" type="ffprobe:logsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="side_data_list" type="ffprobe:frameSideDataListType"   minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-
-    <xsd:attribute name="media_type"    type="xsd:string" use="required"/>
-    <xsd:attribute name="stream_index"  type="xsd:int"  />
-    <xsd:attribute name="key_frame"     type="xsd:int"    use="required"/>
-    <xsd:attribute name="pts"           type="xsd:long" />
-    <xsd:attribute name="pts_time"      type="xsd:float"/>
-    <xsd:attribute name="pkt_dts"       type="xsd:long" />
-    <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="duration"      type="xsd:long" />
-    <xsd:attribute name="duration_time" type="xsd:float"/>
-    <xsd:attribute name="pkt_pos"       type="xsd:long" />
-    <xsd:attribute name="pkt_size"      type="xsd:int" />
-
-    <!-- audio attributes -->
-    <xsd:attribute name="sample_fmt"             type="xsd:string"/>
-    <xsd:attribute name="nb_samples"             type="xsd:long"  />
-    <xsd:attribute name="channels"               type="xsd:int"   />
-    <xsd:attribute name="channel_layout"         type="xsd:string"/>
-
-    <!-- video attributes -->
-    <xsd:attribute name="width"                  type="xsd:long"  />
-    <xsd:attribute name="height"                 type="xsd:long"  />
-    <xsd:attribute name="crop_top"               type="xsd:long"  />
-    <xsd:attribute name="crop_bottom"            type="xsd:long"  />
-    <xsd:attribute name="crop_left"              type="xsd:long"  />
-    <xsd:attribute name="crop_right"             type="xsd:long"  />
-    <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="interlaced_frame"       type="xsd:int"   />
-    <xsd:attribute name="top_field_first"        type="xsd:int"   />
-    <xsd:attribute name="lossless"               type="xsd:int"   />
-    <xsd:attribute name="repeat_pict"            type="xsd:int"   />
-    <xsd:attribute name="color_range"            type="xsd:string"/>
-    <xsd:attribute name="color_space"            type="xsd:string"/>
-    <xsd:attribute name="color_primaries"        type="xsd:string"/>
-    <xsd:attribute name="color_transfer"         type="xsd:string"/>
-    <xsd:attribute name="chroma_location"        type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="logsType">
-    <xsd:sequence>
-      <xsd:element name="log" type="ffprobe:logType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="logType">
-    <xsd:attribute name="context"                     type="xsd:string"/>
-    <xsd:attribute name="level"                       type="xsd:int"   />
-    <xsd:attribute name="category"                    type="xsd:int"   />
-    <xsd:attribute name="parent_context"              type="xsd:string"/>
-    <xsd:attribute name="parent_category"             type="xsd:int"   />
-    <xsd:attribute name="message"                     type="xsd:string"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameSideDataListType">
-    <xsd:sequence>
-      <xsd:element name="side_data" type="ffprobe:frameSideDataType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <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"/>
-    <xsd:attribute name="side_data_size"              type="xsd:int"   />
-    <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"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="frameSideDataTimecodeType">
-    <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" />
-    <xsd:attribute name="pts_time"           type="xsd:float"/>
-    <xsd:attribute name="format"             type="xsd:int"  />
-    <xsd:attribute name="start_display_time" type="xsd:int"  />
-    <xsd:attribute name="end_display_time"   type="xsd:int"  />
-    <xsd:attribute name="num_rects"          type="xsd:int"  />
-  </xsd:complexType>
-
-  <xsd:complexType name="streamsType">
-    <xsd:sequence>
-      <xsd:element name="stream" type="ffprobe:streamType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="programsType">
-    <xsd:sequence>
-      <xsd:element name="program" type="ffprobe:programType" minOccurs="0" maxOccurs="unbounded"/>
-    </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" />
-    <xsd:attribute name="original"         type="xsd:int" use="required" />
-    <xsd:attribute name="comment"          type="xsd:int" use="required" />
-    <xsd:attribute name="lyrics"           type="xsd:int" use="required" />
-    <xsd:attribute name="karaoke"          type="xsd:int" use="required" />
-    <xsd:attribute name="forced"           type="xsd:int" use="required" />
-    <xsd:attribute name="hearing_impaired" type="xsd:int" use="required" />
-    <xsd:attribute name="visual_impaired"  type="xsd:int" use="required" />
-    <xsd:attribute name="clean_effects"    type="xsd:int" use="required" />
-    <xsd:attribute name="attached_pic"     type="xsd:int" use="required" />
-    <xsd:attribute name="timed_thumbnails" type="xsd:int" use="required" />
-    <xsd:attribute name="non_diegetic"     type="xsd:int" use="required" />
-    <xsd:attribute name="captions"         type="xsd:int" use="required" />
-    <xsd:attribute name="descriptions"     type="xsd:int" use="required" />
-    <xsd:attribute name="metadata"         type="xsd:int" use="required" />
-    <xsd:attribute name="dependent"        type="xsd:int" use="required" />
-    <xsd:attribute name="still_image"      type="xsd:int" use="required" />
-    <xsd:attribute name="multilayer"       type="xsd:int" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="streamType">
-    <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="side_data_list" type="ffprobe:packetSideDataListType"   minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-
-    <xsd:attribute name="index"            type="xsd:int" use="required"/>
-    <xsd:attribute name="codec_name"       type="xsd:string" />
-    <xsd:attribute name="codec_long_name"  type="xsd:string" />
-    <xsd:attribute name="profile"          type="xsd:string" />
-    <xsd:attribute name="codec_type"       type="xsd:string" />
-    <xsd:attribute name="codec_tag"        type="xsd:string" use="required"/>
-    <xsd:attribute name="codec_tag_string" type="xsd:string" use="required"/>
-    <xsd:attribute name="extradata"        type="xsd:string" />
-    <xsd:attribute name="extradata_size"   type="xsd:int"    />
-    <xsd:attribute name="extradata_hash"   type="xsd:string" />
-
-    <!-- video attributes -->
-    <xsd:attribute name="width"                type="xsd:int"/>
-    <xsd:attribute name="height"               type="xsd:int"/>
-    <xsd:attribute name="coded_width"          type="xsd:int"/>
-    <xsd:attribute name="coded_height"         type="xsd:int"/>
-    <xsd:attribute name="closed_captions"      type="xsd:boolean"/>
-    <xsd:attribute name="film_grain"           type="xsd:boolean"/>
-    <xsd:attribute name="has_b_frames"         type="xsd:int"/>
-    <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
-    <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
-    <xsd:attribute name="pix_fmt"              type="xsd:string"/>
-    <xsd:attribute name="level"                type="xsd:int"/>
-    <xsd:attribute name="color_range"          type="xsd:string"/>
-    <xsd:attribute name="color_space"          type="xsd:string"/>
-    <xsd:attribute name="color_transfer"       type="xsd:string"/>
-    <xsd:attribute name="color_primaries"      type="xsd:string"/>
-    <xsd:attribute name="chroma_location"      type="xsd:string"/>
-    <xsd:attribute name="field_order"          type="xsd:string"/>
-    <xsd:attribute name="refs"                 type="xsd:int"/>
-
-    <!-- audio attributes -->
-    <xsd:attribute name="sample_fmt"       type="xsd:string"/>
-    <xsd:attribute name="sample_rate"      type="xsd:int"/>
-    <xsd:attribute name="channels"         type="xsd:int"/>
-    <xsd:attribute name="channel_layout"   type="xsd:string"/>
-    <xsd:attribute name="bits_per_sample"  type="xsd:int"/>
-    <xsd:attribute name="initial_padding"  type="xsd:int"/>
-
-    <xsd:attribute name="id"               type="xsd:string"/>
-    <xsd:attribute name="r_frame_rate"     type="xsd:string" use="required"/>
-    <xsd:attribute name="avg_frame_rate"   type="xsd:string" use="required"/>
-    <xsd:attribute name="time_base"        type="xsd:string" use="required"/>
-    <xsd:attribute name="start_pts"        type="xsd:long"/>
-    <xsd:attribute name="start_time"       type="xsd:float"/>
-    <xsd:attribute name="duration_ts"      type="xsd:long"/>
-    <xsd:attribute name="duration"         type="xsd:float"/>
-    <xsd:attribute name="bit_rate"         type="xsd:int"/>
-    <xsd:attribute name="max_bit_rate"     type="xsd:int"/>
-    <xsd:attribute name="bits_per_raw_sample" type="xsd:int"/>
-    <xsd:attribute name="nb_frames"        type="xsd:int"/>
-    <xsd:attribute name="nb_read_frames"   type="xsd:int"/>
-    <xsd:attribute name="nb_read_packets"  type="xsd:int"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="programType">
-    <xsd:sequence>
-      <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="streams" type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="program_id"           type="xsd:int"    use="required"/>
-    <xsd:attribute name="program_num"          type="xsd:int"    use="required"/>
-    <xsd:attribute name="nb_streams"           type="xsd:int"    use="required"/>
-    <xsd:attribute name="pmt_pid"              type="xsd:int"    use="required"/>
-    <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"/>
-    </xsd:sequence>
-
-    <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"/>
-    <xsd:attribute name="duration"         type="xsd:float"/>
-    <xsd:attribute name="size"             type="xsd:long"/>
-    <xsd:attribute name="bit_rate"         type="xsd:long"/>
-    <xsd:attribute name="probe_score"      type="xsd:int"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="tagType">
-    <xsd:attribute name="key"   type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="errorType">
-    <xsd:attribute name="code"   type="xsd:int"    use="required"/>
-    <xsd:attribute name="string" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="programVersionType">
-    <xsd:attribute name="version"          type="xsd:string" use="required"/>
-    <xsd:attribute name="copyright"        type="xsd:string" use="required"/>
-    <xsd:attribute name="build_date"       type="xsd:string"/>
-    <xsd:attribute name="build_time"       type="xsd:string"/>
-    <xsd:attribute name="compiler_ident"   type="xsd:string" use="required"/>
-    <xsd:attribute name="configuration"    type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="chaptersType">
-    <xsd:sequence>
-      <xsd:element name="chapter" type="ffprobe:chapterType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="chapterType">
-    <xsd:sequence>
-      <xsd:element name="tags" type="ffprobe:tagsType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id"         type="xsd:int" use="required"/>
-    <xsd:attribute name="time_base"  type="xsd:string" use="required"/>
-    <xsd:attribute name="start"      type="xsd:int" use="required"/>
-    <xsd:attribute name="start_time" type="xsd:float"/>
-    <xsd:attribute name="end"        type="xsd:int" use="required"/>
-    <xsd:attribute name="end_time"   type="xsd:float" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="libraryVersionType">
-    <xsd:attribute name="name"        type="xsd:string" use="required"/>
-    <xsd:attribute name="major"       type="xsd:int"    use="required"/>
-    <xsd:attribute name="minor"       type="xsd:int"    use="required"/>
-    <xsd:attribute name="micro"       type="xsd:int"    use="required"/>
-    <xsd:attribute name="version"     type="xsd:int"    use="required"/>
-    <xsd:attribute name="ident"       type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="libraryVersionsType">
-    <xsd:sequence>
-      <xsd:element name="library_version" type="ffprobe:libraryVersionType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="pixelFormatFlagsType">
-    <xsd:attribute name="big_endian" type="xsd:int" use="required"/>
-    <xsd:attribute name="palette"    type="xsd:int" use="required"/>
-    <xsd:attribute name="bitstream"  type="xsd:int" use="required"/>
-    <xsd:attribute name="hwaccel"    type="xsd:int" use="required"/>
-    <xsd:attribute name="planar"     type="xsd:int" use="required"/>
-    <xsd:attribute name="rgb"        type="xsd:int" use="required"/>
-    <xsd:attribute name="alpha"      type="xsd:int" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="pixelFormatComponentType">
-    <xsd:attribute name="index"      type="xsd:int" use="required"/>
-    <xsd:attribute name="bit_depth"  type="xsd:int" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="pixelFormatComponentsType">
-    <xsd:sequence>
-      <xsd:element name="component" type="ffprobe:pixelFormatComponentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="pixelFormatType">
-    <xsd:sequence>
-      <xsd:element name="flags" type="ffprobe:pixelFormatFlagsType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="components" type="ffprobe:pixelFormatComponentsType" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="name"                type="xsd:string" use="required"/>
-    <xsd:attribute name="nb_components"       type="xsd:int"    use="required"/>
-    <xsd:attribute name="log2_chroma_w"       type="xsd:int"/>
-    <xsd:attribute name="log2_chroma_h"       type="xsd:int"/>
-    <xsd:attribute name="bits_per_pixel"      type="xsd:int"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="pixelFormatsType">
-    <xsd:sequence>
-      <xsd:element name="pixel_format" type="ffprobe:pixelFormatType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
+    targetNamespace="http://www.ffmpeg.org/schema/ffprobe"
+    xmlns:ffprobe="http://www.ffmpeg.org/schema/ffprobe">
+
+    <xsd:element name="ffprobe" type="ffprobe:ffprobeType"/>
+
+    <xsd:complexType name="ffprobeType">
+        <xsd:sequence>
+            <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1" />
+            <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="pixel_formats"    type="ffprobe:pixelFormatsType"    minOccurs="0" maxOccurs="1" />
+            <xsd:element name="packets"  type="ffprobe:packetsType" minOccurs="0" maxOccurs="1" />
+            <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="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" />
+            <xsd:element name="error"    type="ffprobe:errorType"   minOccurs="0" maxOccurs="1" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="packetsType">
+        <xsd:sequence>
+            <xsd:element name="packet" type="ffprobe:packetType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="framesType">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="frame"    type="ffprobe:frameType"/>
+            <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
+        </xsd:choice>
+    </xsd:complexType>
+
+    <xsd:complexType name="packetsAndFramesType">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="packet"   type="ffprobe:packetType"/>
+            <xsd:element name="frame"    type="ffprobe:frameType"/>
+            <xsd:element name="subtitle" type="ffprobe:subtitleType"/>
+        </xsd:choice>
+    </xsd:complexType>
+
+    <xsd:complexType name="packetType">
+      <xsd:sequence>
+        <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="side_data_list" type="ffprobe:packetSideDataListType"   minOccurs="0" maxOccurs="1" />
+      </xsd:sequence>
+
+      <xsd:attribute name="codec_type"    type="xsd:string" use="required" />
+      <xsd:attribute name="stream_index"  type="xsd:int" use="required" />
+      <xsd:attribute name="pts"           type="xsd:long"  />
+      <xsd:attribute name="pts_time"      type="xsd:float" />
+      <xsd:attribute name="dts"           type="xsd:long"  />
+      <xsd:attribute name="dts_time"      type="xsd:float" />
+      <xsd:attribute name="duration"      type="xsd:long"  />
+      <xsd:attribute name="duration_time" type="xsd:float" />
+      <xsd:attribute name="size"          type="xsd:long" use="required" />
+      <xsd:attribute name="pos"           type="xsd:long"  />
+      <xsd:attribute name="flags"         type="xsd:string" use="required" />
+      <xsd:attribute name="data"          type="xsd:string" />
+      <xsd:attribute name="data_hash"     type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="packetSideDataListType">
+        <xsd:sequence>
+            <xsd:element name="side_data" type="ffprobe:packetSideDataType" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="packetSideDataType">
+        <xsd:attribute name="side_data_type"              type="xsd:string"/>
+        <xsd:attribute name="side_data_size"              type="xsd:int"   />
+    </xsd:complexType>
+
+    <xsd:complexType name="frameType">
+      <xsd:sequence>
+            <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="logs" type="ffprobe:logsType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="side_data_list" type="ffprobe:frameSideDataListType"   minOccurs="0" maxOccurs="1" />
+      </xsd:sequence>
+
+      <xsd:attribute name="media_type"    type="xsd:string" use="required"/>
+      <xsd:attribute name="stream_index"  type="xsd:int"  />
+      <xsd:attribute name="key_frame"     type="xsd:int"    use="required"/>
+      <xsd:attribute name="pts"           type="xsd:long" />
+      <xsd:attribute name="pts_time"      type="xsd:float"/>
+      <xsd:attribute name="pkt_dts"       type="xsd:long" />
+      <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" />
+      <xsd:attribute name="pkt_size"      type="xsd:int" />
+
+      <!-- audio attributes -->
+      <xsd:attribute name="sample_fmt"             type="xsd:string"/>
+      <xsd:attribute name="nb_samples"             type="xsd:long"  />
+      <xsd:attribute name="channels"               type="xsd:int"   />
+      <xsd:attribute name="channel_layout"         type="xsd:string"/>
+
+      <!-- video attributes -->
+      <xsd:attribute name="width"                  type="xsd:long"  />
+      <xsd:attribute name="height"                 type="xsd:long"  />
+      <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"   />
+      <xsd:attribute name="color_range"            type="xsd:string"/>
+      <xsd:attribute name="color_space"            type="xsd:string"/>
+      <xsd:attribute name="color_primaries"        type="xsd:string"/>
+      <xsd:attribute name="color_transfer"         type="xsd:string"/>
+      <xsd:attribute name="chroma_location"        type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="logsType">
+        <xsd:sequence>
+            <xsd:element name="log" type="ffprobe:logType" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="logType">
+        <xsd:attribute name="context"                     type="xsd:string"/>
+        <xsd:attribute name="level"                       type="xsd:int"   />
+        <xsd:attribute name="category"                    type="xsd:int"   />
+        <xsd:attribute name="parent_context"              type="xsd:string"/>
+        <xsd:attribute name="parent_category"             type="xsd:int"   />
+        <xsd:attribute name="message"                     type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="frameSideDataListType">
+        <xsd:sequence>
+            <xsd:element name="side_data" type="ffprobe:frameSideDataType" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="frameSideDataType">
+        <xsd:sequence>
+            <xsd:element name="timecodes" type="ffprobe:frameSideDataTimecodeList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+
+        <xsd:attribute name="side_data_type"              type="xsd:string"/>
+        <xsd:attribute name="side_data_size"              type="xsd:int"   />
+        <xsd:attribute name="timecode"                    type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="frameSideDataTimecodeList">
+        <xsd:sequence>
+            <xsd:element name="timecode" type="ffprobe:frameSideDataTimecodeType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="frameSideDataTimecodeType">
+        <xsd:attribute name="value"              type="xsd:string"/>
+    </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" />
+      <xsd:attribute name="pts_time"           type="xsd:float"/>
+      <xsd:attribute name="format"             type="xsd:int"  />
+      <xsd:attribute name="start_display_time" type="xsd:int"  />
+      <xsd:attribute name="end_display_time"   type="xsd:int"  />
+      <xsd:attribute name="num_rects"          type="xsd:int"  />
+    </xsd:complexType>
+
+    <xsd:complexType name="streamsType">
+        <xsd:sequence>
+            <xsd:element name="stream" type="ffprobe:streamType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="programsType">
+        <xsd:sequence>
+            <xsd:element name="program" type="ffprobe:programType" 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" />
+      <xsd:attribute name="original"         type="xsd:int" use="required" />
+      <xsd:attribute name="comment"          type="xsd:int" use="required" />
+      <xsd:attribute name="lyrics"           type="xsd:int" use="required" />
+      <xsd:attribute name="karaoke"          type="xsd:int" use="required" />
+      <xsd:attribute name="forced"           type="xsd:int" use="required" />
+      <xsd:attribute name="hearing_impaired" type="xsd:int" use="required" />
+      <xsd:attribute name="visual_impaired"  type="xsd:int" use="required" />
+      <xsd:attribute name="clean_effects"    type="xsd:int" use="required" />
+      <xsd:attribute name="attached_pic"     type="xsd:int" use="required" />
+      <xsd:attribute name="timed_thumbnails" type="xsd:int" use="required" />
+      <xsd:attribute name="captions"         type="xsd:int" use="required" />
+      <xsd:attribute name="descriptions"     type="xsd:int" use="required" />
+      <xsd:attribute name="metadata"         type="xsd:int" use="required" />
+      <xsd:attribute name="dependent"        type="xsd:int" use="required" />
+      <xsd:attribute name="still_image"      type="xsd:int" use="required" />
+    </xsd:complexType>
+
+    <xsd:complexType name="streamType">
+      <xsd:sequence>
+        <xsd:element name="disposition" type="ffprobe:streamDispositionType" minOccurs="0" maxOccurs="1"/>
+        <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="side_data_list" type="ffprobe:packetSideDataListType"   minOccurs="0" maxOccurs="1" />
+      </xsd:sequence>
+
+      <xsd:attribute name="index"            type="xsd:int" use="required"/>
+      <xsd:attribute name="codec_name"       type="xsd:string" />
+      <xsd:attribute name="codec_long_name"  type="xsd:string" />
+      <xsd:attribute name="profile"          type="xsd:string" />
+      <xsd:attribute name="codec_type"       type="xsd:string" />
+      <xsd:attribute name="codec_tag"        type="xsd:string" use="required"/>
+      <xsd:attribute name="codec_tag_string" type="xsd:string" use="required"/>
+      <xsd:attribute name="extradata"        type="xsd:string" />
+      <xsd:attribute name="extradata_size"   type="xsd:int"    />
+      <xsd:attribute name="extradata_hash"   type="xsd:string" />
+
+      <!-- video attributes -->
+      <xsd:attribute name="width"                type="xsd:int"/>
+      <xsd:attribute name="height"               type="xsd:int"/>
+      <xsd:attribute name="coded_width"          type="xsd:int"/>
+      <xsd:attribute name="coded_height"         type="xsd:int"/>
+      <xsd:attribute name="closed_captions"      type="xsd:boolean"/>
+      <xsd:attribute name="film_grain"           type="xsd:boolean"/>
+      <xsd:attribute name="has_b_frames"         type="xsd:int"/>
+      <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
+      <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
+      <xsd:attribute name="pix_fmt"              type="xsd:string"/>
+      <xsd:attribute name="level"                type="xsd:int"/>
+      <xsd:attribute name="color_range"          type="xsd:string"/>
+      <xsd:attribute name="color_space"          type="xsd:string"/>
+      <xsd:attribute name="color_transfer"       type="xsd:string"/>
+      <xsd:attribute name="color_primaries"      type="xsd:string"/>
+      <xsd:attribute name="chroma_location"      type="xsd:string"/>
+      <xsd:attribute name="field_order"          type="xsd:string"/>
+      <xsd:attribute name="refs"                 type="xsd:int"/>
+
+      <!-- audio attributes -->
+      <xsd:attribute name="sample_fmt"       type="xsd:string"/>
+      <xsd:attribute name="sample_rate"      type="xsd:int"/>
+      <xsd:attribute name="channels"         type="xsd:int"/>
+      <xsd:attribute name="channel_layout"   type="xsd:string"/>
+      <xsd:attribute name="bits_per_sample"  type="xsd:int"/>
+      <xsd:attribute name="initial_padding"  type="xsd:int"/>
+
+      <xsd:attribute name="id"               type="xsd:string"/>
+      <xsd:attribute name="r_frame_rate"     type="xsd:string" use="required"/>
+      <xsd:attribute name="avg_frame_rate"   type="xsd:string" use="required"/>
+      <xsd:attribute name="time_base"        type="xsd:string" use="required"/>
+      <xsd:attribute name="start_pts"        type="xsd:long"/>
+      <xsd:attribute name="start_time"       type="xsd:float"/>
+      <xsd:attribute name="duration_ts"      type="xsd:long"/>
+      <xsd:attribute name="duration"         type="xsd:float"/>
+      <xsd:attribute name="bit_rate"         type="xsd:int"/>
+      <xsd:attribute name="max_bit_rate"     type="xsd:int"/>
+      <xsd:attribute name="bits_per_raw_sample" type="xsd:int"/>
+      <xsd:attribute name="nb_frames"        type="xsd:int"/>
+      <xsd:attribute name="nb_read_frames"   type="xsd:int"/>
+      <xsd:attribute name="nb_read_packets"  type="xsd:int"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="programType">
+      <xsd:sequence>
+        <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="streams" type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/>
+      </xsd:sequence>
+
+      <xsd:attribute name="program_id"           type="xsd:int"    use="required"/>
+      <xsd:attribute name="program_num"          type="xsd:int"    use="required"/>
+      <xsd:attribute name="nb_streams"           type="xsd:int"    use="required"/>
+      <xsd:attribute name="pmt_pid"              type="xsd:int"    use="required"/>
+      <xsd:attribute name="pcr_pid"              type="xsd:int"    use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="formatType">
+      <xsd:sequence>
+        <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+
+      <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="format_name"      type="xsd:string" use="required"/>
+      <xsd:attribute name="format_long_name" type="xsd:string"/>
+      <xsd:attribute name="start_time"       type="xsd:float"/>
+      <xsd:attribute name="duration"         type="xsd:float"/>
+      <xsd:attribute name="size"             type="xsd:long"/>
+      <xsd:attribute name="bit_rate"         type="xsd:long"/>
+      <xsd:attribute name="probe_score"      type="xsd:int"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="tagType">
+      <xsd:attribute name="key"   type="xsd:string" use="required"/>
+      <xsd:attribute name="value" type="xsd:string" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="errorType">
+      <xsd:attribute name="code"   type="xsd:int"    use="required"/>
+      <xsd:attribute name="string" type="xsd:string" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="programVersionType">
+      <xsd:attribute name="version"          type="xsd:string" use="required"/>
+      <xsd:attribute name="copyright"        type="xsd:string" use="required"/>
+      <xsd:attribute name="build_date"       type="xsd:string"/>
+      <xsd:attribute name="build_time"       type="xsd:string"/>
+      <xsd:attribute name="compiler_ident"   type="xsd:string" use="required"/>
+      <xsd:attribute name="configuration"    type="xsd:string" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="chaptersType">
+      <xsd:sequence>
+        <xsd:element name="chapter" type="ffprobe:chapterType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="chapterType">
+      <xsd:sequence>
+        <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+
+      <xsd:attribute name="id"         type="xsd:int" use="required"/>
+      <xsd:attribute name="time_base"  type="xsd:string" use="required"/>
+      <xsd:attribute name="start"      type="xsd:int" use="required"/>
+      <xsd:attribute name="start_time" type="xsd:float"/>
+      <xsd:attribute name="end"        type="xsd:int" use="required"/>
+      <xsd:attribute name="end_time"   type="xsd:float" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="libraryVersionType">
+      <xsd:attribute name="name"        type="xsd:string" use="required"/>
+      <xsd:attribute name="major"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="minor"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="micro"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="version"     type="xsd:int"    use="required"/>
+      <xsd:attribute name="ident"       type="xsd:string" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="libraryVersionsType">
+        <xsd:sequence>
+          <xsd:element name="library_version" type="ffprobe:libraryVersionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="pixelFormatFlagsType">
+      <xsd:attribute name="big_endian" type="xsd:int" use="required"/>
+      <xsd:attribute name="palette"    type="xsd:int" use="required"/>
+      <xsd:attribute name="bitstream"  type="xsd:int" use="required"/>
+      <xsd:attribute name="hwaccel"    type="xsd:int" use="required"/>
+      <xsd:attribute name="planar"     type="xsd:int" use="required"/>
+      <xsd:attribute name="rgb"        type="xsd:int" use="required"/>
+      <xsd:attribute name="alpha"      type="xsd:int" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="pixelFormatComponentType">
+      <xsd:attribute name="index"      type="xsd:int" use="required"/>
+      <xsd:attribute name="bit_depth"  type="xsd:int" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="pixelFormatComponentsType">
+      <xsd:sequence>
+        <xsd:element name="component" type="ffprobe:pixelFormatComponentType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="pixelFormatType">
+      <xsd:sequence>
+        <xsd:element name="flags" type="ffprobe:pixelFormatFlagsType" minOccurs="0" maxOccurs="1"/>
+        <xsd:element name="components" type="ffprobe:pixelFormatComponentsType" minOccurs="0" maxOccurs="1"/>
+      </xsd:sequence>
+
+      <xsd:attribute name="name"                type="xsd:string" use="required"/>
+      <xsd:attribute name="nb_components"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="log2_chroma_w"       type="xsd:int"/>
+      <xsd:attribute name="log2_chroma_h"       type="xsd:int"/>
+      <xsd:attribute name="bits_per_pixel"      type="xsd:int"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="pixelFormatsType">
+      <xsd:sequence>
+        <xsd:element name="pixel_format" type="ffprobe:pixelFormatType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
 </xsd:schema>

doc/fftools-common-opts.texi

@@ -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
@@ -78,12 +58,7 @@ Match the stream by stream id (e.g. PID in MPEG-TS container).
 @item m:@var{key}[:@var{value}]
 Matches streams with the metadata tag @var{key} having the specified value. If
 @var{value} is not given, matches streams that contain the given tag with any
-value. The colon character ':' in @var{key} or @var{value} needs to be
-backslash-escaped.
-@item disp:@var{dispositions}[:@var{additional_stream_specifier}]
-Matches streams with the given disposition(s). @var{dispositions} is a list of
-one or more dispositions (as printed by the @option{-dispositions} option)
-joined with '+'.
+value.
 @item u
 Matches streams with usable configuration, the codec must be defined and the
 essential information such as video dimension or audio sample rate must be present.
@@ -226,10 +201,6 @@ and the "Last message repeated n times" line will be omitted.
 Indicates that log output should add a @code{[level]} prefix to each message
 line. This can be used as an alternative to log coloring, e.g. when dumping the
 log to file.
-@item time
-Indicates that log lines should be prefixed with time information.
-@item datetime
-Indicates that log lines should be prefixed with date and time information.
 @end table
 Flags can also be used alone by adding a '+'/'-' prefix to set/reset a single
 flag without affecting other @var{flags} or changing @var{loglevel}. When

doc/filter_design.txt

@@ -214,7 +214,6 @@ Frame scheduling
     FF_FILTER_FORWARD_STATUS(inlink, outlink);
     FF_FILTER_FORWARD_STATUS_ALL(inlink, filter);
     FF_FILTER_FORWARD_WANTED(outlink, inlink);
-    FF_FILTER_FORWARD_WANTED_ANY(filter, inlink);
 
   filter_frame
   ------------

doc/formats.texi

@@ -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
@@ -225,26 +224,9 @@ Specifies the maximum number of streams. This can be used to reject files that
 would require too many resources due to a large number of streams.
 
 @item skip_estimate_duration_from_pts @var{bool} (@emph{input})
-Skip estimation of input duration if it requires an additional probing for PTS at end of file.
+Skip estimation of input duration when calculated using PTS.
 At present, applicable for MPEG-PS and MPEG-TS.
 
-@item duration_probesize @var{integer} (@emph{input})
-Set probing size, in bytes, for input duration estimation when it actually requires
-an additional probing for PTS at end of file (at present: MPEG-PS and MPEG-TS).
-It is aimed at users interested in better durations probing for itself, or indirectly
-because using the concat demuxer, for example.
-The typical use case is an MPEG-TS CBR with a high bitrate, high video buffering and
-ending cleaning with similar PTS for video and audio: in such a scenario, the large
-physical gap between the last video packet and the last audio packet makes it necessary
-to read many bytes in order to get the video stream duration.
-Another use case is where the default probing behaviour only reaches a single video frame which is
-not the last one of the stream due to frame reordering, so the duration is not accurate.
-Setting this option has a performance impact even for small files because the probing
-size is fixed.
-Default behaviour is a general purpose trade-off, largely adaptive, but the probing size
-will not be extended to get streams durations at all costs.
-Must be an integer not lesser than 1, or 0 for default behaviour.
-
 @item strict, f_strict @var{integer} (@emph{input/output})
 Specify how strictly to follow the standards. @code{f_strict} is deprecated and
 should be used only via the @command{ffmpeg} tool.

doc/general_contents.texi

@@ -160,19 +160,6 @@ Go to @url{http://lame.sourceforge.net/} and follow the
 instructions for installing the library.
 Then pass @code{--enable-libmp3lame} to configure to enable it.
 
-@section LCEVCdec
-
-FFmpeg can make use of the liblcevc_dec library for LCEVC enhancement layer
-decoding on supported bitstreams.
-
-Go to @url{https://github.com/v-novaltd/LCEVCdec} and follow the instructions
-for installing the library. Then pass @code{--enable-liblcevc-dec} to configure to
-enable it.
-
-@float NOTE
-LCEVCdec is under the BSD-3-Clause-Clear License.
-@end float
-
 @section libilbc
 
 iLBC is a narrowband speech codec that has been made freely available
@@ -250,14 +237,6 @@ Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the
 instructions for installing the library.
 Then pass @code{--enable-libfdk-aac} to configure to enable it.
 
-@subsection LC3 library
-
-FFmpeg can make use of the Google LC3 library for LC3 decoding & encoding.
-
-Go to @url{https://github.com/google/liblc3/} and follow the instructions for
-installing the library.
-Then pass @code{--enable-liblc3} to configure to enable it.
-
 @section OpenH264
 
 FFmpeg can make use of the OpenH264 library for H.264 decoding and encoding.
@@ -364,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
@@ -625,7 +588,6 @@ library:
 @item raw AMR-NB                @tab   @tab X
 @item raw AMR-WB                @tab   @tab X
 @item raw APAC                  @tab   @tab X
-@item raw APV                   @tab X @tab X
 @item raw aptX                  @tab X @tab X
 @item raw aptX HD               @tab X @tab X
 @item raw Bonk                  @tab   @tab X
@@ -636,9 +598,7 @@ 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 G.728                 @tab   @tab X
 @item raw GSM                   @tab   @tab X
 @item raw H.261                 @tab X @tab X
 @item raw H.263                 @tab X @tab X
@@ -655,7 +615,6 @@ library:
 @item raw video                 @tab X @tab X
 @item raw id RoQ                @tab X @tab
 @item raw OBU                   @tab X @tab X
-@item raw OSQ                   @tab   @tab X
 @item raw SBC                   @tab X @tab X
 @item raw Shorten               @tab   @tab X
 @item raw TAK                   @tab   @tab X
@@ -693,8 +652,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.
@@ -897,7 +855,6 @@ following image formats are supported:
     @tab fourcc: apch,apcn,apcs,apco,ap4h,ap4x
 @item Apple QuickDraw        @tab     @tab  X
     @tab fourcc: qdrw
-@item APV                    @tab     @tab  X
 @item Argonaut Video         @tab     @tab  X
     @tab Used in some Argonaut games.
 @item Asus v1                @tab  X  @tab  X
@@ -986,8 +943,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
@@ -1039,11 +994,8 @@ following image formats are supported:
 @item Kega Game Video (KGV1) @tab      @tab  X
     @tab Kega emulator screen capture codec.
 @item Lagarith               @tab     @tab  X
-@item LCEVC / MPEG-5 LCEVC / MPEG-5 Part 2 @tab     @tab  E
-    @tab decoding supported through external library liblcevc-dec
 @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.
@@ -1054,7 +1006,7 @@ following image formats are supported:
     @tab Also known as Microsoft Screen 3.
 @item Microsoft Expression Encoder Screen  @tab     @tab  X
     @tab Also known as Microsoft Titanium Screen 2.
-@item Microsoft RLE          @tab  X  @tab  X
+@item Microsoft RLE          @tab     @tab  X
 @item Microsoft Screen 1     @tab     @tab  X
     @tab Also known as Windows Media Video V7 Screen.
 @item Microsoft Screen 2     @tab     @tab  X
@@ -1112,11 +1064,8 @@ following image formats are supported:
 @item RealVideo 3.0          @tab     @tab  X
     @tab still far from ideal
 @item RealVideo 4.0          @tab     @tab  X
-@item RealVideo 6.0          @tab     @tab  X
 @item Renderware TXD (TeXture Dictionary)  @tab     @tab  X
     @tab Texture dictionaries used by the Renderware Engine.
-@item RivaTuner Video        @tab     @tab  X
-    @tab fourcc: 'RTV1'
 @item RL2 video              @tab     @tab  X
     @tab used in some games by Entertainment Software Partners
 @item ScreenPressor          @tab     @tab  X
@@ -1153,8 +1102,6 @@ following image formats are supported:
 @item v408 QuickTime uncompressed 4:4:4:4          @tab  X  @tab  X
 @item v410 QuickTime uncompressed 4:4:4 10-bit     @tab  X  @tab  X
 @item VBLE Lossless Codec    @tab     @tab  X
-@item vMix Video             @tab     @tab  X
-    @tab fourcc: 'VMX1'
 @item VMware Screen Codec / VMware Video  @tab     @tab  X
     @tab Codec used in videos captured by VMware.
 @item Westwood Studios VQA (Vector Quantized Animation) video  @tab     @tab  X
@@ -1236,7 +1183,6 @@ following image formats are supported:
 @item ADPCM IMA Duck DK4     @tab     @tab  X
     @tab Used in some Sega Saturn console games.
 @item ADPCM IMA Radical      @tab     @tab  X
-@item ADPCM IMA Xbox         @tab     @tab  X
 @item ADPCM Microsoft        @tab  X  @tab  X
 @item ADPCM MS IMA           @tab  X  @tab  X
 @item ADPCM Nintendo Gamecube AFC  @tab     @tab  X
@@ -1244,7 +1190,6 @@ following image formats are supported:
 @item ADPCM Nintendo THP  @tab     @tab  X
 @item ADPCM Playstation      @tab     @tab  X
 @item ADPCM QT IMA           @tab  X  @tab  X
-@item ADPCM Sanyo            @tab     @tab  X
 @item ADPCM SEGA CRI ADX     @tab  X  @tab  X
     @tab Used in Sega Dreamcast games.
 @item ADPCM Shockwave Flash  @tab  X  @tab  X
@@ -1319,7 +1264,6 @@ following image formats are supported:
 @item FLAC (Free Lossless Audio Codec)  @tab  X  @tab  IX
 @item FTR Voice              @tab     @tab  X
 @item G.723.1                @tab X   @tab  X
-@item G.728                  @tab     @tab  X
 @item G.729                  @tab     @tab  X
 @item GSM                    @tab  E  @tab  X
     @tab encoding supported through external library libgsm
@@ -1330,8 +1274,7 @@ following image formats are supported:
     @tab encoding and decoding supported through external library libilbc
 @item IMC (Intel Music Coder)  @tab     @tab  X
 @item Interplay ACM            @tab     @tab  X
-@item LC3                    @tab E  @tab  E
-    @tab supported through external library liblc3
+@item MACE (Macintosh Audio Compression/Expansion) 3:1  @tab     @tab  X
 @item MACE (Macintosh Audio Compression/Expansion) 6:1  @tab     @tab  X
 @item Marian's A-pac audio     @tab     @tab  X
 @item MI-SC4 (Micronas SC-4 Audio)  @tab     @tab  X
@@ -1351,7 +1294,6 @@ following image formats are supported:
 @item On2 AVC (Audio for Video Codec) @tab     @tab  X
 @item Opus                   @tab  E  @tab  X
     @tab encoding supported through external library libopus
-@item OSQ (Original Sound Quality)  @tab     @tab  X
 @item PCM A-law              @tab  X  @tab  X
 @item PCM mu-law             @tab  X  @tab  X
 @item PCM Archimedes VIDC    @tab  X  @tab  X

doc/git-howto.texi

@@ -66,11 +66,12 @@ 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
 @var{<target>} and let you push back your changes to the remote repository.
+(Note that @var{gil} stands for GItoLite and is not a typo of @var{git}.)
 
 If you don't have write-access to the ffmpeg-web repository, you can
 create patches after making a read-only ffmpeg-web clone:
@@ -142,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{https://git.ffmpeg.org/ffmpeg.git}.
+or the web interface available at @url{http://source.ffmpeg.org/}.
 
 @section Checking source tree status
 

doc/htmlxref.cnf

@@ -1,6 +0,0 @@
-ffmpeg mono ./ffmpeg.html
-ffmpeg-filters mono ./ffmpeg-filters.html
-ffmpeg-formats mono ./ffmpeg-formats.html
-ffmpeg-resampler mono ./ffmpeg-resampler.html
-ffmpeg-scaler mono ./ffmpeg-scaler.html
-ffmpeg-utils mono ./ffmpeg-utils.html

doc/indevs.texi

@@ -220,6 +220,40 @@ $ ffmpeg -f avfoundation -capture_raw_data true -i "zr100:none" out.dv
 
 @end itemize
 
+@section bktr
+
+BSD video input device.
+
+@subsection Options
+
+@table @option
+
+@item framerate
+Set the frame rate.
+
+@item video_size
+Set the video frame size. Default is @code{vga}.
+
+@item standard
+
+Available values are:
+@table @samp
+@item pal
+
+@item ntsc
+
+@item secam
+
+@item paln
+
+@item palm
+
+@item ntscj
+
+@end table
+
+@end table
+
 @section decklink
 
 The decklink input device provides capture capabilities for Blackmagic
@@ -361,22 +395,6 @@ Defaults to @samp{audio}.
 @item draw_bars
 If set to @samp{true}, color bars are drawn in the event of a signal loss.
 Defaults to @samp{true}.
-This option is deprecated, please use the @code{signal_loss_action} option.
-
-@item signal_loss_action
-Sets the action to take in the event of a signal loss. Accepts one of the
-following values:
-
-@table @option
-@item 1, none
-Do nothing on signal loss. This usually results in black frames.
-@item 2, bars
-Draw color bars on signal loss. Only supported for 8-bit input signals.
-@item 3, repeat
-Repeat the last video frame on signal loss.
-@end table
-
-Defaults to @samp{bars}.
 
 @item queue_size
 Sets maximum input buffer size in bytes. If the buffering reaches this value,
@@ -704,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 input filenames are such elements as:
+There are two options for the input filename:
 @example
 desktop
 @end example
@@ -712,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}:
@@ -977,8 +991,9 @@ This input device reads data from the open output pads of a libavfilter
 filtergraph.
 
 For each filtergraph open output, the input device will create a
-corresponding stream which is mapped to the generated output.
-The filtergraph is specified through the option @option{graph}.
+corresponding stream which is mapped to the generated output. Currently
+only video data is supported. The filtergraph is specified through the
+option @option{graph}.
 
 @subsection Options
 
@@ -1050,9 +1065,9 @@ ffplay -f lavfi "movie=test.avi[out0];amovie=test.wav[out1]"
 @end example
 
 @item
-Dump decoded frames to images and Closed Captions to an RCWT backup:
+Dump decoded frames to images and closed captions to a file (experimental):
 @example
-ffmpeg -f lavfi -i "movie=test.ts[out0+subcc]" -map v frame%08d.png -map s -c copy -f rcwt subcc.bin
+ffmpeg -f lavfi -i "movie=test.ts[out0+subcc]" -map v frame%08d.png -map s -c copy -f rawvideo subcc.bin
 @end example
 
 @end itemize

doc/infra.txt

@@ -1,148 +0,0 @@
-FFmpeg Infrastructure:
-======================
-
-Trademark:
-~~~~~~~~~~
-ffmpeg trademark registered in france by ffmpeg creator.
-
-
-Domain + NS:
-~~~~~~~~~~~~
-ffmpeg.org domain name
-ns1.avcodec.org Primary Name server (provided by Telepoint, hosted at Telepoint in bulgaria)
-ns2.avcodec.org Replica Name server (provided by an ffmpeg developer, hosted at Hetzner in germany)
-ns3.avcodec.org Replica Name server (provided by an ffmpeg developer, hosted at Prometeus Cdlan in italy)
-
-
-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
-gpg encrypted backups of the trac repositories are created once a day
-and can be downloaded by any of the admins.
-
-
-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
-
-git repositories are managed by gitolite, every change to permissions is
-logged, including when, what and by whom
-
-
-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)
-
-
-
-Multimedia Wiki:
-~~~~~~~~~~~~~~~~
-The Multimedia Wiki http://wiki.multimedia.cx is ran by Mike Melanson.
-While not directly part of FFmpeg infrastructure, technical codec and format
-information written by FFmpeg developers can be found within.
-It is our unofficial official tech wiki. For access contact Mike.
-
-
-
-IRC:
-~~~~
-irc channels are at https://libera.chat/
-irc channel archives are at https://libera.irclog.whitequark.org
-
-#ffmpeg and #ffmpeg-devel founder/admins: BtbN, Michael, Compn
-#ffmpeg-meeting founder/admins: BtbN, Michael
-
-
-Twitter aka X:
-~~~~~~~~~~~~~~
-https://twitter.com/FFmpeg or https://x.com/FFmpeg
-
-If you would like to post to twitter please contact twitter MAINTAINERS
-for access. We want more developers posting to twitter!
-
-
-
-Reddit:
-~~~~~~~
-https://www.reddit.com/r/ffmpeg/
-moderated by Gyan
-
-
-
-Facebook:
-~~~~~~~~~
-https://www.facebook.com/ffmpeg
-???
-
-
-
-Wikipedia entry:
-~~~~~~~~~~~~~~~~
-https://en.wikipedia.org/wiki/FFmpeg

doc/libav-merge.txt

@@ -0,0 +1,115 @@
+CONTEXT
+=======
+
+The FFmpeg project merges all the changes from the Libav project
+(https://libav.org) since the origin of the fork (around 2011).
+
+With the exceptions of some commits due to technical/political disagreements or
+issues, the changes are merged on a more or less regular schedule (daily for
+years thanks to Michael, but more sparse nowadays).
+
+WHY
+===
+
+The majority of the active developers believe the project needs to keep this
+policy for various reasons.
+
+The most important one is that we don't want our users to have to choose
+between two distributors of libraries of the exact same name in order to have a
+different set of features and bugfixes. By taking the responsibility of
+unifying the two codebases, we allow users to benefit from the changes from the
+two teams.
+
+Today, FFmpeg has a much larger user database (we are distributed by every
+major distribution), so we consider this mission a priority.
+
+A different approach to the merge could have been to pick the changes we are
+interested in and drop most of the cosmetics and other less important changes.
+Unfortunately, this makes the following picks much harder, especially since the
+Libav project is involved in various deep API changes. As a result, we decide
+to virtually take everything done there.
+
+Any Libav developer is of course welcome anytime to contribute directly to the
+FFmpeg tree. Of course, we fully understand and are forced to accept that very
+few Libav developers are interested in doing so, but we still want to recognize
+their work. This leads us to create merge commits for every single one from
+Libav. The original commit appears totally unchanged with full authorship in
+our history (and the conflict are solved in the merge one). That way, not a
+single thing from Libav will be lost in the future in case some reunification
+happens, or that project disappears one way or another.
+
+DOWNSIDES
+=========
+
+Of course, there are many downsides to this approach.
+
+- It causes a non negligible merge commits pollution. We make sure there are
+  not several level of merges entangled (we do a 1:1 merge/commit), but it's
+  still a non-linear history.
+
+- Many duplicated work. For instance, we added libavresample in our tree to
+  keep compatibility with Libav when our libswresample was already covering the
+  exact same purpose. The same thing happened for various elements such as the
+  ProRes support (but differences in features, bugs, licenses, ...). There are
+  many work to do to unify them, and any help is very much welcome.
+
+- So much manpower from both FFmpeg and Libav is lost because of this mess. We
+  know it, and we don't know how to fix it. It takes incredible time to do
+  these merges, so we have even less time to work on things we personally care
+  about. The bad vibes also do not help with keeping our developers motivated.
+
+- There is a growing technical risk factor with the merges due to the codebase
+  differing more and more.
+
+MERGE GUIDELINES
+================
+
+The following gives developer guidelines on how to proceed when merging Libav commits.
+
+Before starting, you can reduce the risk of errors on merge conflicts by using
+a different merge conflict style:
+
+    $ git config --global merge.conflictstyle diff3
+
+tools/libav-merge-next-commit is a script to help merging the next commit in
+the queue. It assumes a remote named libav. It has two modes: merge, and noop.
+The noop mode creates a merge with no change to the HEAD. You can pass a hash
+as extra argument to reference a justification (it is common that we already
+have the change done in FFmpeg).
+
+Also see tools/murge, you can copy and paste a 3 way conflict into its stdin
+and it will display colored diffs. Any arguments to murge (like ones to suppress
+whitespace differences) are passed into colordiff.
+
+TODO/FIXME/UNMERGED
+===================
+
+Stuff that didn't reach the codebase:
+-------------------------------------
+
+- HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html)
+  - 1f821750f hevcdsp: split the qpel functions by width instead of by the subpixel fraction
+  - 818bfe7f0 hevcdsp: split the epel functions by width
+  - 688417399 hevcdsp: split the pred functions by width
+  - a853388d2 hevc: change the stride of the MC buffer to be in bytes instead of elements
+  - 0cef06df0 checkasm: add HEVC MC tests
+  - e7078e842 hevcdsp: add x86 SIMD for MC
+  - 7993ec19a hevc: Add hevc_get_pixel_4/8/12/16/24/32/48/64
+- use av_cpu_max_align() instead of hardcoding alignment requirements (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html)
+  - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignment requirements
+  - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
+- Support recovery from an already present HLS playlist (see 16cb06bb30)
+- Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d46cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html)
+- avcodec/libaomenc: export the Sequence Header OBU as extradata (See a024c3ce9a)
+
+Collateral damage that needs work locally:
+------------------------------------------
+
+- Merge proresenc_anatoliy.c and proresenc_kostya.c
+- Fix MIPS AC3 downmix
+
+Extra changes needed to be aligned with Libav:
+----------------------------------------------
+
+- Switching our examples to the new encode/decode API (see 67d28f4a0f)
+- HEVC IDCT bit depth 12-bit support (Libav added 8 and 10 but doesn't have 12)

doc/mailing-list-faq.texi

@@ -157,6 +157,9 @@ Perform a site search using your favorite search engine. Example:
 
 You can ask for help in the official @t{#ffmpeg} IRC channel on Libera Chat.
 
+Some users prefer the third-party @url{http://www.ffmpeg-archive.org/, Nabble}
+interface which presents the mailing lists in a typical forum layout.
+
 There are also numerous third-party help sites such as
 @url{https://superuser.com/tags/ffmpeg, Super User} and
 @url{https://www.reddit.com/r/ffmpeg/, r/ffmpeg on reddit}.
@@ -341,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/developer.html#Code-of-conduct, Code of Conduct}.
 @end itemize
 
 @chapter Help

doc/metadata.texi

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

doc/mips.txt

@@ -48,7 +48,17 @@ Files that have MIPS copyright notice in them:
       float_dsp_mips.c
       libm_mips.h
       softfloat_tables.h
+* libavcodec/
+      fft_fixed_32.c
+      fft_init_table.c
+      fft_table.h
+      mdct_fixed_32.c
 * libavcodec/mips/
+      aacdec_fixed.c
+      aacsbr_fixed.c
+      aacsbr_template.c
+      aaccoder_mips.c
+      aacpsy_mips.h
       ac3dsp_mips.c
       acelp_filters_mips.c
       acelp_vectors_mips.c
@@ -59,6 +69,11 @@ Files that have MIPS copyright notice in them:
       compute_antialias_fixed.h
       compute_antialias_float.h
       lsp_mips.h
+      dsputil_mips.c
+      fft_mips.c
+      fft_table.h
+      fft_init_table.c
       fmtconvert_mips.c
+      iirfilter_mips.c
       mpegaudiodsp_mips_fixed.c
       mpegaudiodsp_mips_float.c

doc/multithreading.txt

@@ -36,9 +36,9 @@ Frame threading -
 * Codecs similar to ffv1, whose streams don't reset across frames,
   will not work because their bitstreams cannot be decoded in parallel.
 
-* The contents of buffers must not be read before ff_progress_frame_await()
+* The contents of buffers must not be read before ff_thread_await_progress()
   has been called on them. reget_buffer() and buffer age optimizations no longer work.
-* The contents of buffers must not be written to after ff_progress_frame_report()
+* The contents of buffers must not be written to after ff_thread_report_progress()
   has been called on them. This includes draw_edges().
 
 Porting codecs to frame threading
@@ -53,13 +53,15 @@ thread.
 Add AV_CODEC_CAP_FRAME_THREADS to the codec capabilities. There will be very little
 speed gain at this point but it should work.
 
-Use ff_thread_get_buffer() (or ff_progress_frame_get_buffer()
-in case you have inter-frame dependencies and use the ProgressFrame API)
-to allocate frame buffers.
+If there are inter-frame dependencies, so the codec calls
+ff_thread_report/await_progress(), set FF_CODEC_CAP_ALLOCATE_PROGRESS in
+AVCodec.caps_internal and use ff_thread_get_buffer() to allocate frames. The
+frames must then be freed with ff_thread_release_buffer().
+Otherwise decode directly into the user-supplied frames.
 
-Call ff_progress_frame_report() after some part of the current picture has decoded.
+Call ff_thread_report_progress() after some part of the current picture has decoded.
 A good place to put this is where draw_horiz_band() is called - add this if it isn't
 called anywhere, as it's useful too and the implementation is trivial when you're
 doing this. Note that draw_edges() needs to be called before reporting progress.
 
-Before accessing a reference frame or its MVs, call ff_progress_frame_await().
+Before accessing a reference frame or its MVs, call ff_thread_await_progress().

doc/nut.texi

@@ -157,3 +157,4 @@ 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
+

doc/optimization.txt

@@ -188,7 +188,7 @@ Code that depends on data in registries being untouched, should be written as
 a single __asm__() statement. Ideally, a single function contains only one
 __asm__() block.
 
-Use external asm (nasm) or inline asm (__asm__()), do not use intrinsics.
+Use external asm (nasm/yasm) or inline asm (__asm__()), do not use intrinsics.
 The latter requires a good optimizing compiler which gcc is not.
 
 When debugging a x86 external asm compilation issue, if lost in the macro
@@ -199,7 +199,7 @@ actual lines causing issues.
 Inline asm vs. external asm
 ---------------------------
 Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc)
-and external asm (.s or .asm files, handled by an assembler such as nasm)
+and external asm (.s or .asm files, handled by an assembler such as nasm/yasm)
 are accepted in FFmpeg. Which one to use differs per specific case.
 
 - if your code is intended to be inlined in a C function, inline asm is always

doc/outdevs.texi

@@ -235,11 +235,6 @@ Enable SMPTE Level A mode on the used output.
 Must be @samp{unset}, @samp{true} or @samp{false}.
 Defaults to @option{unset}.
 
-@item vanc_queue_size
-Sets maximum output buffer size in bytes for VANC data. If the buffering reaches this value,
-outgoing VANC data will be dropped.
-Defaults to @samp{1048576}.
-
 @end table
 
 @subsection Examples
@@ -301,6 +296,45 @@ 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.
+
+To enable this output device you need to configure FFmpeg with @code{--enable-opengl}.
+
+This output device allows one to render to OpenGL context.
+Context may be provided by application or default SDL window is created.
+
+When device renders to external context, application must implement handlers for following messages:
+@code{AV_DEV_TO_APP_CREATE_WINDOW_BUFFER} - create OpenGL context on current thread.
+@code{AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER} - make OpenGL context current.
+@code{AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER} - swap buffers.
+@code{AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER} - destroy OpenGL context.
+Application is also required to inform a device about current resolution by sending @code{AV_APP_TO_DEV_WINDOW_SIZE} message.
+
+@subsection Options
+@table @option
+
+@item background
+Set background color. Black is a default.
+@item no_window
+Disables default SDL window when set to non-zero value.
+Application must provide OpenGL context and both @code{window_size_cb} and @code{window_swap_buffers_cb} callbacks when set.
+@item window_title
+Set the SDL window title, if not specified default to the filename specified for the output device.
+Ignored when @option{no_window} is set.
+@item window_size
+Set preferred window size, can be a string of the form widthxheight or a video size abbreviation.
+If not specified it defaults to the size of the input video, downscaled according to the aspect ratio.
+Mostly usable when @option{no_window} is not set.
+
+@end table
+
+@subsection Examples
+Play a file on SDL window using OpenGL rendering:
+@example
+ffmpeg  -i INPUT -f opengl "window title"
+@end example
+
 @section oss
 
 OSS (Open Sound System) output device.
@@ -367,6 +401,72 @@ Play a file on default device on default server:
 ffmpeg  -i INPUT -f pulse "stream name"
 @end example
 
+@section sdl
+
+SDL (Simple DirectMedia Layer) output device.
+
+"sdl2" can be used as alias for "sdl".
+
+This output device allows one to show a video stream in an SDL
+window. Only one SDL window is allowed per application, so you can
+have only one instance of this output device in an application.
+
+To enable this output device you need libsdl installed on your system
+when configuring your build.
+
+For more information about SDL, check:
+@url{http://www.libsdl.org/}
+
+@subsection Options
+
+@table @option
+
+@item window_title
+Set the SDL window title, if not specified default to the filename
+specified for the output device.
+
+@item icon_title
+Set the name of the iconified SDL window, if not specified it is set
+to the same value of @var{window_title}.
+
+@item window_size
+Set the SDL window size, can be a string of the form
+@var{width}x@var{height} or a video size abbreviation.
+If not specified it defaults to the size of the input video,
+downscaled according to the aspect ratio.
+
+@item window_x
+@item window_y
+Set the position of the window on the screen.
+
+@item window_fullscreen
+Set fullscreen mode when non-zero value is provided.
+Default value is zero.
+
+@item window_enable_quit
+Enable quit action (using window button or keyboard key)
+when non-zero value is provided.
+Default value is 1 (enable quit action)
+@end table
+
+@subsection Interactive commands
+
+The window created by the device can be controlled through the
+following interactive commands.
+
+@table @key
+@item q, ESC
+Quit the device immediately.
+@end table
+
+@subsection Examples
+
+The following command shows the @command{ffmpeg} output is an
+SDL window, forcing its size to the qcif format:
+@example
+ffmpeg -i INPUT -c:v rawvideo -pix_fmt yuv420p -window_size qcif -f sdl "SDL output"
+@end example
+
 @section sndio
 
 sndio audio output device.

doc/platform.texi

@@ -92,6 +92,9 @@ For information about compiling FFmpeg on OS/2 see
 
 @chapter Windows
 
+To get help and instructions for building FFmpeg under Windows, check out
+the FFmpeg Windows Help Forum at @url{http://ffmpeg.zeranoe.com/forum/}.
+
 @section Native Windows compilation using MinGW or MinGW-w64
 
 FFmpeg can be built to run natively on Windows using the MinGW-w64
@@ -158,7 +161,7 @@ You will need the following prerequisites:
 To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from
 the Visual Studio or Intel Compiler command prompt.
 
-Place @code{nasm.exe} somewhere in your @code{PATH}.
+Place @code{yasm.exe} somewhere in your @code{PATH}.
 
 Next, make sure any other headers and libs you want to use, such as zlib, are
 located in a spot that the compiler can see. Do so by modifying the @code{LIB}
@@ -301,7 +304,7 @@ These library packages are only available from
 @uref{http://sourceware.org/cygwinports/, Cygwin Ports}:
 
 @example
-libSDL-devel, libgsm-devel, libmp3lame-devel,
+yasm, libSDL-devel, libgsm-devel, libmp3lame-devel,
 speex-devel, libtheora-devel, libxvidcore-devel
 @end example
 

doc/protocols.texi

@@ -71,7 +71,7 @@ client may also set a user/password for authentication. The default for both
 fields is "guest". Name of virtual host on broker can be set with vhost. The
 default value is "/".
 
-Multiple subscribers may stream from the broker using the command:
+Muliple subscribers may stream from the broker using the command:
 @example
 ffplay amqp://[[user]:[password]@@]hostname[:port][/vhost]
 @end example
@@ -442,6 +442,9 @@ value is -1.
 @item chunked_post
 If set to 1 use chunked Transfer-Encoding for posts, default is 1.
 
+@item content_type
+Set a specific content type for the POST messages or for listen mode.
+
 @item http_proxy
 set HTTP proxy to tunnel through e.g. http://example.com:1234
 
@@ -449,33 +452,42 @@ set HTTP proxy to tunnel through e.g. http://example.com:1234
 Set custom HTTP headers, can override built in default headers. The
 value must be a string encoding the headers.
 
-@item content_type
-Set a specific content type for the POST messages or for listen mode.
-
-@item user_agent
-Override the User-Agent header. If not specified the protocol will use a
-string describing the libavformat build. ("Lavf/<version>")
-
-@item referer
-Set the Referer header. Include 'Referer: URL' header in HTTP request.
-
 @item multiple_requests
 Use persistent connections if set to 1, default is 0.
 
 @item post_data
 Set custom HTTP post data.
 
+@item referer
+Set the Referer header. Include 'Referer: URL' header in HTTP request.
+
+@item user_agent
+Override the User-Agent header. If not specified the protocol will use a
+string describing the libavformat build. ("Lavf/<version>")
+
+@item reconnect_at_eof
+If set then eof is treated like an error and causes reconnection, this is useful
+for live / endless streams.
+
+@item reconnect_streamed
+If set then even streamed/non seekable streams will be reconnected on errors.
+
+@item reconnect_on_network_error
+Reconnect automatically in case of TCP/TLS errors during connect.
+
+@item reconnect_on_http_error
+A comma separated list of HTTP status codes to reconnect on. The list can
+include specific status codes (e.g. '503') or the strings '4xx' / '5xx'.
+
+@item reconnect_delay_max
+Sets the maximum delay in seconds after which to give up reconnecting
+
 @item mime_type
 Export the MIME type.
 
 @item http_version
 Exports the HTTP response version number. Usually "1.0" or "1.1".
 
-@item cookies
-Set the cookies to be sent in future requests. The format of each cookie is the
-same as the value of a Set-Cookie HTTP response field. Multiple cookies can be
-delimited by a newline character.
-
 @item icy
 If set to 1 request ICY (SHOUTcast) metadata from the server. If the server
 supports this, the metadata has to be retrieved by the application by reading
@@ -492,40 +504,10 @@ contains the last non-empty metadata packet sent by the server. It should be
 polled in regular intervals by applications interested in mid-stream metadata
 updates.
 
-@item metadata
-Set an exported dictionary containing Icecast metadata from the bitstream, if present.
-Only useful with the C API.
-
-@item auth_type
-
-Set HTTP authentication type. No option for Digest, since this method requires
-getting nonce parameters from the server first and can't be used straight away like
-Basic.
-
-@table @option
-@item none
-Choose the HTTP authentication type automatically. This is the default.
-@item basic
-
-Choose the HTTP basic authentication.
-
-Basic authentication sends a Base64-encoded string that contains a user name and password
-for the client. Base64 is not a form of encryption and should be considered the same as
-sending the user name and password in clear text (Base64 is a reversible encoding).
-If a resource needs to be protected, strongly consider using an authentication scheme
-other than basic authentication. HTTPS/TLS should be used with basic authentication.
-Without these additional security enhancements, basic authentication should not be used
-to protect sensitive or valuable information.
-@end table
-
-@item send_expect_100
-Send an Expect: 100-continue header for POST. If set to 1 it will send, if set
-to 0 it won't, if set to -1 it will try to send if it is applicable. Default
-value is -1.
-
-@item location
-An exported dictionary containing the content location. Only useful with the C
-API.
+@item cookies
+Set the cookies to be sent in future requests. The format of each cookie is the
+same as the value of a Set-Cookie HTTP response field. Multiple cookies can be
+delimited by a newline character.
 
 @item offset
 Set initial byte offset.
@@ -543,37 +525,6 @@ be given a Bad Request response.
 When unset the HTTP method is not checked for now. This will be replaced by
 autodetection in the future.
 
-@item reconnect
-Reconnect automatically when disconnected before EOF is hit.
-
-@item reconnect_at_eof
-If set then eof is treated like an error and causes reconnection, this is useful
-for live / endless streams.
-
-@item reconnect_on_network_error
-Reconnect automatically in case of TCP/TLS errors during connect.
-
-@item reconnect_on_http_error
-A comma separated list of HTTP status codes to reconnect on. The list can
-include specific status codes (e.g. '503') or the strings '4xx' / '5xx'.
-
-@item reconnect_streamed
-If set then even streamed/non seekable streams will be reconnected on errors.
-
-@item reconnect_delay_max
-Set the maximum delay in seconds after which to give up reconnecting.
-
-@item reconnect_max_retries
-Set the maximum number of times to retry a connection. Default unset.
-
-@item reconnect_delay_total_max
-Set the maximum total delay in seconds after which to give up reconnecting.
-
-@item respect_retry_after
-If enabled, and a Retry-After header is encountered, its requested reconnection
-delay will be honored, rather than using exponential backoff. Useful for 429 and
-503 errors. Default enabled.
-
 @item listen
 If set to 1 enables experimental HTTP server. This can be used to send data when
 used as an output option, or read data from a client with HTTP POST when used as
@@ -600,16 +551,32 @@ ffmpeg -i somefile.ogg -chunked_post 0 -c copy -f ogg http://@var{server}:@var{p
 wget --post-file=somefile.ogg http://@var{server}:@var{port}
 @end example
 
-@item resource
-The resource requested by a client, when the experimental HTTP server is in use.
+@item send_expect_100
+Send an Expect: 100-continue header for POST. If set to 1 it will send, if set
+to 0 it won't, if set to -1 it will try to send if it is applicable. Default
+value is -1.
 
-@item reply_code
-The HTTP code returned to the client, when the experimental HTTP server is in use.
+@item auth_type
 
-@item short_seek_size
-Set the threshold, in bytes, for when a readahead should be preferred over a seek and
-new HTTP request. This is useful, for example, to make sure the same connection
-is used for reading large video packets with small audio packets in between.
+Set HTTP authentication type. No option for Digest, since this method requires
+getting nonce parameters from the server first and can't be used straight away like
+Basic.
+
+@table @option
+@item none
+Choose the HTTP authentication type automatically. This is the default.
+@item basic
+
+Choose the HTTP basic authentication.
+
+Basic authentication sends a Base64-encoded string that contains a user name and password
+for the client. Base64 is not a form of encryption and should be considered the same as
+sending the user name and password in clear text (Base64 is a reversible encoding).
+If a resource needs to be protected, strongly consider using an authentication scheme
+other than basic authentication. HTTPS/TLS should be used with basic authentication.
+Without these additional security enhancements, basic authentication should not be used
+to protect sensitive or valuable information.
+@end table
 
 @end table
 
@@ -929,13 +896,6 @@ be named, by prefixing the type with 'N' and specifying the name before
 the value (i.e. @code{NB:myFlag:1}). This option may be used multiple
 times to construct arbitrary AMF sequences.
 
-@item rtmp_enhanced_codecs
-Specify the list of codecs the client advertises to support in an
-enhanced RTMP stream. This option should be set to a comma separated
-list of fourcc values, like @code{hvc1,av01,vp09} for multiple codecs
-or @code{hvc1} for only one codec. The specified list will be presented
-in the "fourCcLive" property of the Connect Command Message.
-
 @item rtmp_flashver
 Version of the Flash plugin used to run the SWF player. The default
 is LNX 9,0,124,2. (When publishing, the default is FMLE/3.0 (compatible;
@@ -1150,15 +1110,10 @@ ffplay "rtmp://myserver/live/mystream live=1"
 Real-time Transport Protocol.
 
 The required syntax for an RTP URL is:
-@example
-rtp://@var{hostname}[:@var{port}][?@var{options}]
-@end example
+rtp://@var{hostname}[:@var{port}][?@var{option}=@var{val}...]
 
 @var{port} specifies the RTP port to use.
 
-@var{options} contains a list of &-separated options of the form
-@var{key}=@var{val}.
-
 The following URL options are supported:
 
 @table @option
@@ -1198,15 +1153,16 @@ set to 1) or to a default remote address (if set to 0).
 @item localport=@var{n}
 Set the local RTP port to @var{n}.
 
-This is a deprecated option. Instead, @option{localrtpport} should be
-used.
-
 @item localaddr=@var{addr}
 Local IP address of a network interface used for sending packets or joining
 multicast groups.
 
 @item timeout=@var{n}
 Set timeout (in microseconds) of socket I/O operations to @var{n}.
+
+This is a deprecated option. Instead, @option{localrtpport} should be
+used.
+
 @end table
 
 Important notes:
@@ -1926,12 +1882,6 @@ The list of supported options follows.
 Listen for an incoming connection. 0 disables listen, 1 enables listen in
 single client mode, 2 enables listen in multi-client mode. Default value is 0.
 
-@item local_addr=@var{addr}
-Local IP address of a network interface used for tcp socket connect.
-
-@item local_port=@var{port}
-Local port used for tcp socket connect.
-
 @item timeout=@var{microseconds}
 Set raise error timeout, expressed in microseconds.
 
@@ -2028,87 +1978,6 @@ To play back a stream from the TLS/SSL server using @command{ffplay}:
 ffplay tls://@var{hostname}:@var{port}
 @end example
 
-@section dtls
-
-Datagram Transport Layer Security (DTLS)
-
-The required syntax for a DTLS URL is:
-@example
-dtls://@var{hostname}:@var{port}
-@end example
-
-DTLS shares most options with TLS, but operates over UDP instead of TCP.
-The following parameters can be set via command line options
-(or in code via @code{AVOption}s):
-
-@table @option
-
-@item ca_file, cafile=@var{filename}
-A file containing certificate authority (CA) root certificates to treat
-as trusted. If the linked TLS library contains a default this might not
-need to be specified for verification to work, but not all libraries and
-setups have defaults built in.
-The file must be in OpenSSL PEM format.
-
-@item tls_verify=@var{1|0}
-If enabled, try to verify the peer that we are communicating with.
-Note, if using OpenSSL, this currently only makes sure that the
-peer certificate is signed by one of the root certificates in the CA
-database, but it does not validate that the certificate actually
-matches the host name we are trying to connect to.
-
-This is disabled by default since it requires a CA database to be
-provided by the caller in many cases.
-
-@item cert_file, cert=@var{filename}
-A file containing a certificate to use in the handshake with the peer.
-(When operating as server, in listen mode, this is more often required
-by the peer, while client certificates only are mandated in certain
-setups.)
-
-@item key_file, key=@var{filename}
-A file containing the private key for the certificate.
-
-@item cert_pem=@var{string}
-Certificate PEM string
-
-@item key_pem=@var{string}
-Private key PEM string
-
-@item listen=@var{1|0}
-If enabled, listen for connections on the provided port, and assume
-the server role in the handshake instead of the client role.
-
-@item mtu=@var{size}
-Set the Maximum Transmission Unit (MTU) for DTLS packets.
-
-@item use_srtp=@var{1|0}
-Enable the use_srtp DTLS extension.
-This is used in WebRTC applications to establish SRTP encryption keys
-through the DTLS handshake. Default is disabled.
-
-@item external_sock=@var{1|0}
-Use an external socket instead of creating a new one.
-This option only makes sense to pass when interacting with the code via
-API, enabling this from CLI will cause immediate failure.
-Default is disabled.
-
-@end table
-
-Example command lines:
-
-To create a DTLS server:
-
-@example
-ffmpeg -listen 1 -i dtls://@var{hostname}:@var{port} @var{output}
-@end example
-
-To create a DTLS client and send data to server:
-
-@example
-ffmpeg -i @var{input} -f @var{format} dtls://@var{hostname}:@var{port}
-@end example
-
 @section udp
 
 User Datagram Protocol.

doc/scaler.texi

@@ -96,9 +96,6 @@ If value is set to @code{1}, indicates source is full range. Default value is
 If value is set to @code{1}, enable full range for destination. Default value
 is @code{0}, which enables limited range.
 
-@item gamma @var{(boolean)}
-If value is set to @code{1}, enable gamma correct scaling. Default value is @code{0}.
-
 @anchor{sws_params}
 @item param0, param1
 Set scaling algorithm parameters. The specified values are specific of

doc/swscale-v2.txt

@@ -1,344 +0,0 @@
-New swscale design to change everything (tm)
-============================================
-
-SwsGraph
---------
-
-The entry point to the new architecture, SwsGraph is what coordinates
-multiple "passes". These can include cascaded scaling passes, error diffusion
-dithering, and so on. Or we could have separate passes for the vertical and
-horizontal scaling. In between each SwsPass lies a fully allocated image buffer.
-Graph passes may have different levels of threading, e.g. we can have a single
-threaded error diffusion pass following a multi-threaded scaling pass.
-
-SwsGraph is internally recreated whenever the image format, dimensions or
-settings change in any way. sws_scale_frame() is itself just a light-weight
-wrapper that runs ff_sws_graph_create() whenever the format changes, splits
-interlaced images into separate fields, and calls ff_sws_graph_run() on each.
-
-From the point of view of SwsGraph itself, all inputs are progressive.
-
-SwsOp / SwsOpList
------------------
-
-This is the newly introduced abstraction layer between the high-level format
-handling logic and the low-level backing implementation. Each SwsOp is designed
-to be as small and atomic as possible, with the possible exception of the
-read / write operations due to their numerous variants.
-
-The basic idea is to split logic between three major components:
-
-1. The high-level format "business logic", which generates in a very
-   naive way a sequence of operations guaranteed to get you from point A
-   to point B. This logic is written with correctness in mind only, and
-   ignoring any performance concerns or low-level implementation decisions.
-   Semantically, everything is always decoded from the input format to
-   normalized (real valued) RGB, and then encoded back to output format.
-
-   This code lives in libswscale/format.c
-
-2. The optimizer. This is where the "magic" happens, so to speak. The
-   optimizer's job is to take the abstract sequence of operations
-   produced by the high-level format analysis code and incrementally
-   optimize it. Each optimization step is designed to be minute and provably
-   lossless, or otherwise guarded behind the BITEXACT flag. This ensures that
-   the resulting output is always identical, no matter how many layers of
-   optimization we add.
-
-   This code lives in libswscale/ops.c
-
-3. The compiler. Once we have a sequence of operations as output by the
-   optimizer, we "compile" this down to a callable function. This is then
-   applied by the dispatch wrapper by striping it over the input image.
-
-   See libswscale/ops_backend.c for the reference backend, or
-   libswscale/x86/ops.c for a more complex SIMD example.
-
-This overall approach has a considerable number of benefits:
-
-1. It allows us to verify correctness of logic and spot semantic errors at a
-   very high level, by simply looking at the sequence of operations (available
-   by default at debug / verbose log level), without having to dig through the
-   multiple levels of complicated, interwoven format handling code that is
-   legacy swscale.
-
-2. Because most of the brains lives inside the the powerful optimizer, we get
-   fast paths "for free" for any suitable format conversion, rather than having
-   to enumerate them one by one. SIMD code itself can be written in a very
-   general way and does need to be tied to specific pixel formats - subsequent
-   low-level implementations can be strung together without much overhead.
-
-3. We can in the future, with relative ease, compile these operations
-   down to SPIR-V (or even LLVM IR) and generate efficient GPU or
-   target-machine specific implementations. This also opens the window for
-   adding hardware frame support to libswscale, and even transparently using
-   GPU acceleration for CPU frames.
-
-4. Platform-specific SIMD can be reduced down to a comparatively small set of
-   optimized routines, while still providing 100% coverage for all possible
-   pixel formats and operations. (As of writing, the x86 example backend has
-   about 60 unique implementations, of which 20 are trivial swizzles, 10 are
-   read/write ops, 10 are pixel type conversions and the remaining 20 are the
-   various logic/arithmetic ops).
-
-5. Backends hide behind a layer of abstraction offering them a considerable
-   deal of flexibility in how they want to implement their operations. For
-   example, the x86 backend has a dedicated function for compiling compatible
-   operations down to a single in-place pshufb instruction.
-
-   Platform specific low level data is self-contained within its own setup()
-   function and private data structure, eliminating all reads into SwsContext
-   or the possibility of conflicts between platforms.
-
-6. We can compute an exact reference result for each operation with fixed
-   precision (ff_sws_op_apply_q), and use that to e.g. measure the amount of
-   error introduced by dithering, or even catch bugs in the reference C
-   implementation. (In theory - currently checkasm just compares against C)
-
-Examples of SwsOp in action
----------------------------
-
-For illustration, here is the sequence of operations currently generated by
-my prototype, for a conversion from RGB24 to YUV444P:
-
-Unoptimized operation list:
-  [ u8 .... -> ....] SWS_OP_READ         : 3 elem(s) packed >> 0
-  [ u8 .... -> ....] SWS_OP_SWIZZLE      : 0123
-  [ u8 .... -> ....] SWS_OP_RSHIFT       : >> 0
-  [ u8 .... -> ....] SWS_OP_CLEAR        : {_ _ _ 0}
-  [ u8 .... -> ....] SWS_OP_CONVERT      : u8 -> f32
-  [f32 .... -> ....] SWS_OP_LINEAR       : diag3+alpha [[1/255 0 0 0 0] [0 1/255 0 0 0] [0 0 1/255 0 0] [0 0 0 1 1]]
-  [f32 .... -> ....] SWS_OP_LINEAR       : matrix3 [[0.299000 0.587000 0.114000 0 0] [-0.168736 -0.331264 1/2 0 0] [1/2 -0.418688 -57/701 0 0] [0 0 0 1 0]]
-  [f32 .... -> ....] SWS_OP_LINEAR       : diag3+off3 [[219 0 0 0 16] [0 224 0 0 128] [0 0 224 0 128] [0 0 0 1 0]]
-  [f32 .... -> ....] SWS_OP_DITHER       : 16x16 matrix
-  [f32 .... -> ....] SWS_OP_MAX          : {0 0 0 0} <= x
-  [f32 .... -> ....] SWS_OP_MIN          : x <= {255 255 255 _}
-  [f32 .... -> ....] SWS_OP_CONVERT      : f32 -> u8
-  [ u8 .... -> ....] SWS_OP_LSHIFT       : << 0
-  [ u8 .... -> ....] SWS_OP_SWIZZLE      : 0123
-  [ u8 .... -> ....] SWS_OP_WRITE        : 3 elem(s) planar >> 0
-
-This is optimized into the following sequence:
-
-Optimized operation list:
-  [ u8 XXXX -> +++X] SWS_OP_READ         : 3 elem(s) packed >> 0
-  [ u8 ...X -> +++X] SWS_OP_CONVERT      : u8 -> f32
-  [f32 ...X -> ...X] SWS_OP_LINEAR       : matrix3+off3 [[0.256788 0.504129 0.097906 0 16] [-0.148223 -0.290993 112/255 0 128] [112/255 -0.367788 -0.071427 0 128] [0 0 0 1 0]]
-  [f32 ...X -> ...X] SWS_OP_DITHER       : 16x16 matrix
-  [f32 ...X -> +++X] SWS_OP_CONVERT      : f32 -> u8
-  [ u8 ...X -> +++X] SWS_OP_WRITE        : 3 elem(s) planar >> 0
-    (X = unused, + = exact, 0 = zero)
-
-The extra metadata on the left of the operation list is just a dump of the
-internal state used by the optimizer during optimization. It keeps track of
-knowledge about the pixel values, such as their value range, whether or not
-they're exact integers, and so on.
-
-In this example, you can see that the input values are exact (except for
-the alpha channel, which is undefined), until the first SWS_OP_LINEAR
-multiplies them by a noninteger constant. They regain their exact integer
-status only after the (truncating) conversion to U8 in the output step.
-
-Example of more aggressive optimization
----------------------------------------
-
-Conversion pass for gray -> rgb48:
-Unoptimized operation list:
-  [ u8 .... -> ....] SWS_OP_READ         : 1 elem(s) planar >> 0
-  [ u8 .... -> ....] SWS_OP_SWIZZLE      : 0123
-  [ u8 .... -> ....] SWS_OP_RSHIFT       : >> 0
-  [ u8 .... -> ....] SWS_OP_CLEAR        : {_ 0 0 0}
-  [ u8 .... -> ....] SWS_OP_CONVERT      : u8 -> f32
-  [f32 .... -> ....] SWS_OP_LINEAR       : luma+alpha [[1/255 0 0 0 0] [0 1 0 0 0] [0 0 1 0 0] [0 0 0 1 1]]
-  [f32 .... -> ....] SWS_OP_LINEAR       : matrix3 [[1 0 701/500 0 0] [1 -0.344136 -0.714136 0 0] [1 443/250 0 0 0] [0 0 0 1 0]]
-  [f32 .... -> ....] SWS_OP_LINEAR       : diag3 [[65535 0 0 0 0] [0 65535 0 0 0] [0 0 65535 0 0] [0 0 0 1 0]]
-  [f32 .... -> ....] SWS_OP_MAX          : {0 0 0 0} <= x
-  [f32 .... -> ....] SWS_OP_MIN          : x <= {65535 65535 65535 _}
-  [f32 .... -> ....] SWS_OP_CONVERT      : f32 -> u16
-  [u16 .... -> ....] SWS_OP_LSHIFT       : << 0
-  [u16 .... -> ....] SWS_OP_SWIZZLE      : 0123
-  [u16 .... -> ....] SWS_OP_WRITE        : 3 elem(s) packed >> 0
-
-Optimized operation list:
-  [ u8 XXXX -> +XXX] SWS_OP_READ         : 1 elem(s) planar >> 0
-  [ u8 .XXX -> +XXX] SWS_OP_CONVERT      : u8 -> u16 (expand)
-  [u16 .XXX -> +++X] SWS_OP_SWIZZLE      : 0003
-  [u16 ...X -> +++X] SWS_OP_WRITE        : 3 elem(s) packed >> 0
-    (X = unused, + = exact, 0 = zero)
-
-Here, the optimizer has managed to eliminate all of the unnecessary linear
-operations on previously zero'd values, turn the resulting column matrix into
-a swizzle operation, avoid the unnecessary dither (and round trip via float)
-because the pixel values are guaranteed to be bit exact, and finally, turns
-the multiplication by 65535 / 255 = 257 into a simple integer expand operation.
-
-As a final bonus, the x86 backend further optimizes this into a 12-byte shuffle:
-  pshufb = {0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1}
-
-time=208 us, ref=4212 us, speedup=20.236x faster (single thread)
-time=57 us, ref=472 us, speedup=8.160x faster (multi thread)
-
-Compiler and underlying implementation layer (SwsOpChain)
----------------------------------------------------------
-
-While the backend API is flexible enough to permit more exotic implementations
-(e.g. using JIT code generation), we establish a common set of helpers for use
-in "traditional" SIMD implementations.
-
-The basic idea is to have one "kernel" (or implementation) per operation,
-and then just chain a list of these kernels together as separate function
-calls. For best performance, we want to keep data in vector registers in
-between function calls using a custom calling convention, thus avoiding any
-unnecessary memory accesses. Additionally, we want the per-kernel overhead to
-be as low as possible, with each kernel ideally just jumping directly into
-the next kernel.
-
-As a result, we arrive at a design where we first divide the image into small
-chunks, or "blocks", and then dispatch the "chain" of kernels on each chunk in
-sequence. Each kernel processes a fixed number of pixels, with the overall
-entry point taking care of looping. Remaining pixels (the "tail") are handled
-generically by the backend-invariant dispatch code (located in ops.c), using a
-partial memcpy into a suitably sized temporary buffer.
-
-To minimize the per-kernel function call overhead, we use a "continuation
-passing style" for chaining kernels. Each operation computes its result and
-then directly calls the next operation in the sequence, with the appropriate
-internal function signature.
-
-The C reference backend reads data into the stack and then passes the array
-pointers to the next continuation as regular function arguments:
-
-  void process(GlobalContext *ctx, OpContext *op,
-               block_t x, block_t y, block_t z, block_t w)
-  {
-      for (int i = 0; i < SWS_BLOCK_SIZE; i++)
-          // do something with x[i], y[i], z[i], w[i]
-
-      op->next(ctx, &op[1], x, y, z, w);
-  }
-
-With type conversions pushing the new data onto the stack as well:
-
-  void convert8to16(GlobalContext *ctx, OpContext *op,
-                    block_t x, block_t y, block_t z, block_t w)
-  {
-        /* Pseudo-code */
-        u16block_t x16 = (u16block_t) x;
-        u16block_t y16 = (u16block_t) y;
-        u16block_t z16 = (u16block_t) z;
-        u16block_t w16 = (u16block_t) w;
-
-        op->next(ctx, &op[1], x16, y16, z16, w16);
-  }
-
-By contrast, the x86 backend always keeps the X/Y/Z/W values pinned in specific
-vector registers (ymm0-ymm3 for the lower half, and ymm4-ymm7 for the second
-half).
-
-Each kernel additionally has access to a 32 byte per-op context storing the
-pointer to the next kernel plus 16 bytes of arbitrary private data. This is
-used during construction of the function chain to place things like small
-constants.
-
-In assembly, the per-kernel overhead looks like this:
-
-  load $tmp, $arg1
-  ...
-  add $arg1, 32
-  jump $tmp
-
-This design gives vastly better performance than the alternative of returning
-out to a central loop or "trampoline". This is partly because the order of
-kernels within a chain is always the same, so the branch predictor can easily
-remember the target address of each "jump" instruction.
-
-The only way to realistically improve on this design would be to directly
-stitch the kernel body together using runtime code generation.
-
-Future considerations and limitations
--------------------------------------
-
-My current prototype has a number of severe limitations and opportunities
-for improvements:
-
-1. It does not handle scaling at all. I am not yet entirely sure on how I want
-   to handle scaling; this includes handling of subsampled content. I have a
-   number of vague ideas in my head, but nothing where I can say with certainty
-   that it will work out well.
-
-   It's possible that we won't come up with a perfect solution here, and will
-   need to decide on which set of compromises we are comfortable accepting:
-
-   1. Do we need the ability to scale YUV -> YUV by handling luma and chroma
-      independently? When downscaling 100x100 4:2:0 to 50x50 4:4:4, should we
-      support the option of reusing the chroma plane directly (even though
-      this would introduce a subpixel shift for typical chroma siting)?
-
-   Looking towards zimg, I am also thinking that we probably also want to do
-   scaling on floating point values, since this is best for both performance
-   and accuracy, especially given that we need to go up to 32-bit intermediates
-   during scaling anyway.
-
-   So far, the most promising approach seems to be to handle subsampled
-   input/output as a dedicated read/write operation type; perhaps even with a
-   fixed/static subsampling kernel. To avoid compromising on performance when
-   chroma resampling is not necessary, the optimizer could then relax the
-   pipeline to use non-interpolating read/writes when all intermediate
-   operations are component-independent.
-
-2. Since each operation is conceptually defined on 4-component pixels, we end
-   up defining a lot of variants of each implementation for each possible
-   *subset*. For example, we have four different implementations for
-   SWS_OP_SCALE in my current templates:
-    - op_scale_1000
-    - op_scale_1001
-    - op_scale_1110
-    - op_scale_1111
-
-   This reflects the four different arrangements of pixel components that are
-   typically present (or absent). While best for performance, it does turn into
-   a bit of a chore when implementing these kernels.
-
-   The only real alternative would be to either branch inside the kernel (bad),
-   or to use separate kernels for each individual component and chain them all
-   together. I have not yet tested whether the latter approach would be faster
-   after the latest round of refactors to the kernel glue code.
-
-3. I do not yet have any support for LUTs. But when I add them, something we
-   could do is have the optimized pass automatically "promote" a sequence of
-   operations to LUTs. For example, any sequence that looks like:
-
-   1. [u8] SWS_OP_CONVERT -> X
-   2. [X] ... // only per-component operations
-   4. [X] SWS_OP_CONVERT -> Y
-   3. [Y] SWS_OP_WRITE
-
-   could be replaced by a LUT with 256 entries. This is especially important
-   for anything involving packed 8-bit input (e.g. rgb8, rgb4_byte).
-
-   We also definitely want to hook this up to the existing CMS code for
-   transformations between different primaries.
-
-4. Because we rely on AVRational math to generate the coefficients for
-   operations, we need to be able to represent all pixel values as an
-   AVRational. However, this presents a challenge for 32-bit formats (e.g.
-   GRAY32, RGBA128), because their size exceeds INT_MAX, which is the maximum
-   value representable by an AVRational.
-
-   It's possible we may want to introduce an AVRational64 for this, or
-   perhaps more flexibly, extend AVRational to an AVFloating type which is
-   represented as { AVRational n; int exp; }, representing n/d * 2^exp. This
-   would preserve our ability to represent all pixel values exactly, while
-   opening up the range arbitrarily.
-
-5. Is there ever a situation where the use of floats introduces the risk of
-   non bit-exact output? For this reason, and possible performance advantages,
-   we may want to explore the use of a fixed-point 16 bit path as an alternative
-   to the floating point math.
-
-   So far, I have managed to avoid any bit exactness issues inside the x86
-   backend by ensuring that the order of linear operations is identical
-   between the C backend and the x86 backend, but this may not be practical
-   to guarantee on all backends. The x86 float code is also dramatically
-   faster than the old fixed point code, so I'm tentatively optimistic about
-   the lack of a need for a fixed point path.

doc/t2h.pm

@@ -54,24 +54,12 @@ sub get_formatting_function($$) {
 }
 
 # determine texinfo version
-my $package_version = ff_get_conf('PACKAGE_VERSION');
-$package_version =~ s/\+dev$//;
-my $program_version_num = version->declare($package_version)->numify;
+my $program_version_num = version->declare(ff_get_conf('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;
@@ -89,9 +77,6 @@ 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 '');
@@ -99,40 +84,24 @@ sub ffmpeg_heading_command($$$$$)
     print STDERR "Process $command "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
             if ($self->get_conf('DEBUG'));
-    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'};
-        }
+    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'};
     }
-
-    if ($output_unit) {
+    if ($element) {
         $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
-                                                       $command, $output_unit);
+                                                       $command, $element);
     }
 
     my $heading_level;
     # node is used as heading if there is nothing else.
     if ($cmdname eq 'node') {
-        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'}))
+        if (!$element or (!$element->{'extra'}->{'section'}
+            and $element->{'extra'}->{'node'}
+            and $element->{'extra'}->{'node'} eq $command
              # bogus node may not have been normalized
             and defined($command->{'extra'}->{'normalized'}))) {
             if ($command->{'extra'}->{'normalized'} eq 'Top') {
@@ -142,15 +111,7 @@ sub ffmpeg_heading_command($$$$$)
             }
         }
     } else {
-        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'};
-        }
+        $heading_level = $command->{'level'};
     }
 
     my $heading = $self->command_text($command);
@@ -158,8 +119,8 @@ sub ffmpeg_heading_command($$$$$)
     # if there is an error in the node.
     if (defined($heading) and $heading ne '' and defined($heading_level)) {
 
-        if ($root_commands{$cmdname}
-            and $sectioning_commands{$cmdname}) {
+        if ($Texinfo::Common::root_commands{$cmdname}
+            and $Texinfo::Common::sectioning_commands{$cmdname}) {
             my $content_href = $self->command_contents_href($command, 'contents',
                                                             $self->{'current_filename'});
             if ($content_href) {
@@ -179,13 +140,7 @@ sub ffmpeg_heading_command($$$$$)
             }
         }
 
-        my $in_preformatted;
-        if ($program_version_num >= 7.001090) {
-          $in_preformatted = $self->in_preformatted_context();
-        } else {
-          $in_preformatted = $self->in_preformatted();
-        }
-        if ($in_preformatted) {
+        if ($self->in_preformatted()) {
             $result .= $heading."\n";
         } else {
             # if the level was changed, set the command name right
@@ -194,25 +149,21 @@ 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) {
-                $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')}(
+                $heading = [$heading];
+            }
+            $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(%sectioning_commands), 'node') {
+foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') {
     texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
@@ -237,56 +188,28 @@ sub ffmpeg_begin_file($$$)
     my $filename = shift;
     my $element = shift;
 
-    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 $command;
+    if ($element and $self->get_conf('SPLIT')) {
+        $command = $self->element_command($element);
     }
 
-    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,
+    my ($title, $description, $encoding, $date, $css_lines,
+        $doctype, $bodytext, $copying_comment, $after_body_open,
+        $extra_head, $program_and_version, $program_homepage,
         $program, $generator);
-    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,
+    if ($program_version_num >= 7.000000) {
+        ($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_information($command_for_title,
-                                                                 $filename);
+         $program, $generator) = $self->_file_header_information($command);
     } else {
         ($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_informations($command_for_title);
+         $doctype, $bodytext, $copying_comment, $after_body_open,
+         $extra_head, $program_and_version, $program_homepage,
+         $program, $generator) = $self->_file_header_informations($command);
     }
 
-    my $links;
-    if ($program_version_num >= 7.000000) {
-      $links = $self->_get_links($filename, $element, $node_command);
-    } else {
-      $links = $self->_get_links ($filename, $element);
-    }
+    my $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">
@@ -329,25 +252,13 @@ sub ffmpeg_program_string($)
   if (defined($self->get_conf('PROGRAM'))
       and $self->get_conf('PROGRAM') ne ''
       and defined($self->get_conf('PACKAGE_URL'))) {
-    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(
+    return $self->convert_tree(
       $self->gdt('This document was generated using @uref{{program_homepage}, @emph{{program}}}.',
-         { 'program_homepage' => {'text' => $self->get_conf('PACKAGE_URL')},
-           'program' => {'text' => $self->get_conf('PROGRAM') }}));
-    }
+         { 'program_homepage' => $self->get_conf('PACKAGE_URL'),
+           'program' => $self->get_conf('PROGRAM') }));
   } else {
-    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.'));
-    }
+    return $self->convert_tree(
+      $self->gdt('This document was generated automatically.'));
   }
 }
 if ($program_version_6_8) {

doc/texidep.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#! /usr/bin/env perl
 
 # This script will print the dependency of a Texinfo file to stdout.
 # texidep.pl <src-path> <input.texi> <output.ext>

doc/undefined.txt

@@ -44,3 +44,4 @@ 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.
+

doc/utils.texi

@@ -695,8 +695,6 @@ FL+FR+FC+LFE+SL+SR
 FL+FR+FC+BC+SL+SR
 @item 6.0(front)
 FL+FR+FLC+FRC+SL+SR
-@item 3.1.2
-FL+FR+FC+LFE+TFL+TFR
 @item hexagonal
 FL+FR+FC+BL+BR+BC
 @item 6.1
@@ -715,28 +713,14 @@ FL+FR+FC+LFE+BL+BR+SL+SR
 FL+FR+FC+LFE+BL+BR+FLC+FRC
 @item 7.1(wide-side)
 FL+FR+FC+LFE+FLC+FRC+SL+SR
-@item 5.1.2
+@item 7.1(top)
 FL+FR+FC+LFE+BL+BR+TFL+TFR
 @item octagonal
 FL+FR+FC+BL+BR+BC+SL+SR
 @item cube
 FL+FR+BL+BR+TFL+TFR+TBL+TBR
-@item 5.1.4
-FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR
-@item 7.1.2
-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 9.1.6
-FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR+TSL+TSR
 @item hexadecagonal
 FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR
-@item binaural
-BIL+BIR
 @item downmix
 DL+DR
 @item 22.2
@@ -805,11 +789,6 @@ The following binary operators are available: @code{+}, @code{-},
 
 The following unary operators are available: @code{+}, @code{-}.
 
-Some internal variables can be used to store and load intermediary
-results. They can be accessed using the @code{ld} and @code{st}
-functions with an index argument varying from 0 to 9 to specify which
-internal variable to access.
-
 The following functions are available:
 @table @option
 @item abs(x)
@@ -824,7 +803,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)
@@ -907,9 +886,9 @@ Return 1.0 if @var{x} is +/-INFINITY, 0.0 otherwise.
 @item isnan(x)
 Return 1.0 if @var{x} is NAN, 0.0 otherwise.
 
-@item ld(idx)
-Load the value of the internal variable with index @var{idx}, which was
-previously stored with st(@var{idx}, @var{expr}).
+@item ld(var)
+Load the value of the internal variable with number
+@var{var}, which was previously stored with st(@var{var}, @var{expr}).
 The function returns the loaded value.
 
 @item lerp(x, y, z)
@@ -942,31 +921,15 @@ Compute the power of @var{x} elevated @var{y}, it is equivalent to
 
 @item print(t)
 @item print(t, l)
-Print the value of expression @var{t} with loglevel @var{l}. If @var{l} is not
-specified then a default log level is used.
-Return the value of the expression printed.
+Print the value of expression @var{t} with loglevel @var{l}. If
+@var{l} is not specified then a default log level is used.
+Returns the value of the expression printed.
 
-@item random(idx)
-Return a pseudo random value between 0.0 and 1.0. @var{idx} is the
-index of the internal variable used to save the seed/state, which can be
-previously stored with @code{st(idx)}.
+Prints t with loglevel l
 
-To initialize the seed, you need to store the seed value as a 64-bit
-unsigned integer in the internal variable with index @var{idx}.
-
-For example, to store the seed with value @code{42} in the internal
-variable with index @code{0} and print a few random values:
-@example
-st(0,42); print(random(0)); print(random(0)); print(random(0))
-@end example
-
-@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, which can be previously stored with @code{st(idx)}.
-
-To initialize the seed, you need to store the seed value as a 64-bit
-unsigned integer in the internal variable with index @var{idx}.
+@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}
@@ -975,14 +938,14 @@ with argument @var{ld(0)} is 0 in the interval 0..@var{max}.
 The expression in @var{expr} must denote a continuous function or the
 result is undefined.
 
-@var{ld(0)} is used to represent the function input value, which means that the
-given expression will be evaluated multiple times with various input values that
-the expression can access through @code{ld(0)}. When the expression evaluates to
-0 then the corresponding input value will be returned.
+@var{ld(0)} is used to represent the function input value, which means
+that the given expression will be evaluated multiple times with
+various input values that the expression can access through
+@code{ld(0)}. When the expression evaluates to 0 then the
+corresponding input value will be returned.
 
 @item round(expr)
-Round the value of expression @var{expr} to the nearest integer. For example,
-"round(1.5)" is "2.0".
+Round the value of expression @var{expr} to the nearest integer. For example, "round(1.5)" is "2.0".
 
 @item sgn(x)
 Compute sign of @var{x}.
@@ -1000,15 +963,12 @@ Compute the square root of @var{expr}. This is equivalent to
 @item squish(x)
 Compute expression @code{1/(1 + exp(4*x))}.
 
-@item st(idx, expr)
+@item st(var, expr)
 Store the value of the expression @var{expr} in an internal
-variable. @var{idx} specifies the index of the variable where to store
-the value, and it is a value ranging from 0 to 9. The function returns
-the value stored in the internal variable.
-
-The stored value can be retrieved with @code{ld(var)}.
-
-Note: variables are currently not shared between expressions.
+variable. @var{var} specifies the number of the variable where to
+store the value, and it is a value ranging from 0 to 9. The function
+returns the value stored in the internal variable.
+Note, Variables are currently not shared between expressions.
 
 @item tan(x)
 Compute tangent of @var{x}.
@@ -1017,16 +977,16 @@ Compute tangent of @var{x}.
 Compute hyperbolic tangent of @var{x}.
 
 @item taylor(expr, x)
-@item taylor(expr, x, idx)
+@item taylor(expr, x, id)
 Evaluate a Taylor series at @var{x}, given an expression representing
-the @code{ld(idx)}-th derivative of a function at 0.
+the @code{ld(id)}-th derivative of a function at 0.
 
 When the series does not converge the result is undefined.
 
-@var{ld(idx)} is used to represent the derivative order in @var{expr},
+@var{ld(id)} is used to represent the derivative order in @var{expr},
 which means that the given expression will be evaluated multiple times
 with various input values that the expression can access through
-@code{ld(idx)}. If @var{idx} is not specified then 0 is assumed.
+@code{ld(id)}. If @var{id} is not specified then 0 is assumed.
 
 Note, when you have the derivatives at y instead of 0,
 @code{taylor(expr, x-y)} can be used.

ffbuild/arch.mak

@@ -3,8 +3,6 @@ OBJS-$(HAVE_ARMV6)   += $(ARMV6-OBJS)   $(ARMV6-OBJS-yes)
 OBJS-$(HAVE_ARMV8)   += $(ARMV8-OBJS)   $(ARMV8-OBJS-yes)
 OBJS-$(HAVE_VFP)     += $(VFP-OBJS)     $(VFP-OBJS-yes)
 OBJS-$(HAVE_NEON)    += $(NEON-OBJS)    $(NEON-OBJS-yes)
-OBJS-$(HAVE_SVE)     += $(SVE-OBJS)     $(SVE-OBJS-yes)
-OBJS-$(HAVE_SVE2)    += $(SVE2-OBJS)    $(SVE2-OBJS-yes)
 
 OBJS-$(HAVE_MIPSFPU)   += $(MIPSFPU-OBJS)    $(MIPSFPU-OBJS-yes)
 OBJS-$(HAVE_MIPSDSP)   += $(MIPSDSP-OBJS)    $(MIPSDSP-OBJS-yes)
@@ -19,9 +17,6 @@ OBJS-$(HAVE_VSX)     += $(VSX-OBJS) $(VSX-OBJS-yes)
 
 OBJS-$(HAVE_RV)      += $(RV-OBJS)      $(RV-OBJS-yes)
 OBJS-$(HAVE_RVV)     += $(RVV-OBJS)     $(RVV-OBJS-yes)
-OBJS-$(HAVE_RV_ZVBB) += $(RVVB-OBJS)    $(RVVB-OBJS-yes)
-
-OBJS-$(HAVE_SIMD128) += $(SIMD128-OBJS) $(SIMD128-OBJS-yes)
 
 OBJS-$(HAVE_MMX)     += $(MMX-OBJS)     $(MMX-OBJS-yes)
 OBJS-$(HAVE_X86ASM)  += $(X86ASM-OBJS)  $(X86ASM-OBJS-yes)

ffbuild/bin2c.c

@@ -38,10 +38,8 @@ int main(int argc, char **argv)
         return -1;
 
     output = fopen(argv[2], "wb");
-    if (!output) {
-        fclose(input);
+    if (!output)
         return -1;
-    }
 
     if (argc == 4) {
         name = argv[3];
@@ -69,10 +67,8 @@ int main(int argc, char **argv)
 
     fclose(output);
 
-    if (ferror(input) || !feof(input)) {
-        fclose(input);
+    if (ferror(input) || !feof(input))
         return -1;
-    }
 
     fclose(input);
 

ffbuild/common.mak

@@ -18,7 +18,7 @@ BIN2C = $(BIN2CEXE)
 ifndef V
 Q      = @
 ECHO   = printf "$(1)\t%s\n" $(2)
-BRIEF  = CC CXX OBJCC HOSTCC HOSTLD AS X86ASM AR LD STRIP CP WINDRES NVCC BIN2C METALCC METALLIB
+BRIEF  = CC CXX OBJCC HOSTCC HOSTLD AS X86ASM AR LD STRIP CP WINDRES NVCC BIN2C
 SILENT = DEPCC DEPHOSTCC DEPAS DEPX86ASM RANLIB RM
 
 MSG    = $@
@@ -115,12 +115,6 @@ COMPILE_LASX = $(call COMPILE,CC,LASXFLAGS)
 $(BIN2CEXE): ffbuild/bin2c_host.o
 	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS)
 
-RUN_BIN2C = $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@)))
-RUN_GZIP  = $(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@
-RUN_MINIFY = $(M)sed 's!/\\*.*\\*/!!g' $< | tr '\n' ' ' | tr -s ' ' | sed 's/^ //; s/ $$//' > $@
-%.gz: TAG = GZIP
-%.min: TAG = MINIFY
-
 %.metal.air: %.metal
 	$(METALCC) $< -o $@
 
@@ -128,50 +122,25 @@ RUN_MINIFY = $(M)sed 's!/\\*.*\\*/!!g' $< | tr '\n' ' ' | tr -s ' ' | sed 's/^ /
 	$(METALLIB) --split-module-without-linking $< -o $@
 
 %.metallib.c: %.metallib $(BIN2CEXE)
-	$(RUN_BIN2C)
+	$(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@)))
 
 %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h
 	$(COMPILE_NVCC)
 
 ifdef CONFIG_PTX_COMPRESSION
+%.ptx.gz: TAG = GZIP
 %.ptx.gz: %.ptx
-	$(RUN_GZIP)
+	$(M)gzip -c9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@
 
 %.ptx.c: %.ptx.gz $(BIN2CEXE)
-	$(RUN_BIN2C)
+	$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@)))
 else
 %.ptx.c: %.ptx $(BIN2CEXE)
-	$(RUN_BIN2C)
-endif
-
-%.css.min: %.css
-	$(RUN_MINIFY)
-
-ifdef CONFIG_RESOURCE_COMPRESSION
-
-%.css.min.gz: %.css.min
-	$(RUN_GZIP)
-
-%.css.c: %.css.min.gz $(BIN2CEXE)
-	$(RUN_BIN2C)
-
-%.html.gz: %.html
-	$(RUN_GZIP)
-
-%.html.c: %.html.gz $(BIN2CEXE)
-	$(RUN_BIN2C)
-
-else   # NO COMPRESSION
-
-%.css.c: %.css.min $(BIN2CEXE)
-	$(RUN_BIN2C)
-
-%.html.c: %.html $(BIN2CEXE)
-	$(RUN_BIN2C)
+	$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@)))
 endif
 
 clean::
-	$(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
+	$(RM) $(BIN2CEXE)
 
 %.c %.h %.pc %.ver %.version: TAG = GEN
 
@@ -190,6 +159,7 @@ endif
 include $(SRC_PATH)/ffbuild/arch.mak
 
 OBJS      += $(OBJS-yes)
+SLIBOBJS  += $(SLIBOBJS-yes)
 SHLIBOBJS += $(SHLIBOBJS-yes)
 STLIBOBJS += $(STLIBOBJS-yes)
 FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
@@ -199,6 +169,7 @@ LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))
 FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
 
 OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))
+SLIBOBJS  := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
 SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%))
 STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%))
 TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
@@ -223,6 +194,7 @@ PTXOBJS      = $(filter %.ptx.o,$(OBJS))
 $(HOBJS):     CCFLAGS += $(CFLAGS_HEADERS)
 checkheaders: $(HOBJS)
 .SECONDARY:   $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=)
+
 alltools: $(TOOLS)
 
 $(HOSTOBJS): %.o: %.c
@@ -234,14 +206,15 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o
 $(OBJS):     | $(sort $(dir $(OBJS)))
 $(HOBJS):    | $(sort $(dir $(HOBJS)))
 $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
+$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))
 $(SHLIBOBJS): | $(sort $(dir $(SHLIBOBJS)))
 $(STLIBOBJS): | $(sort $(dir $(STLIBOBJS)))
 $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
 $(TOOLOBJS): | tools
 
-OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
+OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
 
-CLEANSUFFIXES     = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.min.gz *.css.min *.css.c  *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb
+CLEANSUFFIXES     = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb
 LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
 
 define RULES
@@ -251,4 +224,4 @@ endef
 
 $(eval $(RULES))
 
--include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d)
+-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d)