avcodec/hevc_filter: copy_CTB() only within width&height

Fixes: out of array access
Fixes: 49271/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5424984922652672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 009ef35d38)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

.gitattributes

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

.mailmap

@@ -1,8 +1,9 @@
+<james.darnley@gmail.com> <jdarnley@obe.tv>
 <jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
 <sw@jkqxz.net> <mrt@jkqxz.net>
 <u@pkh.me> <cboesch@gopro.com>
-<quinkblack@foxmail.com> <wantlamy@gmail.com>
-<quinkblack@foxmail.com> <zhilizhao@tencent.com>
+<zhilizhao@tencent.com> <quinkblack@foxmail.com>
+<zhilizhao@tencent.com> <wantlamy@gmail.com>
 <modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
 <stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
 <barryjzhao@tencent.com> <mypopydev@gmail.com>
@@ -17,10 +18,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>

CREDITS

@@ -1,6 +1,6 @@
-See the Git history of the project (https://git.ffmpeg.org/ffmpeg) to
+See the Git history of the project (git://source.ffmpeg.org/ffmpeg) to
 get the names of people who have contributed to FFmpeg.
 
 To check the log, you can type the command "git log" in the FFmpeg
 source directory, or browse the online repository at
-https://git.ffmpeg.org/ffmpeg
+http://source.ffmpeg.org.

Changelog

@@ -1,237 +1,8 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
-version 7.0.1:
- lavc/flacdsp: do not assume maximum R-V VL
- avformat/flacdec: Reorder allocations to avoid leak on error
- avcodec/adts_parser: Don't presume buffer to be padded
- avformat/movenc: Check av_malloc()
- avcodec/vp8: Return error on error
- avformat/mov: store sample_sizes as unsigned ints
- avformat/vvc: fix parsing sps_subpic_id
- avformat/vvc: initialize some ptl flags
- avcodec/mscc & mwsc: Check loop counts before use
- avcodec/mpegvideo_enc: Fix potential overflow in RD
- avcodec/mpeg4videodec: assert impossible wrap points
- avcodec/mpeg12dec: Use 64bit in bit computation
- avcodec/vqcdec: Check init_get_bits8() for failure
- avcodec/vvc/dec: Check init_get_bits8() for failure
- avcodec/vble: Check av_image_get_buffer_size() for failure
- avcodec/vp3: Replace check by assert
- avcodec/vp8: Forward return of ff_vpx_init_range_decoder()
- avcodec/jpeg2000dec: remove ST=3 case
- avcodec/qsvdec: Check av_image_get_buffer_size() for failure
- avcodec/exr: Fix preview overflow
- avcodec/decode: decode_simple_internal() only implements audio and video
- avcodec/fmvc: remove dead assignment
- avcodec/h2645_sei: Remove dead checks
- avcodec/h264_slice: Remove dead sps check
- avcodec/lpc: copy levenson coeffs only when they have been computed
- avutil/tests/base64: Check with too short output array
- libavutil/base64: Try not to write over the array end
- avcodec/cbs_av1: Avoid shift overflow
- fftools/ffplay: Check return of swr_alloc_set_opts2()
- tools/opt_common: Check for malloc failure
- doc/examples/demux_decode: Simplify loop
- avformat/concatdec: Check file
- avcodec/mpegvideo_enc: Fix 1 line and one column images
- avcodec/amrwbdec: assert mode to be valid in decode_fixed_vector()
- avcodec/wavarc: fix integer overflow in decode_5elp() block type 2
- swscale/output: Fix integer overflow in yuv2rgba64_full_1_c_template()
- swscale/output: Fix integer overflow in yuv2rgba64_1_c_template
- avcodec/av1dec: Change bit_depth to int
- avcodec/av1dec: bit_depth cannot be another values than 8,10,12
- avcodec/avs3_parser: assert the return value of init_get_bits()
- avcodec/avs2_parser: Assert init_get_bits8() success with const size 15
- avfilter/avfiltergraph: return value of ff_request_frame() is unused
- avformat/mxfdec: Check body_offset
- avformat/kvag: Check sample_rate
- avcodec/atrac9dec: Check init_get_bits8() for failure
- avcodec/ac3_parser: Check init_get_bits8() for failure
- avcodec/pngdec: Check last AVFrame before deref
- avcodec/hevcdec: Check ref frame
- doc/examples/qsv_transcode: Initialize pointer before free
- doc/examples/qsv_transcode: Simplify str_to_dict() loop
- doc/examples/vaapi_transcode: Simplify loop
- doc/examples/qsv_transcode: Simplify loop
- avcodec/cbs_h2645: Check NAL space
- avfilter/vf_thumbnail_cuda: Set ret before checking it
- avfilter/signature_lookup: Dont copy uninitialized stuff around
- avfilter/signature_lookup: Fix 2 differences to the refernce SW
- avcodec/x86/vp3dsp_init: Set correct function pointer, fix crash
- avformat/mp3dec: change bogus error message if read_header encounters EOF
- avformat/mp3dec: simplify inner frame size check in mp3_read_header
- avformat/mp3dec: only call ffio_ensure_seekback once
- avcodec/cbs_h266: read vps_ptl_max_tid before using it
- avcodec/cbs_h266: fix sh_collocated_from_l0_flag and sh_collocated_ref_idx infer
- avformat/vvc: fix parsing some early VPS bitstream values
- avformat/vvc: fix writing general_constraint_info bytes
- avutil/ppc/cpu: Also use the machdep.altivec sysctl on NetBSD
- lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's
- vulkan_av1: Fix force_integer_mv value
- vaapi_av1: Fix force_integer_mv value
- av1dec: Add force_integer_mv derived field for decoder use
- avutil/iamf: fix offsets for mix_gain options
- avformat/iamfdec: check nb_streams in header read
- avformat/mov: free the infe allocated item data on failure
- avformat/iamf_writer: reject duplicated stream ids in a stream group
- avformat/mov: don't read key_size bytes twice in the keys atom
- avformat/mov: take into account the first eight bytes in the keys atom
- avformat/mov: fix the check for the heif item parsing loop
- avutil/iamf: fix mix_gain_class name
- av1dec: Fix RefFrameSignBias calculation
- avcodec/codec_par: always clear extradata_size in avcodec_parameters_to_context()
- avcodec/mediacodecenc: Fix return empty packet when bsf is used
- avcodec/hevcdec: Fix precedence, bogus film grain warning
- avcodec/hevcdec: fix segfault on invalid film grain metadata
- lavc/vvc: Skip enhancement layer NAL units
- avformat/mov: ignore old infe box versions
- vulkan_av1: add workaround for NVIDIA drivers tested on broken CTS
- lavc/vulkan_av1: Use av1dec reference order hint information
- lavc/av1: Record reference ordering information for each frame
- doc/encoders: add missing libxvid option
- doc/encoders: remove non-existent flag
- fate/ffmpeg: Avoid dependency on samples
- avcodec/wavpack: Remove always-false check
- avcodec/wavpack: Fix leak and segfault on reallocation error
- avcodec/lossless_videoencdsp: Don't presume alignment in diff_bytes
- avcodec/ppc/h264dsp: Fix left shifts of negative numbers
-
-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
-
-
-version 6.0:
-- Radiance HDR image support
-- ddagrab (Desktop Duplication) video capture filter
-- ffmpeg -shortest_buf_duration option
-- ffmpeg now requires threading to be built
-- ffmpeg now runs every muxer in a separate thread
-- Add new mode to cropdetect filter to detect crop-area based on motion vectors and edges
-- VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9
-- WBMP (Wireless Application Protocol Bitmap) image format
-- a3dscope filter
-- bonk decoder and demuxer
-- Micronas SC-4 audio decoder
-- LAF demuxer
-- APAC decoder and demuxer
-- Media 100i decoders
-- DTS to PTS reorder bsf
-- ViewQuest VQC decoder
-- backgroundkey filter
-- nvenc AV1 encoding support
-- MediaCodec decoder via NDKMediaCodec
-- MediaCodec encoder
-- oneVPL support for QSV
-- QSV AV1 encoder
-- QSV decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9
-- showcwt multimedia filter
-- corr video filter
-- adrc audio filter
-- afdelaysrc audio filter
-- WADY DPCM decoder and demuxer
-- CBD2 DPCM decoder
-- ssim360 video filter
-- ffmpeg CLI new options: -stats_enc_pre[_fmt], -stats_enc_post[_fmt],
-  -stats_mux_pre[_fmt]
-- hstack_vaapi, vstack_vaapi and xstack_vaapi filters
-- XMD ADPCM decoder and demuxer
-- media100 to mjpegb bsf
-- ffmpeg CLI new option: -fix_sub_duration_heartbeat
-- WavArc decoder and demuxer
-- CrystalHD decoders deprecated
-- SDNS demuxer
-- RKA decoder and demuxer
-- filtergraph syntax in ffmpeg CLI now supports passing file contents
-  as option values, by prefixing option name with '/'
-- hstack_qsv, vstack_qsv and xstack_qsv filters
-
-
 version 5.1:
-- add ipfs/ipns gateway support
+- add ipfs/ipns protocol support
 - dialogue enhance audio filter
 - dropped obsolete XvMC hwaccel
 - pcm-bluray encoder
@@ -254,7 +25,6 @@ version 5.1:
 - PHM image format support
 - remap_opencl filter
 - added chromakey_cuda filter
-- added bilateral_cuda filter
 
 
 version 5.0:

MAINTAINERS

@@ -11,11 +11,17 @@ A (CC <address>) after the name means that the maintainer prefers to be CC-ed on
 patches and related discussions.
 
 
+Project Leader
+==============
+
+  final design decisions
+
+
 Applications
 ============
 
 ffmpeg:
-  ffmpeg.c                              Michael Niedermayer, Anton Khirnov
+  ffmpeg.c                              Michael Niedermayer
 
 ffplay:
   ffplay.c                              Marton Balint
@@ -34,8 +40,7 @@ Miscellaneous Areas
 ===================
 
 documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
-project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
+project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
@@ -110,6 +115,8 @@ Generic Parts:
     lzw.*                               Michael Niedermayer
   floating point AAN DCT:
     faandct.c, faandct.h                Michael Niedermayer
+  Non-power-of-two MDCT:
+    mdct15.c, mdct15.h                  Rostislav Pehlivanov
   Golomb coding:
     golomb.c, golomb.h                  Michael Niedermayer
   motion estimation:
@@ -134,7 +141,6 @@ Codecs:
   adpcm.c                               Zane van Iperen
   alacenc.c                             Jaikrishnan Menon
   alsdec.c                              Thilo Borgmann, Umair Khan
-  amfenc*                               Dmitrii Ovchinnikov
   aptx.c                                Aurelien Jacobs
   ass*                                  Aurelien Jacobs
   asv*                                  Michael Niedermayer
@@ -144,12 +150,14 @@ 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
   ccaption_dec.c                        Anshul Maheshwari, Aman Gupta
   cljr                                  Alex Beregszaszi
   cpia.c                                Stephan Hilb
+  crystalhd.c                           Philip Langdale
   cscd.c                                Reimar Doeffinger
   cuviddec.c                            Timo Rothenpieler
   dca*                                  foo86
@@ -162,6 +170,7 @@ Codecs:
   dv.c                                  Roman Shaposhnik
   dvbsubdec.c                           Anshul Maheshwari
   eacmv*, eaidct*, eat*                 Peter Ross
+  evrc*                                 Paul B Mahol
   exif.c, exif.h                        Thilo Borgmann
   ffv1*                                 Michael Niedermayer
   ffwavesynth.c                         Nicolas George
@@ -179,7 +188,6 @@ Codecs:
   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
@@ -209,12 +217,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
@@ -228,6 +236,7 @@ Codecs:
   rpza.c                                Roberto Togni
   rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
   rv10.c                                Michael Niedermayer
+  s3tc*                                 Ivo van Poorten
   smc.c                                 Mike Melanson
   snow*                                 Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
@@ -235,13 +244,16 @@ Codecs:
   srt*                                  Aurelien Jacobs
   sunrast.c                             Ivo van Poorten
   svq3.c                                Michael Niedermayer
+  tak*                                  Paul B Mahol
   truemotion1*                          Mike Melanson
   tta.c                                 Alex Beregszaszi, Jaikrishnan Menon
+  ttaenc.c                              Paul B Mahol
   txd.c                                 Ivo van Poorten
   v4l2_*                                Jorge Ramirez-Ortiz
   vc2*                                  Rostislav Pehlivanov
   vcr1.c                                Michael Niedermayer
   videotoolboxenc.c                     Rick Kern, Aman Gupta
+  vima.c                                Paul B Mahol
   vorbisdec.c                           Denes Balatoni, David Conrad
   vorbisenc.c                           Oded Shimon
   vp3*                                  Mike Melanson
@@ -250,21 +262,23 @@ Codecs:
   vp8                                   David Conrad, Ronald Bultje
   vp9                                   Ronald Bultje
   vqavideo.c                            Mike Melanson
-  vvc                                   Nuo Mi
   wmaprodec.c                           Sascha Sommer
   wmavoice.c                            Ronald S. Bultje
   wmv2.c                                Michael Niedermayer
   xan.c                                 Mike Melanson
+  xbm*                                  Paul B Mahol
   xface                                 Stefano Sabatini
+  xwd*                                  Paul B Mahol
 
 Hardware acceleration:
+  crystalhd.c                           Philip Langdale
   dxva2*                                Hendrik Leppkes, Laurent Aimar, Steve Lhomme
   d3d11va*                              Steve Lhomme
-  mediacodec*                           Matthieu Bouron, Aman Gupta, Zhao Zhili
+  mediacodec*                           Matthieu Bouron, Aman Gupta
   vaapi*                                Haihao Xiang
   vaapi_encode*                         Mark Thompson, Haihao Xiang
   vdpau*                                Philip Langdale, Carl Eugen Hoyos
-  videotoolbox*                         Rick Kern, Aman Gupta, Zhao Zhili
+  videotoolbox*                         Rick Kern, Aman Gupta
 
 
 libavdevice
@@ -299,34 +313,64 @@ Generic parts:
   motion_estimation.c                   Davinder Singh
 
 Filters:
+  f_drawgraph.c                         Paul B Mahol
+  af_adelay.c                           Paul B Mahol
+  af_aecho.c                            Paul B Mahol
+  af_afade.c                            Paul B Mahol
   af_amerge.c                           Nicolas George
+  af_aphaser.c                          Paul B Mahol
   af_aresample.c                        Michael Niedermayer
+  af_astats.c                           Paul B Mahol
   af_atempo.c                           Pavel Koshevoy
+  af_biquads.c                          Paul B Mahol
+  af_chorus.c                           Paul B Mahol
+  af_compand.c                          Paul B Mahol
   af_firequalizer.c                     Muhammad Faiz
   af_hdcd.c                             Burt P.
+  af_ladspa.c                           Paul B Mahol
   af_loudnorm.c                         Kyle Swanson
   af_pan.c                              Nicolas George
+  af_sidechaincompress.c                Paul B Mahol
+  af_silenceremove.c                    Paul B Mahol
+  avf_aphasemeter.c                     Paul B Mahol
+  avf_avectorscope.c                    Paul B Mahol
   avf_showcqt.c                         Muhammad Faiz
+  vf_blend.c                            Paul B Mahol
   vf_bwdif                              Thomas Mundt (CC <thomas.mundt@hr.de>)
   vf_chromakey.c                        Timo Rothenpieler
+  vf_colorchannelmixer.c                Paul B Mahol
   vf_colorconstancy.c                   Mina Sami    (CC <minas.gorgy@gmail.com>)
+  vf_colorbalance.c                     Paul B Mahol
   vf_colorkey.c                         Timo Rothenpieler
+  vf_colorlevels.c                      Paul B Mahol
   vf_coreimage.m                        Thilo Borgmann
+  vf_deband.c                           Paul B Mahol
   vf_dejudder.c                         Nicholas Robbins
   vf_delogo.c                           Jean Delvare (CC <jdelvare@suse.com>)
   vf_drawbox.c/drawgrid                 Andrey Utkin
-  vf_fsync.c                            Thilo Borgmann
+  vf_extractplanes.c                    Paul B Mahol
+  vf_histogram.c                        Paul B Mahol
   vf_hqx.c                              Clément Bœsch
   vf_idet.c                             Pascal Massimino
+  vf_il.c                               Paul B Mahol
   vf_(t)interlace                       Thomas Mundt (CC <thomas.mundt@hr.de>)
   vf_lenscorrection.c                   Daniel Oberhoff
   vf_libplacebo.c                       Niklas Haas
+  vf_mergeplanes.c                      Paul B Mahol
   vf_mestimate.c                        Davinder Singh
   vf_minterpolate.c                     Davinder Singh
+  vf_neighbor.c                         Paul B Mahol
+  vf_psnr.c                             Paul B Mahol
+  vf_random.c                           Paul B Mahol
   vf_readvitc.c                         Tobias Rapp (CC t.rapp at noa-archive dot com)
   vf_scale.c                            Michael Niedermayer
+  vf_separatefields.c                   Paul B Mahol
+  vf_ssim.c                             Paul B Mahol
+  vf_stereo3d.c                         Paul B Mahol
+  vf_telecine.c                         Paul B Mahol
   vf_tonemap_opencl.c                   Ruiling Song
   vf_yadif.c                            Michael Niedermayer
+  vf_zoompan.c                          Paul B Mahol
 
 Sources:
   vsrc_mandelbrot.c                     Michael Niedermayer
@@ -348,6 +392,7 @@ Muxers/Demuxers:
   4xm.c                                 Mike Melanson
   aadec.c                               Vesselin Bontchev (vesselin.bontchev at yandex dot com)
   adtsenc.c                             Robert Swain
+  afc.c                                 Paul B Mahol
   aiffdec.c                             Baptiste Coudurier, Matthieu Bouron
   aiffenc.c                             Baptiste Coudurier, Matthieu Bouron
   alp.c                                 Zane van Iperen
@@ -358,12 +403,16 @@ Muxers/Demuxers:
   argo_brp.c                            Zane van Iperen
   argo_cvg.c                            Zane van Iperen
   ass*                                  Aurelien Jacobs
+  astdec.c                              Paul B Mahol
   astenc.c                              James Almer
   avi*                                  Michael Niedermayer
   avisynth.c                            Stephen Hutchinson
+  avr.c                                 Paul B Mahol
   bink.c                                Peter Ross
   boadec.c                              Michael Niedermayer
+  brstm.c                               Paul B Mahol
   caf*                                  Peter Ross
+  cdxl.c                                Paul B Mahol
   codec2.c                              Tomas Härdin
   crc.c                                 Michael Niedermayer
   dashdec.c                             Steven Liu
@@ -372,10 +421,10 @@ Muxers/Demuxers:
   dfpwmdec.c                            Jack Bruienne
   dss.c                                 Oleksij Rempel
   dtsdec.c                              foo86
+  dtshddec.c                            Paul B Mahol
   dv.c                                  Roman Shaposhnik
-  dvdvideodec.c                         Marth64
   electronicarts.c                      Peter Ross
-  evc*                                  Samsung (Dawid Kozinski)
+  epafdec.c                             Paul B Mahol
   ffm*                                  Baptiste Coudurier
   flic.c                                Mike Melanson
   flvdec.c                              Michael Niedermayer
@@ -386,22 +435,24 @@ Muxers/Demuxers:
   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                            Aurelien Jacobs, Andreas Rheinhardt
   matroskadec.c                         Aurelien Jacobs, Andreas Rheinhardt
   matroskaenc.c                         David Conrad, Andreas Rheinhardt
   matroska subtitles (matroskaenc.c)    John Peebles
   metadata*                             Aurelien Jacobs
+  mgsts.c                               Paul B Mahol
   microdvd*                             Aurelien Jacobs
   mm.c                                  Peter Ross
   mov.c                                 Baptiste Coudurier
@@ -414,6 +465,7 @@ Muxers/Demuxers:
   msnwc_tcp.c                           Ramiro Polla
   mtv.c                                 Reynaldo H. Verdejo Pinochet
   mxf*                                  Baptiste Coudurier, Tomas Härdin
+  nistspheredec.c                       Paul B Mahol
   nsvdec.c                              Francois Revol
   nut*                                  Michael Niedermayer
   nuv.c                                 Reimar Doeffinger
@@ -421,12 +473,13 @@ Muxers/Demuxers:
   oggenc.c                              Baptiste Coudurier
   oggparse*.c                           David Conrad
   oma.c                                 Maxim Poliakovski
+  paf.c                                 Paul B Mahol
   pp_bnk.c                              Zane van Iperen
   psxstr.c                              Mike Melanson
   pva.c                                 Ivo van Poorten
+  pvfdec.c                              Paul B Mahol
   r3d.c                                 Baptiste Coudurier
   raw.c                                 Michael Niedermayer
-  rcwtenc.c                             Marth64
   rdt.c                                 Ronald S. Bultje
   rl2.c                                 Sascha Sommer
   rmdec.c, rmenc.c                      Ronald S. Bultje
@@ -445,9 +498,11 @@ Muxers/Demuxers:
   sdp.c                                 Martin Storsjo
   segafilm.c                            Mike Melanson
   segment.c                             Stefano Sabatini
+  smjpeg*                               Paul B Mahol
   spdif*                                Anssi Hannula
   srtdec.c                              Aurelien Jacobs
   swf.c                                 Baptiste Coudurier
+  takdec.c                              Paul B Mahol
   tta.c                                 Alex Beregszaszi
   txd.c                                 Ivo van Poorten
   voc.c                                 Aurelien Jacobs
@@ -457,6 +512,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,10 +550,10 @@ LoongArch                               Shiyou Yin
 Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
 Linux / PowerPC                         Lauri Kasanen
-RISC-V                                  Rémi Denis-Courmont
 Windows MinGW                           Alex Beregszaszi, Ramiro Polla
 Windows Cygwin                          Victor Paesa
-Windows MSVC                            Hendrik Leppkes
+Windows MSVC                            Matthew Oliver, Hendrik Leppkes
+Windows ICL                             Matthew Oliver
 ADI/Blackfin DSP                        Marc Hoffman
 Sparc                                   Roman Shaposhnik
 OS/2                                    KO Myung-Hun
@@ -565,19 +621,16 @@ 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
-                              DD1E C9E8 DE08 5C62 9B3E 1846 B18E 8928 B394 8D64
 Nicolas George                24CE 01CE 9ACC 5CEB 74D8 8D9D B063 D997 36E5 4C93
 Niklas Haas (haasn)           1DDB 8076 B14D 5B48 32FC 99D9 EB52 DA9C 02BA 6FB4
 Nikolay Aleksandrov           8978 1D8C FB71 588E 4B27 EAA8 C4F0 B5FC E011 13B1
 Panagiotis Issaris            6571 13A3 33D9 3726 F728 AA98 F643 B12E ECF3 E029
 Peter Ross                    A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B
 Philip Langdale               5DC5 8D66 5FBA 3A43 18EC 045E F8D6 B194 6A75 682E
-Pierre-Anthony Lemieux (pal)  F4B3 9492 E6F2 E4AF AEC8 46CB 698F A1F0 F8D4 EED4
 Ramiro Polla                  7859 C65B 751B 1179 792E DAE8 8E95 8B2F 9B6C 5700
 Reimar Doeffinger             C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7
 Reinhard Tartler              9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4

Makefile

@@ -47,7 +47,7 @@ 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)
@@ -64,14 +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/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)
@@ -98,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              \
-               OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS
+               MMI-OBJS LSX-OBJS LASX-OBJS OBJS SLIBOBJS SHLIBOBJS       \
+               STLIBOBJS HOSTOBJS TESTOBJS
 
 define RESET
 $(1) :=
@@ -136,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 @@
-7.0.1
+5.1

RELEASE_NOTES

@@ -1,10 +1,13 @@
 
-            ┌─────────────────────────────────────────┐
-            │ RELEASE NOTES for FFmpeg 7.0 "Dijkstra" │
-            └─────────────────────────────────────────┘
+            ┌────────────────────────────────────────────┐
+            │ RELEASE NOTES for FFmpeg 5.1 "Riemann" LTS │
+            └────────────────────────────────────────────┘
 
-   The FFmpeg Project proudly presents FFmpeg 7.0 "Dijkstra", about 6
-   months after the release of FFmpeg 6.1.
+   The FFmpeg Project proudly presents FFmpeg 5.1 "Riemann" LTS, about 6
+   months after the release of FFmpeg 5.0, our first Long Term Support
+   release. While several past FFmpeg releases have enjoyed long term
+   support, this is the first release where such an intention is made
+   clear at release.
 
    A complete Changelog is available at the root of the project, and the
    complete Git history on https://git.ffmpeg.org/gitweb/ffmpeg.git

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

@@ -187,6 +187,5 @@ static inline __device__ float __saturatef(float a) { return __nvvm_saturate_f(a
 static inline __device__ float __sinf(float a) { return __nvvm_sin_approx_f(a); }
 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); }
 
 #endif /* COMPAT_CUDA_CUDA_RUNTIME_H */

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>
@@ -65,14 +66,7 @@ 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;
     h->ret = h->func(h->arg);

compat/windows/mswindres

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "--version" ]; then
-    rc.exe -?
-    exit $?
-fi
-
-if [ $# -lt 2 ]; then
-    echo "Usage: mswindres [-I/include/path ...] [-DSOME_DEFINE ...] [-o output.o] input.rc [output.o]" >&2
-    exit 0
-fi
-
-EXTRA_OPTS="-nologo"
-
-while [ $# -gt 2 ]; do
-    case $1 in
-    -D*) EXTRA_OPTS="$EXTRA_OPTS -d$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;;
-    -I*) EXTRA_OPTS="$EXTRA_OPTS -i$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;;
-    -o)  OPT_OUT="$2"; shift ;;
-    esac
-    shift
-done
-
-IN="$1"
-if [ -z "$OPT_OUT" ]; then
-    OUT="$2"
-else
-    OUT="$OPT_OUT"
-fi
-
-eval set -- $EXTRA_OPTS
-rc.exe "$@" -fo "$OUT" "$IN"

doc/APIchanges

@@ -1,441 +1,19 @@
-The last version increases of all libraries were on 2024-03-07
+Never assume the API of libav* to be stable unless at least 1 month has passed
+since the last major version increase or the API was added.
+
+The last version increases were:
+libavcodec:    2021-04-27
+libavdevice:   2021-04-27
+libavfilter:   2021-04-27
+libavformat:   2021-04-27
+libpostproc:   2021-04-27
+libswresample: 2021-04-27
+libswscale:    2021-04-27
+libavutil:     2021-04-27
+
 
 API changes, most recent first:
 
--------- 8< --------- FFmpeg 7.0 was cut here -------- 8< ---------
-
-2024-03-25 - 5df901ffa56 - lavu 59.7.100 - timestamp.h
-  Add av_ts_make_time_string2() for better timestamp precision, the new
-  function accepts AVRational as time base instead of *AVRational, and is not
-  an inline function like its predecessor.
-
-2024-03-23 - a9023377b22 - lavu 59.6.100 - film_grain_params.h
-  Add av_film_grain_params_select().
-
-2024-03-23 - 35d2960dcd0 - lavu 59.5.100 - film_grain_params.h
-  Add AVFilmGrainParams.color_range, color_primaries, color_trc, color_space,
-  width, height, subsampling_x, subsampling_y, bit_depth_luma and
-  bit_depth_chroma. Deprecate the corresponding fields from
-  AVFilmGrainH274Params.
-
-2024-03-23 - f17e18d2922 - lavc 61.3.100 - jni.h
-  Add av_jni_set_android_app_ctx() and av_jni_get_android_app_ctx().
-
-2024-03-22 - 26398da8f30 - lavu 59.4.100 - frame.h
-  Constified the first-level pointee of av_frame_side_data_get()
-  and renamed it to av_frame_side_data_get_c(). From now on,
-  av_frame_side_data_get() is a wrapper around av_frame_side_data_get_c()
-  that accepts AVFrameSideData * const *sd.
-
-2024-03-20 - 0d36844ddf9 - lavc 61.2.100 - avcodec.h
-  Add AVCodecContext.[nb_]decoded_side_data.
-
-2024-03-20 - d9ade14c5c5 - lavu 59.3.100 - frame.h
-  Add av_frame_side_data_free(), av_frame_side_data_new(),
-  av_frame_side_data_clone(), av_frame_side_data_get() as well
-  as AV_FRAME_SIDE_DATA_FLAG_UNIQUE.
-
-2024-03-16 - ed6207274e6 - lavu 59.2.100 - channel_layout.h
-  Add AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL.
-
-2024-03-08 - 68a8eca7523 - lavc 61.1.100 - avcodec.h
-  Add AVCodecContext.[nb_]side_data_prefer_packet.
-
-2024-03-08 - efe44787781 - lavu 59.1.100 - opt.h
-  Add AV_OPT_TYPE_FLAG_ARRAY and AVOptionArrayDef.
-
-2024-03-08 - c9f5cea9cca - lavc 61.0.100 - vdpau.h
-  Deprecate av_vdpau_alloc_context(), av_alloc_vdpaucontext(),
-  av_vdpau_hwaccel_get_render2() and av_vdpau_hwaccel_set_render2().
-  The former are superseded by av_vdpau_bind_context(), the latter
-  are unneeded as the relevant field is public and can be accessed directly.
-
-2024-03-06 - 49707b05900 - lavf 60.25.100 - avformat.h
-  Deprecate av_fmt_ctx_get_duration_estimation_method().
-  The relevant field is public and needs no getter to access.
-
-2024-03-05 - ab15c04dee5 - lavf 60.24.100 - avformat.h
-  Add avformat_stream_group_name().
-
-2024-02-28 - b295aafb082 - swr   4.14.100 - swresample.h
-  swr_convert() now accepts arrays of const pointers (to input and output).
-
-2024-02-28 - 58e3ef7f546 - lavu 58.40.100 - timestamp.h
-  av_ts_make_time_string() now accepts a pointer to const AVRational.
-
-2024-02-28 - dfb9d8a5a2f - lavf 60.23.100 - avio.h
-  avio_print_string_array() now accepts an array of const pointers.
-
-2024-02-26 - 41e349c24a7 - lavf 60.22.101 - avformat.h
-  AV_DISPOSITION_DEPENDENT may now also be used for video streams
-  intended to be merged with other video streams for presentation.
-
-2024-02-26 - 25a10677d12 - lavf 60.22.100 - avformat.h
-  Add AVStreamGroupTileGrid
-  Add AV_STREAM_GROUP_PARAMS_TILE_GRID
-  Add AVStreamGroup.params.tile_grid
-
-2024-02-21 - 1d66a122df9 - lavc 60.40.100 - avcodec.h
-  Deprecate AV_INPUT_BUFFER_MIN_SIZE without replacement.
-
-2024-02-16 - eea9bd88a5f - lavu 58.39.100 - pixfmt.h
-  Add AV_VIDEO_MAX_PLANES
-
-2024-02-13 - ec2036454bc - lavf 60.21.100 - avformat.h
-  Add AVStreamGroup.disposition.
-
-2024-02-12 - 66386bf2a2a - lavu 58.38.100 - channel_layout.h
-  Add av_channel_layout_retype().
-
-2024-02-12 - 4569b861322 - lavu 58.37.100 - channel_layout.h
-  Add av_channel_layout_custom_init().
-
-2024-02-04 - 45697e6a512 - lavc 60.39.100 - packet.h
-  Add AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT.
-
-2023-11-xx - xxxxxxxxxx - lavfi 9.16.100 - buffersink.h buffersrc.h
-  Add av_buffersink_get_colorspace and av_buffersink_get_color_range.
-  Add AVBufferSrcParameters.color_space and AVBufferSrcParameters.color_range.
-
-2023-11-xx - xxxxxxxxxx - lavfi 9.15.100 - avfilter.h
-  Add AVFilterLink.colorspace, AVFilterLink.color_range
-
-2023-12-21 - 142f727b9ca - lavu 58.36.100 - pixfmt.h hwcontext.h hwcontext_d3d12va.h
-  Add AV_HWDEVICE_TYPE_D3D12VA and AV_PIX_FMT_D3D12.
-  Add AVD3D12VADeviceContext, AVD3D12VASyncContext, AVD3D12VAFrame and
-  AVD3D12VAFramesContext.
-
-2023-12-18 - 74279227dd2 - lavc 60.36.100 - packet.h
-  Add AV_PKT_DATA_IAMF_MIX_GAIN_PARAM, AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM
-  and AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM.
-
-2023-12-18 - 556b596d1d9 - lavc 60.19.100 - avformat.h
-  Add AVStreamGroup struct.
-  Add AVFormatContext.stream_groups and AVFormatContext.nb_stream_groups
-  Add avformat_stream_group_create(), avformat_stream_group_add_stream(),
-  and av_stream_group_get_class().
-  Add enum AVStreamGroupParamsType with values AV_STREAM_GROUP_PARAMS_NONE,
-  AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT and
-  AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION.
-
-2023-12-18 - d2af93bbefc - lavu 58.35.100 - iamf.h
-  Add a new API to support Immersive Audio Model and Formats.
-
-2023-12-13 - 5475f665f60 - lavu 58.33.100 - imgutils.h
-  Add av_image_fill_color().
-
-2023-11-08 - b82957a66a7 - lavu 58.32.100 - channel_layout.h
-  Add AV_CH_LAYOUT_7POINT2POINT3 and AV_CHANNEL_LAYOUT_7POINT2POINT3.
-  Add AV_CH_LAYOUT_9POINT1POINT4_BACK and AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK.
-
-2023-10-31 - 57c16323f26 - lavu 58.31.100 - pixdesc.h
-  Add AV_PIX_FMT_FLAG_XYZ.
-
--------- 8< --------- FFmpeg 6.1 was cut here -------- 8< ---------
-
-2023-10-27 - 52a97642604 - lavu 58.28.100 - channel_layout.h
-  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
-  Depreate 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
-  Depreate 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
-  Deprecate AVFormatContext io_close callback.
-  The superior io_close2 callback should be used instead.
-
-2023-02-13 - 2296078397 - lavu 58.1.100 - frame.h
-  Deprecate AVFrame.coded_picture_number and display_picture_number.
-  Their usefulness is questionable and very few decoders set them.
-
-2023-02-13 - 6b6f7db819 - lavc 60.2.100 - avcodec.h
-  Add AVCodecContext.frame_num as a 64bit version of frame_number.
-  Deprecate AVCodecContext.frame_number.
-
-2023-02-12 - d1b9a3ddb4 - lavfi 9.1.100 - avfilter.h
-  Add filtergraph segment parsing API.
-  New structs:
-    - AVFilterGraphSegment
-    - AVFilterChain
-    - AVFilterParams
-    - AVFilterPadParams
-  New functions:
-    - avfilter_graph_segment_parse()
-    - avfilter_graph_segment_create_filters()
-    - avfilter_graph_segment_apply_opts()
-    - avfilter_graph_segment_init()
-    - avfilter_graph_segment_link()
-    - avfilter_graph_segment_apply()
-
-2023-02-09 - 719a93f4e4 - lavu 58.0.100 - csp.h
-  Add av_csp_approximate_trc_gamma() and av_csp_trc_func_from_id().
-  Add av_csp_trc_function.
-
-2023-02-09 - 868a31b42d - lavc 60.0.100 - avcodec.h
-  avcodec_decode_subtitle2() now accepts const AVPacket*.
-
-2023-02-04 - d02340b9e3 - lavc 59.63.100
-  Allow AV_CODEC_FLAG_COPY_OPAQUE to be used with decoders.
-
-2023-01-29 - a1a80f2e64 - lavc 59.59.100 - avcodec.h
-  Add AV_CODEC_FLAG_COPY_OPAQUE and AV_CODEC_FLAG_FRAME_DURATION.
-
-2023-01-13 - 002d0ec740 - lavu 57.44.100 - ambient_viewing_environment.h frame.h
-  Adds a new structure for holding H.274 Ambient Viewing Environment metadata,
-  AVAmbientViewingEnvironment.
-  Adds a new AVFrameSideDataType entry AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT
-  for it.
-
-2022-12-10 - 7a8d78f7e3 - lavc 59.55.100 - avcodec.h
-  Add AV_HWACCEL_FLAG_UNSAFE_OUTPUT.
-
-2022-11-24 - e97368eba5 - lavu 57.43.100 - tx.h
-  Add AV_TX_FLOAT_DCT, AV_TX_DOUBLE_DCT and AV_TX_INT32_DCT.
-
-2022-11-06 - 9dad237928 - lavu 57.42.100 - dict.h
-  Add av_dict_iterate().
-
-2022-11-03 - 6228ba141d - lavu 57.41.100 - channel_layout.h
-  Add AV_CH_LAYOUT_7POINT1_TOP_BACK and AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK.
-
-2022-10-30 - 83e918de71 - lavu 57.40.100 - channel_layout.h
-  Add AV_CH_LAYOUT_CUBE and AV_CHANNEL_LAYOUT_CUBE.
-
-2022-10-11 - 479747645f - lavu 57.39.101 - pixfmt.h
-  Add AV_PIX_FMT_RGBF32 and AV_PIX_FMT_RGBAF32.
-
-2022-10-05 - 37d5ddc317 - lavu 57.39.100 - cpu.h
-  Add AV_CPU_FLAG_RVB_BASIC.
-
-2022-10-03 - d09776d486 - lavf 59.34.100 - avio.h
-  Make AVIODirContext an opaque type in a future major version bump.
-
-2022-09-27 - 0c0a3deb18 - lavu 57.38.100 - cpu.h
-  Add CPU flags for RISC-V vector extensions:
-  AV_CPU_FLAG_RVV_I32, AV_CPU_FLAG_RVV_F32, AV_CPU_FLAG_RVV_I64,
-  AV_CPU_FLAG_RVV_F64
-
-2022-09-26 - a02a0e8db4 - lavc 59.48.100 - avcodec.h
-  Deprecate avcodec_enum_to_chroma_pos() and avcodec_chroma_pos_to_enum().
-  Use av_chroma_location_enum_to_pos() or av_chroma_location_pos_to_enum()
-  instead.
-
-2022-09-26 - xxxxxxxxxx - lavu 57.37.100 - pixdesc.h pixfmt.h
-  Add av_chroma_location_enum_to_pos() and av_chroma_location_pos_to_enum().
-  Add AV_PIX_FMT_RGBF32BE, AV_PIX_FMT_RGBF32LE, AV_PIX_FMT_RGBAF32BE,
-  AV_PIX_FMT_RGBAF32LE.
-
-2022-09-26 - cf856d8957 - lavc 59.47.100 - avcodec.h defs.h
-  Move the AV_EF_* and FF_COMPLIANCE_* defines from avcodec.h to defs.h.
-
-2022-09-03 - d75c4693fe - lavu 57.36.100 - pixfmt.h
-  Add AV_PIX_FMT_P012, AV_PIX_FMT_Y212, AV_PIX_FMT_XV30, AV_PIX_FMT_XV36
-
-2022-09-03 - dea9744560 - lavu 57.35.100 - file.h
-  Deprecate av_tempfile() without replacement.
-
-2022-08-03 - cc5a5c9860 - lavu 57.34.100 - pixfmt.h
-  Add AV_PIX_FMT_VUYX.
-
-2022-08-22 - 14726571dd - lavf 59 - avformat.h
-  Deprecate av_stream_get_end_pts() without replacement.
-
-2022-08-19 - 352799dca8 - lavc 59.42.102 - codec_id.h
-  Deprecate AV_CODEC_ID_AYUV and ayuv decoder/encoder. The rawvideo codec
-  and vuya pixel format combination will be used instead from now on.
-
-2022-08-07 - e95b08a7dd - lavu 57.33.101 - pixfmt.h
-  Add AV_PIX_FMT_RGBAF16{BE,LE} pixel formats.
-
-2022-08-12 - e0bbdbe0a6 - lavu 57.33.100 - hwcontext_qsv.h
-  Add loader field to AVQSVDeviceContext
-
-2022-08-03 - 6ab8a9d375 - lavu 57.32.100 - pixfmt.h
-  Add AV_PIX_FMT_VUYA.
-
-2022-08-02 - e3838b856f - lavc 59.41.100 - avcodec.h codec.h
-  Add AV_CODEC_FLAG_RECON_FRAME and AV_CODEC_CAP_ENCODER_RECON_FRAME.
-  avcodec_receive_frame() may now be used on encoders when
-  AV_CODEC_FLAG_RECON_FRAME is active.
-
-2022-08-02 - eede1d2927 - lavu 57.31.100 - frame.h
-  av_frame_make_writable() may now be called on non-refcounted
-  frames and will make a refcounted copy out of them.
-  Previously an error was returned in such cases.
-
-2022-07-30 - e1a0f2df3d - lavc 59.40.100 - avcodec.h
-  Add the AV_CODEC_FLAG2_ICC_PROFILES flag to AVCodecContext, to enable
-  automatic reading and writing of embedded ICC profiles in image files.
-  The "flags2" option now supports the corresponding flag "icc_profiles".
-
-2022-07-19 - 4397f9a5a0 - lavu 57.30.100 - frame.h
-  Add AVFrame.duration, deprecate AVFrame.pkt_duration.
-
 -------- 8< --------- FFmpeg 5.1 was cut here -------- 8< ---------
 
 2022-06-12 - 7cae3d8b76 - lavf 59.25.100 - avio.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         = 7.0.1
+PROJECT_NUMBER         = 5.1
 
 # 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
@@ -1980,7 +1980,6 @@ PREDEFINED             = __attribute__(x)= \
                          av_alloc_size(...)= \
                          AV_GCC_VERSION_AT_LEAST(x,y)=1 \
                          AV_GCC_VERSION_AT_MOST(x,y)=0 \
-                         "FF_PAD_STRUCTURE(name,size,...)=typedef struct name { __VA_ARGS__ } name;" \
                          __GNUC__
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

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                                             \

doc/authors.texi

@@ -3,9 +3,9 @@
 The FFmpeg developers.
 
 For details about the authorship, see the Git history of the project
-(https://git.ffmpeg.org/ffmpeg), e.g. by typing the command
+(git://source.ffmpeg.org/ffmpeg), e.g. by typing the command
 @command{git log} in the FFmpeg source directory, or browsing the
-online repository at @url{https://git.ffmpeg.org/ffmpeg}.
+online repository at @url{http://source.ffmpeg.org}.
 
 Maintainers for the specific components are listed in the file
 @file{MAINTAINERS} in the source code tree.

doc/bitstream_filters.texi

@@ -199,13 +199,6 @@ Identical to @option{pass_types}, except the units in the given set
 removed and all others passed through.
 @end table
 
-The types used by pass_types and remove_types correspond to NAL unit types
-(nal_unit_type) in H.264, HEVC and H.266 (see Table 7-1 in the H.264
-and HEVC specifications or Table 5 in the H.266 specification), to
-marker values for JPEG (without 0xFF prefix) and to start codes without
-start code prefix (i.e. the byte following the 0x000001) for MPEG-2.
-For VP8 and VP9, every unit has type zero.
-
 Extradata is unchanged by this transformation, but note that if the stream
 contains inline parameter sets then the output may be unusable if they are
 removed.
@@ -220,21 +213,6 @@ To remove all AUDs, SEI and filler from an H.265 stream:
 ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=35|38-40' OUTPUT
 @end example
 
-To remove all user data from a MPEG-2 stream, including Closed Captions:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=178' OUTPUT
-@end example
-
-To remove all SEI from a H264 stream, including Closed Captions:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=6' OUTPUT
-@end example
-
-To remove all prefix and suffix SEI from a HEVC stream, including Closed Captions and dynamic HDR:
-@example
-ffmpeg -i INPUT -c:v copy -bsf:v 'filter_units=remove_types=39|40' OUTPUT
-@end example
-
 @section hapqa_extract
 
 Extract Rgb or Alpha part of an HAPQA file, without recompression, in order to create an HAPQ or an HAPAlphaOnly file.
@@ -404,6 +382,9 @@ This applies a specific fixup to some Blu-ray streams which contain
 redundant PPSs modifying irrelevant parameters of the stream which
 confuse other transformations which require correct extradata.
 
+A new single global PPS is created, and all of the redundant PPSs
+within the stream are removed.
+
 @section hevc_metadata
 
 Modify metadata embedded in an HEVC stream.
@@ -550,6 +531,10 @@ metadata header from each subtitle packet.
 
 See also the @ref{text2movsub} filter.
 
+@section mp3decomp
+
+Decompress non-standard compressed MP3 audio headers.
+
 @section mpeg2_metadata
 
 Modify metadata embedded in an MPEG-2 stream.
@@ -900,15 +885,6 @@ The sample rate of stream packet belongs.
 The AV_NOPTS_VALUE constant.
 @end table
 
-For example, to set PTS equal to DTS (not recommended if B-frames are involved):
-@example
-ffmpeg -i INPUT -c:a copy -bsf:a setts=pts=DTS out.mkv
-@end example
-
-@section showinfo
-Log basic packet information. Mainly useful for testing, debugging,
-and development.
-
 @anchor{text2movsub}
 @section text2movsub
 

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,
@@ -644,8 +644,6 @@ for codecs that support it. See also @file{doc/examples/export_mvs.c}.
 Do not skip samples and export skip information as frame side data.
 @item ass_ro_flush_noop
 Do not reset ASS ReadOrder field on flush.
-@item icc_profiles
-Generate/parse embedded ICC profiles from/to colorimetry tags.
 @end table
 
 @item export_side_data @var{flags} (@emph{decoding/encoding,audio,video,subtitles})
@@ -697,13 +695,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})
@@ -767,11 +762,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:
@@ -886,11 +888,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,177 +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.
-
-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.
-@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.
-
-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

@@ -77,17 +77,13 @@ The following options are supported by the libdav1d wrapper.
 @item framethreads
 Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
 This option is deprecated for libdav1d >= 1.0 and will be removed in the future. Use the
-option @code{max_frame_delay} and the global option @code{threads} instead.
+global option @code{threads} instead.
 
 @item tilethreads
 Set amount of tile threads to use during decoding. The default value is 0 (autodetect).
 This option is deprecated for libdav1d >= 1.0 and will be removed in the future. Use the
 global option @code{threads} instead.
 
-@item max_frame_delay
-Set max amount of frames the decoder may buffer internally. The default value is 0
-(autodetect).
-
 @item filmgrain
 Apply film grain to the decoded video if present in the bitstream. Defaults to the
 internal default of the library.
@@ -130,30 +126,6 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto
 
 @end table
 
-@section libxevd
-
-eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper.
-
-This decoder requires the presence of the libxevd headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-libxevd}.
-
-The xevd project website is at @url{https://github.com/mpeg5/xevd}.
-
-@subsection Options
-
-The following options are supported by the libxevd wrapper.
-The xevd-equivalent options or values are listed in parentheses for easy migration.
-
-To get a more accurate and extensive documentation of the libxevd options,
-invoke the command  @code{xevd_app --help} or consult the libxevd documentation.
-
-@table @option
-@item threads (@emph{threads})
-Force to use a specific number of threads
-
-@end table
-
 @section QSV Decoders
 
 The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC,
@@ -377,169 +349,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 Japanse 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 internaly 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 charactor 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

doc/demuxers.texi

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

@@ -10,109 +10,41 @@
 
 @contents
 
-@chapter Introduction
+@chapter Notes for external developers
 
-This text is concerned with the development @emph{of} FFmpeg itself. Information
-on using the FFmpeg libraries in other programs can be found elsewhere, e.g. in:
-@itemize @bullet
-@item
-the installed header files
-@item
-@url{http://ffmpeg.org/doxygen/trunk/index.html, the Doxygen documentation}
-generated from the headers
-@item
-the examples under @file{doc/examples}
-@end itemize
+This document is mostly useful for internal FFmpeg developers.
+External developers who need to use the API in their application should
+refer to the API doxygen documentation in the public headers, and
+check the examples in @file{doc/examples} and in the source code to
+see how the public API is employed.
+
+You can use the FFmpeg libraries in your commercial program, but you
+are encouraged to @emph{publish any patch you make}. In this case the
+best way to proceed is to send your patches to the ffmpeg-devel
+mailing list following the guidelines illustrated in the remainder of
+this document.
 
 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:
+@chapter Contributing
+
+There are 2 ways by which code gets into FFmpeg:
 @itemize @bullet
-@item
-Maintaining external changes to keep up with upstream development is
-time-consuming and error-prone. With your code in the main tree, it will be
-maintained by FFmpeg developers.
-@item
-FFmpeg developers include leading experts in the field who can find bugs or
-design flaws in your code.
-@item
-By supporting the project you find useful you ensure it continues to be
-maintained and developed.
+@item Submitting patches to the ffmpeg-devel mailing list.
+      See @ref{Submitting patches} for details.
+@item Directly committing changes to the main tree.
 @end itemize
 
-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
-should comply with the @ref{Development Policy} and follow the @ref{Coding Rules}.
+Whichever way, changes should be reviewed by the maintainer of the code
+before they are committed. And they should follow the @ref{Coding Rules}.
 The developer making the commit and the author are responsible for their changes
 and should try to fix issues their commit causes.
 
 @anchor{Coding Rules}
 @chapter Coding Rules
 
-@section Language
-
-FFmpeg is mainly programmed in the ISO C11 language, except for the public
-headers which must stay C99 compatible.
-
-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
-the extension.
-
-The following C99 features must not be used anywhere in the codebase:
-@itemize @bullet
-@item
-variable-length arrays;
-
-@item
-complex numbers;
-
-@item
-mixed statements and declarations.
-@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.
-@end itemize
-
 @section Code formatting conventions
 
 There are the following guidelines regarding the indentation in files:
@@ -135,39 +67,8 @@ K&R coding style is used.
 @end itemize
 The presentation is one inspired by 'indent -i4 -kr -nut'.
 
-@subsection Vim configuration
-In order to configure Vim to follow FFmpeg formatting conventions, paste
-the following snippet into your @file{.vimrc}:
-@example
-" indentation rules for FFmpeg: 4 spaces, no tabs
-set expandtab
-set shiftwidth=4
-set softtabstop=4
-set cindent
-set cinoptions=(0
-" Allow tabs in Makefiles.
-autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8
-" Trailing whitespace and tabs are forbidden, so highlight them.
-highlight ForbiddenWhitespace ctermbg=red guibg=red
-match ForbiddenWhitespace /\s\+$\|\t/
-" Do not highlight spaces at the end of line while typing on that line.
-autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@@<!$/
-@end example
-
-@subsection Emacs configuration
-For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
-@lisp
-(c-add-style "ffmpeg"
-             '("k&r"
-               (c-basic-offset . 4)
-               (indent-tabs-mode . nil)
-               (show-trailing-whitespace . t)
-               (c-offsets-alist
-                (statement-cont . (c-lineup-assignments +)))
-               )
-             )
-(setq c-default-style "ffmpeg")
-@end lisp
+The main priority in FFmpeg is simplicity and small code size in order to
+minimize the bug count.
 
 @section Comments
 Use the JavaDoc/Doxygen  format (see examples below) so that code documentation
@@ -209,52 +110,92 @@ int myfunc(int my_parameter)
 ...
 @end example
 
-@anchor{Naming conventions}
-@section Naming conventions
+@section C language features
 
-Names of functions, variables, and struct members must be lowercase, using
-underscores (_) to separate words. For example, @samp{avfilter_get_video_buffer}
-is an acceptable function name and @samp{AVFilterGetVideo} is not.
+FFmpeg is programmed in the ISO C90 language with a few additional
+features from ISO C99, namely:
 
-Struct, union, enum, and typedeffed type names must use CamelCase. All structs
-and unions should be typedeffed to the same name as the struct/union tag, e.g.
-@code{typedef struct AVFoo @{ ... @} AVFoo;}. Enums are typically not
-typedeffed.
-
-Enumeration constants and macros must be UPPERCASE, except for macros
-masquerading as functions, which should use the function naming convention.
-
-All identifiers in the libraries should be namespaced as follows:
 @itemize @bullet
 @item
-No namespacing for identifiers with file and lower scope (e.g. local variables,
-static functions), and struct and union members,
+the @samp{inline} keyword;
 
 @item
-The @code{ff_} prefix must be used for variables and functions visible outside
-of file scope, but only used internally within a single library, e.g.
-@samp{ff_w64_demuxer}. This prevents name collisions when FFmpeg is statically
-linked.
+@samp{//} comments;
+
+@item
+designated struct initializers (@samp{struct s x = @{ .i = 17 @};});
+
+@item
+compound literals (@samp{x = (struct s) @{ 17, 23 @};}).
+
+@item
+for loops with variable definition (@samp{for (int i = 0; i < 8; i++)});
+
+@item
+Variadic macros (@samp{#define ARRAY(nb, ...) (int[nb + 1])@{ nb, __VA_ARGS__ @}});
+
+@item
+Implementation defined behavior for signed integers is assumed to match the
+expected behavior for two's complement. Non representable values in integer
+casts are binary truncated. Shift right of signed values uses sign extension.
+@end itemize
+
+These features are supported by all compilers we care about, so we will not
+accept patches to remove their use unless they absolutely do not impair
+clarity and performance.
+
+All code must compile with recent versions of GCC and a number of other
+currently supported compilers. To ensure compatibility, please do not use
+additional C99 features or GCC extensions. Especially watch out for:
+
+@itemize @bullet
+@item
+mixing statements and declarations;
+
+@item
+@samp{long long} (use @samp{int64_t} instead);
+
+@item
+@samp{__attribute__} not protected by @samp{#ifdef __GNUC__} or similar;
+
+@item
+GCC statement expressions (@samp{(x = (@{ int y = 4; y; @})}).
+@end itemize
+
+@section Naming conventions
+All names should be composed with underscores (_), not CamelCase. For example,
+@samp{avfilter_get_video_buffer} is an acceptable function name and
+@samp{AVFilterGetVideo} is not. The exception from this are type names, like
+for example structs and enums; they should always be in CamelCase.
+
+There are the following conventions for naming variables and functions:
+
+@itemize @bullet
+@item
+For local variables no prefix is required.
+
+@item
+For file-scope variables and functions declared as @code{static}, no prefix
+is required.
+
+@item
+For variables and functions visible outside of file scope, but only used
+internally by a library, an @code{ff_} prefix should be used,
+e.g. @samp{ff_w64_demuxer}.
 
 @item
 For variables and functions visible outside of file scope, used internally
 across multiple libraries, use @code{avpriv_} as prefix, for example,
 @samp{avpriv_report_missing_feature}.
 
-@item
-All other internal identifiers, like private type or macro names, should be
-namespaced only to avoid possible internal conflicts. E.g. @code{H264_NAL_SPS}
-vs. @code{HEVC_NAL_SPS}.
-
 @item
 Each library has its own prefix for public symbols, in addition to the
 commonly used @code{av_} (@code{avformat_} for libavformat,
 @code{avcodec_} for libavcodec, @code{swr_} for libswresample, etc).
 Check the existing code and choose names accordingly.
-
-@item
-Other public identifiers (struct, union, enum, macro, type names) must use their
-library's public prefix (@code{AV}, @code{Sws}, or @code{Swr}).
+Note that some symbols without these prefixes are also exported for
+retro-compatibility reasons. These exceptions are declared in the
+@code{lib<name>/lib<name>.v} files.
 @end itemize
 
 Furthermore, name space reserved for the system should not be invaded.
@@ -268,50 +209,50 @@ 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.
 @end itemize
 
-@anchor{Development Policy}
+@section Editor configuration
+In order to configure Vim to follow FFmpeg formatting conventions, paste
+the following snippet into your @file{.vimrc}:
+@example
+" indentation rules for FFmpeg: 4 spaces, no tabs
+set expandtab
+set shiftwidth=4
+set softtabstop=4
+set cindent
+set cinoptions=(0
+" Allow tabs in Makefiles.
+autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8
+" Trailing whitespace and tabs are forbidden, so highlight them.
+highlight ForbiddenWhitespace ctermbg=red guibg=red
+match ForbiddenWhitespace /\s\+$\|\t/
+" Do not highlight spaces at the end of line while typing on that line.
+autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@@<!$/
+@end example
+
+For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
+@lisp
+(c-add-style "ffmpeg"
+             '("k&r"
+               (c-basic-offset . 4)
+               (indent-tabs-mode . nil)
+               (show-trailing-whitespace . t)
+               (c-offsets-alist
+                (statement-cont . (c-lineup-assignments +)))
+               )
+             )
+(setq c-default-style "ffmpeg")
+@end lisp
+
 @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
@@ -334,24 +275,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
@@ -370,6 +300,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
@@ -384,15 +323,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.
@@ -402,6 +353,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
@@ -411,150 +378,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 outweight 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} preprocesor 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.
@@ -598,6 +425,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
 
@@ -814,14 +670,16 @@ 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 theres a reason.
+Consider adding a regression test for your code.
 
 @item
 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
 of leaks, out of array accesses, etc.
@@ -871,8 +729,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

doc/encoders.texi

@@ -615,7 +615,7 @@ and slightly improves compression.
 
 Opus encoder.
 
-This is a native FFmpeg encoder for the Opus format. Currently, it's in development and
+This is a native FFmpeg encoder for the Opus format. Currently its in development and
 only implements the CELT part of the codec. Its quality is usually worse and at best
 is equal to the libopus encoder.
 
@@ -789,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
@@ -864,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
@@ -977,17 +965,14 @@ 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
@@ -1964,6 +1949,22 @@ Set the number of slices, used in parallelized encoding. Default value
 is 0. This is only used when @option{slice_mode} is set to
 @samp{fixed}.
 
+@item slice_mode
+Set slice mode. Can assume one of the following possible values:
+
+@table @samp
+@item fixed
+a fixed number of slices
+@item rowmb
+one slice per row of macroblocks
+@item auto
+automatic number of slices according to number of threads
+@item dyn
+dynamic slicing
+@end table
+
+Default value is @samp{auto}.
+
 @item loopfilter
 Enable loop filter, if set to 1 (automatically enabled). To disable
 set a value of 0.
@@ -2175,8 +2176,6 @@ Set altref noise reduction filter type: backward, forward, centered.
 Set altref noise reduction filter strength.
 @item rc-lookahead, lag-in-frames (@emph{lag-in-frames})
 Set number of frames to look ahead for frametype and ratecontrol.
-@item min-gf-interval
-Set minimum golden/alternate reference frame interval (VP9 only).
 @end table
 
 @item error-resilient
@@ -2237,12 +2236,6 @@ the two temporal layer 2 frames within the temporal period.
 @end table
 @end table
 
-@item VP8-specific options
-@table @option
-@item screen-content-mode
-Screen content mode, one of: 0 (off), 1 (screen), 2 (screen with more aggressive rate control).
-@end table
-
 @item VP9-specific options
 @table @option
 @item lossless
@@ -2427,10 +2420,6 @@ To get a more accurate and extensive documentation of the libx264
 options, invoke the command @command{x264 --fullhelp} or consult
 the libx264 documentation.
 
-In the list below, note that the @command{x264} option name is shown
-in parentheses after the libavcodec corresponding name, in case there
-is a direct mapping.
-
 @table @option
 @item b (@emph{bitrate})
 Set bitrate in bits/s. Note that FFmpeg's @option{b} option is
@@ -2438,19 +2427,17 @@ expressed in bits/s, while @command{x264}'s @option{bitrate} is in
 kilobits/s.
 
 @item bf (@emph{bframes})
-Number of B-frames between I and P-frames
 
 @item g (@emph{keyint})
-Maximum GOP size
 
 @item qmin (@emph{qpmin})
-Minimum quantizer scale
+Minimum quantizer scale.
 
 @item qmax (@emph{qpmax})
-Maximum quantizer scale
+Maximum quantizer scale.
 
 @item qdiff (@emph{qpstep})
-Maximum difference between quantizer scales
+Maximum difference between quantizer scales.
 
 @item qblur (@emph{qblur})
 Quantizer curve blur
@@ -2459,21 +2446,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.
@@ -2481,8 +2454,7 @@ Sets the threshold for the scene change detection.
 @item trellis (@emph{trellis})
 Performs Trellis quantization to increase efficiency. Enabled by default.
 
-@item nr (@emph{nr})
-Noise reduction
+@item nr  (@emph{nr})
 
 @item me_range (@emph{merange})
 Maximum range of the motion search in pixels.
@@ -2563,7 +2535,6 @@ open GOP by setting it to @code{-cgop}. The result is similar to
 the behavior of @command{x264}'s @option{--open-gop} option.
 
 @item rc_init_occupancy (@emph{vbv-init})
-Initial VBV buffer occupancy
 
 @item preset (@emph{preset})
 Set the encoding preset.
@@ -2609,7 +2580,7 @@ Set AQ strength, reduce blocking and blurring in flat and textured areas.
 Use psychovisual optimizations when set to 1. When set to 0, it has the
 same effect as @command{x264}'s @option{--no-psy} option.
 
-@item psy-rd (@emph{psy-rd})
+@item psy-rd  (@emph{psy-rd})
 Set strength of psychovisual optimization, in
 @var{psy-rd}:@var{psy-trellis} format.
 
@@ -2641,7 +2612,7 @@ to 1.
 
 @item avcintra-class (@emph{class})
 Configure the encoder to generate AVC-Intra.
-Valid values are 50, 100 and 200
+Valid values are 50,100 and 200
 
 @item bluray-compat (@emph{bluray-compat})
 Configure the encoder to be compatible with the bluray standard.
@@ -2692,8 +2663,8 @@ Set loop filter parameters, in @var{alpha}:@var{beta} form.
 Set fluctuations reduction in QP (before curve compression).
 
 @item partitions (@emph{partitions})
-Set partitions to consider as a comma-separated list of values.
-Possible values in the list:
+Set partitions to consider as a comma-separated list of. Possible
+values in the list:
 
 @table @samp
 @item p8x8
@@ -2749,32 +2720,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).
@@ -2782,9 +2740,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
@@ -2924,75 +2892,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.
@@ -3045,6 +2944,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.
 
@@ -3056,28 +2958,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
@@ -3113,9 +3016,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:
 
@@ -3163,20 +3063,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.
@@ -3316,8 +3202,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:
@@ -3340,8 +3226,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.
@@ -3358,13 +3244,10 @@ the average bitrate.
 than the average bitrate.
 
 @item
-@var{AVBR} - average VBR mode, when @option{maxrate} is not specified, both
-@option{avbr_accuracy} and @option{avbr_convergence} are set to non-zero. This
-mode is available for H264 and HEVC on Windows.
+@var{AVBR} - average VBR mode, when @option{maxrate} is not specified. This mode
+is further configured by the @option{avbr_accuracy} and
+@option{avbr_convergence} options.
 @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
@@ -3417,6 +3300,19 @@ Specifies how many asynchronous operations an application performs
 before the application explicitly synchronizes the result. If zero,
 the value is not specified.
 
+@item @var{avbr_accuracy}
+Accuracy of the AVBR ratecontrol (unit of tenth of percent).
+
+@item @var{avbr_convergence}
+Convergence of the AVBR ratecontrol (unit of 100 frames)
+
+The parameters @var{avbr_accuracy} and @var{avbr_convergence} are for the
+average variable bitrate control (AVBR) algorithm.
+The algorithm focuses on overall encoding quality while meeting the specified
+bitrate, @var{target_bitrate}, within the accuracy range @var{avbr_accuracy},
+after a @var{avbr_Convergence} period. This method does not follow HRD and the
+instant bitrate is not capped or padded.
+
 @item @var{preset}
 This option itemizes a range of choices from veryfast (best speed) to veryslow
 (best quality).
@@ -3441,55 +3337,10 @@ For encoders set this flag to ON to reduce power consumption and GPU usage.
 Following options can be used durning qsv encoding.
 
 @table @option
-@item @var{global_quality}
-@item @var{i_quant_factor}
-@item @var{i_quant_offset}
-@item @var{b_quant_factor}
-@item @var{b_quant_offset}
+@item @var{qsv_config_qp}
 Supported in h264_qsv and hevc_qsv.
-Change these value to reset qsv codec's qp configuration.
-
-@item @var{max_frame_size}
-Supported in h264_qsv and hevc_qsv.
-Change this value to reset qsv codec's MaxFrameSize configuration.
-
-@item @var{gop_size}
-Change this value to reset qsv codec's gop configuration.
-
-@item @var{int_ref_type}
-@item @var{int_ref_cycle_size}
-@item @var{int_ref_qp_delta}
-@item @var{int_ref_cycle_dist}
-Supported in h264_qsv and hevc_qsv.
-Change these value to reset qsv codec's Intra Refresh configuration.
-
-@item @var{qmax}
-@item @var{qmin}
-@item @var{max_qp_i}
-@item @var{min_qp_i}
-@item @var{max_qp_p}
-@item @var{min_qp_p}
-@item @var{max_qp_b}
-@item @var{min_qp_b}
-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.
-Change this value to reset qsv codec's low_delay_brc configuration.
-
-@item @var{framerate}
-Change this value to reset qsv codec's framerate configuration.
-
-@item @var{bit_rate}
-@item @var{rc_buffer_size}
-@item @var{rc_initial_buffer_occupancy}
-@item @var{rc_max_rate}
-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.
+This option can be set in per-frame metadata. QP parameter can be dynamically
+changed when encoding in CQP mode.
 @end table
 
 @subsection H264 options
@@ -3593,10 +3444,8 @@ Specifies intra refresh type. The major goal of intra refresh is improvement of
 error resilience without significant impact on encoded bitstream size caused by
 I frames. The SDK encoder achieves this by encoding part of each frame in
 refresh cycle using intra MBs. @var{none} means no refresh. @var{vertical} means
-vertical refresh, by column of MBs. @var{horizontal} means horizontal refresh,
-by rows of MBs. @var{slice} means horizontal refresh by slices without
-overlapping. In case of @var{slice}, in_ref_cycle_size is ignored. To enable
-intra refresh, B frame should be set to 0.
+vertical refresh, by column of MBs. To enable intra refresh, B frame should be
+set to 0.
 
 @item @var{int_ref_cycle_size}
 Specifies number of pictures within refresh cycle starting from 2. 0 and 1 are
@@ -3651,52 +3500,6 @@ Maximum video quantizer scale for B frame.
 
 @item @var{min_qp_b}
 Minimum video quantizer scale for B frame.
-
-@item @var{scenario}
-Provides a hint to encoder about the scenario for the encoding session.
-@table @samp
-@item unknown
-@item displayremoting
-@item videoconference
-@item archive
-@item livestreaming
-@item cameracapture
-@item videosurveillance
-@item gamestreaming
-@item remotegaming
-@end table
-
-@item @var{avbr_accuracy}
-Accuracy of the AVBR ratecontrol (unit of tenth of percent).
-
-@item @var{avbr_convergence}
-Convergence of the AVBR ratecontrol (unit of 100 frames)
-
-The parameters @var{avbr_accuracy} and @var{avbr_convergence} are for the
-average variable bitrate control (AVBR) algorithm.
-The algorithm focuses on overall encoding quality while meeting the specified
-bitrate, @var{target_bitrate}, within the accuracy range @var{avbr_accuracy},
-after a @var{avbr_Convergence} period. This method does not follow HRD and the
-instant bitrate is not capped or padded.
-
-@item @var{skip_frame}
-Use per-frame metadata "qsv_skip_frame" to skip frame when encoding. This option
-defines the usage of this metadata.
-@table @samp
-@item no_skip
-Frame skipping is disabled.
-@item insert_dummy
-Encoder inserts into bitstream frame where all macroblocks are encoded as
-skipped.
-@item insert_nothing
-Similar to insert_dummy, but encoder inserts nothing into bitstream. The skipped
-frames are still used in brc. For example, gop still include skipped frames, and
-the frames after skipped frames will be larger in size.
-@item brc_only
-skip_frame metadata indicates the number of missed frames before the current
-frame.
-@end table
-
 @end table
 
 @subsection HEVC Options
@@ -3737,13 +3540,6 @@ Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provi
 more accurate bitrate control to minimize the variance of bitstream size frame
 by frame. Value: -1-default 0-off 1-on
 
-@item @var{adaptive_i}
-This flag controls insertion of I frames by the QSV encoder. Turn ON this flag
-to allow changing of frame type from P and B to I.
-
-@item @var{adaptive_b}
-This flag controls changing of frame type from B to P.
-
 @item @var{p_strategy}
 Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0).
 
@@ -3787,15 +3583,6 @@ Set the encoding profile (scc requires libmfx >= 1.32).
 @item scc
 @end table
 
-@item @var{tier}
-Set the encoding tier (only level >= 4 can support high tier).
-This option only takes effect when the level option is specified.
-
-@table @samp
-@item main
-@item high
-@end table
-
 @item @var{gpb}
 1: GPB (generalized P/B frame)
 
@@ -3822,10 +3609,8 @@ Specifies intra refresh type. The major goal of intra refresh is improvement of
 error resilience without significant impact on encoded bitstream size caused by
 I frames. The SDK encoder achieves this by encoding part of each frame in
 refresh cycle using intra MBs. @var{none} means no refresh. @var{vertical} means
-vertical refresh, by column of MBs. @var{horizontal} means horizontal refresh,
-by rows of MBs. @var{slice} means horizontal refresh by slices without
-overlapping. In case of @var{slice}, in_ref_cycle_size is ignored. To enable
-intra refresh, B frame should be set to 0.
+vertical refresh, by column of MBs. To enable intra refresh, B frame should be
+set to 0.
 
 @item @var{int_ref_cycle_size}
 Specifies number of pictures within refresh cycle starting from 2. 0 and 1 are
@@ -3856,52 +3641,6 @@ Maximum video quantizer scale for B frame.
 
 @item @var{min_qp_b}
 Minimum video quantizer scale for B frame.
-
-@item @var{scenario}
-Provides a hint to encoder about the scenario for the encoding session.
-@table @samp
-@item unknown
-@item displayremoting
-@item videoconference
-@item archive
-@item livestreaming
-@item cameracapture
-@item videosurveillance
-@item gamestreaming
-@item remotegaming
-@end table
-
-@item @var{avbr_accuracy}
-Accuracy of the AVBR ratecontrol (unit of tenth of percent).
-
-@item @var{avbr_convergence}
-Convergence of the AVBR ratecontrol (unit of 100 frames)
-
-The parameters @var{avbr_accuracy} and @var{avbr_convergence} are for the
-average variable bitrate control (AVBR) algorithm.
-The algorithm focuses on overall encoding quality while meeting the specified
-bitrate, @var{target_bitrate}, within the accuracy range @var{avbr_accuracy},
-after a @var{avbr_Convergence} period. This method does not follow HRD and the
-instant bitrate is not capped or padded.
-
-@item @var{skip_frame}
-Use per-frame metadata "qsv_skip_frame" to skip frame when encoding. This option
-defines the usage of this metadata.
-@table @samp
-@item no_skip
-Frame skipping is disabled.
-@item insert_dummy
-Encoder inserts into bitstream frame where all macroblocks are encoded as
-skipped.
-@item insert_nothing
-Similar to insert_dummy, but encoder inserts nothing into bitstream. The skipped
-frames are still used in brc. For example, gop still include skipped frames, and
-the frames after skipped frames will be larger in size.
-@item brc_only
-skip_frame metadata indicates the number of missed frames before the current
-frame.
-@end table
-
 @end table
 
 @subsection MPEG2 Options
@@ -3935,48 +3674,6 @@ Number of columns for tiled encoding (requires libmfx >= 1.29).
 Number of rows for tiled encoding (requires libmfx  >= 1.29).
 @end table
 
-@subsection AV1 Options
-These options are used by av1_qsv (requires libvpl).
-@table @option
-@item @var{profile}
-@table @samp
-@item unknown
-@item main
-@end table
-
-@item @var{tile_cols}
-Number of columns for tiled encoding.
-
-@item @var{tile_rows}
-Number of rows for tiled encoding.
-
-@item @var{adaptive_i}
-This flag controls insertion of I frames by the QSV encoder. Turn ON this flag
-to allow changing of frame type from P and B to I.
-
-@item @var{adaptive_b}
-This flag controls changing of frame type from B to P.
-
-@item @var{b_strategy}
-This option controls usage of B frames as reference.
-
-@item @var{extbrc}
-Extended bitrate control.
-
-@item @var{look_ahead_depth}
-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 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 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.
-@end table
-
 @section snow
 
 @subsection Options
@@ -4091,29 +3788,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}.

doc/examples/.gitignore

@@ -22,4 +22,3 @@
 /transcoding
 /vaapi_encode
 /vaapi_transcode
-/qsv_transcode

doc/examples/Makefile

@@ -1,27 +1,26 @@
-EXAMPLES-$(CONFIG_AVIO_HTTP_SERVE_FILES)     += avio_http_serve_files
 EXAMPLES-$(CONFIG_AVIO_LIST_DIR_EXAMPLE)     += avio_list_dir
-EXAMPLES-$(CONFIG_AVIO_READ_CALLBACK_EXAMPLE) += avio_read_callback
+EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE)      += avio_reading
 EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE)      += decode_audio
-EXAMPLES-$(CONFIG_DECODE_FILTER_AUDIO_EXAMPLE) += decode_filter_audio
-EXAMPLES-$(CONFIG_DECODE_FILTER_VIDEO_EXAMPLE) += decode_filter_video
 EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE)      += decode_video
-EXAMPLES-$(CONFIG_DEMUX_DECODE_EXAMPLE)      += demux_decode
+EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
 EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE)      += encode_audio
 EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE)      += encode_video
 EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE)       += extract_mvs
 EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE)      += filter_audio
+EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE)   += filtering_audio
+EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE)   += filtering_video
+EXAMPLES-$(CONFIG_HTTP_MULTICLIENT_EXAMPLE)  += http_multiclient
 EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE)         += hw_decode
-EXAMPLES-$(CONFIG_MUX_EXAMPLE)               += mux
-EXAMPLES-$(CONFIG_QSV_DECODE_EXAMPLE)        += qsv_decode
-EXAMPLES-$(CONFIG_REMUX_EXAMPLE)             += remux
-EXAMPLES-$(CONFIG_RESAMPLE_AUDIO_EXAMPLE)    += resample_audio
-EXAMPLES-$(CONFIG_SCALE_VIDEO_EXAMPLE)       += scale_video
-EXAMPLES-$(CONFIG_SHOW_METADATA_EXAMPLE)     += show_metadata
+EXAMPLES-$(CONFIG_METADATA_EXAMPLE)          += metadata
+EXAMPLES-$(CONFIG_MUXING_EXAMPLE)            += muxing
+EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE)            += qsvdec
+EXAMPLES-$(CONFIG_REMUXING_EXAMPLE)          += remuxing
+EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE)  += resampling_audio
+EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE)     += scaling_video
 EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)     += transcode_aac
-EXAMPLES-$(CONFIG_TRANSCODE_EXAMPLE)         += transcode
+EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE)       += transcoding
 EXAMPLES-$(CONFIG_VAAPI_ENCODE_EXAMPLE)      += vaapi_encode
 EXAMPLES-$(CONFIG_VAAPI_TRANSCODE_EXAMPLE)   += vaapi_transcode
-EXAMPLES-$(CONFIG_QSV_TRANSCODE_EXAMPLE)     += qsv_transcode
 
 EXAMPLES       := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF))
 EXAMPLES_G     := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))

doc/examples/Makefile.example

@@ -11,40 +11,33 @@ CFLAGS += -Wall -g
 CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
 LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
 
-# missing the following targets, since they need special options in the FFmpeg build:
-# qsv_decode
-# qsv_transcode
-# vaapi_encode
-# vaapi_transcode
-
-EXAMPLES=\
-                avio_http_serve_files              \
-                avio_list_dir                      \
-                avio_read_callback                 \
+EXAMPLES=       avio_list_dir                      \
+                avio_reading                       \
                 decode_audio                       \
-                decode_filter_audio                \
-                decode_filter_video                \
                 decode_video                       \
-                demux_decode                       \
+                demuxing_decoding                  \
                 encode_audio                       \
                 encode_video                       \
                 extract_mvs                        \
+                filtering_video                    \
+                filtering_audio                    \
+                http_multiclient                   \
                 hw_decode                          \
-                mux                                \
-                remux                              \
-                resample_audio                     \
-                scale_video                        \
-                show_metadata                      \
+                metadata                           \
+                muxing                             \
+                remuxing                           \
+                resampling_audio                   \
+                scaling_video                      \
                 transcode_aac                      \
-                transcode
+                transcoding                        \
 
 OBJS=$(addsuffix .o,$(EXAMPLES))
 
 # the following examples make explicit use of the math library
 avcodec:           LDLIBS += -lm
 encode_audio:      LDLIBS += -lm
-mux:               LDLIBS += -lm
-resample_audio:    LDLIBS += -lm
+muxing:            LDLIBS += -lm
+resampling_audio:  LDLIBS += -lm
 
 .phony: all clean-test clean
 

doc/examples/README

@@ -7,10 +7,8 @@ that you have them installed and working on your system.
 
 Method 1: build the installed examples in a generic read/write user directory
 
-Copy to a read/write user directory and run:
-make -f Makefile.example
-
-It will link to the libraries on your system, assuming the PKG_CONFIG_PATH is
+Copy to a read/write user directory and just use "make", it will link
+to the libraries on your system, assuming the PKG_CONFIG_PATH is
 correctly configured.
 
 Method 2: build the examples in-tree
@@ -22,4 +20,4 @@ examples using "make examplesclean"
 
 If you want to try the dedicated Makefile examples (to emulate the first
 method), go into doc/examples and run a command such as
-PKG_CONFIG_PATH=pc-uninstalled make -f Makefile.example
+PKG_CONFIG_PATH=pc-uninstalled make.

doc/examples/avio_list_dir.c

@@ -20,13 +20,6 @@
  * THE SOFTWARE.
  */
 
-/**
- * @file libavformat AVIOContext list directory API usage example
- * @example avio_list_dir.c
- *
- * Show how to list directories through the libavformat AVIOContext API.
- */
-
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>

doc/examples/avio_reading.c

@@ -21,11 +21,12 @@
  */
 
 /**
- * @file libavformat AVIOContext read callback API usage example
- * @example avio_read_callback.c
+ * @file
+ * libavformat AVIOContext API example.
  *
  * Make libavformat demuxer access media content through a custom
  * AVIOContext read callback.
+ * @example avio_reading.c
  */
 
 #include <libavcodec/avcodec.h>

doc/examples/decode_audio.c

@@ -21,11 +21,10 @@
  */
 
 /**
- * @file libavcodec audio decoding API usage example
- * @example decode_audio.c
+ * @file
+ * audio decoding with libavcodec API example
  *
- * Decode data from an MP2 input file and generate a raw audio file to
- * be played with ffplay.
+ * @example decode_audio.c
  */
 
 #include <stdio.h>

doc/examples/decode_video.c

@@ -21,11 +21,10 @@
  */
 
 /**
- * @file libavcodec video decoding API usage example
- * @example decode_video.c *
+ * @file
+ * video decoding with libavcodec API example
  *
- * Read from an MPEG1 video file, decode frames, and generate PGM images as
- * output.
+ * @example decode_video.c
  */
 
 #include <stdio.h>
@@ -70,12 +69,12 @@ static void decode(AVCodecContext *dec_ctx, AVFrame *frame, AVPacket *pkt,
             exit(1);
         }
 
-        printf("saving frame %3"PRId64"\n", dec_ctx->frame_num);
+        printf("saving frame %3d\n", dec_ctx->frame_number);
         fflush(stdout);
 
         /* the picture is allocated by the decoder. no need to
            free it */
-        snprintf(buf, sizeof(buf), "%s-%"PRId64, filename, dec_ctx->frame_num);
+        snprintf(buf, sizeof(buf), "%s-%d", filename, dec_ctx->frame_number);
         pgm_save(frame->data[0], frame->linesize[0],
                  frame->width, frame->height, buf);
     }

doc/examples/demuxing_decoding.c

@@ -21,12 +21,12 @@
  */
 
 /**
- * @file libavformat and libavcodec demuxing and decoding API usage example
- * @example demux_decode.c
+ * @file
+ * Demuxing and decoding example.
  *
- * Show how to use the libavformat and libavcodec API to demux and decode audio
- * and video data. Write the output as raw audio and input files to be played by
- * ffplay.
+ * Show how to use the libavformat and libavcodec API to demux and
+ * decode audio and video data.
+ * @example demuxing_decoding.c
  */
 
 #include <libavutil/imgutils.h>
@@ -73,14 +73,14 @@ static int output_video_frame(AVFrame *frame)
         return -1;
     }
 
-    printf("video_frame n:%d\n",
-           video_frame_count++);
+    printf("video_frame n:%d coded_n:%d\n",
+           video_frame_count++, frame->coded_picture_number);
 
     /* 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/encode_audio.c

@@ -21,10 +21,10 @@
  */
 
 /**
- * @file libavcodec encoding audio API usage examples
- * @example encode_audio.c
+ * @file
+ * audio encoding with libavcodec API example.
  *
- * Generate a synthetic audio signal and encode it to an output MP2 file.
+ * @example encode_audio.c
  */
 
 #include <stdint.h>

doc/examples/encode_video.c

@@ -21,10 +21,10 @@
  */
 
 /**
- * @file libavcodec encoding video API usage example
- * @example encode_video.c
+ * @file
+ * video encoding with libavcodec API example
  *
- * Generate synthetic video data and encode it to an output file.
+ * @example encode_video.c
  */
 
 #include <stdio.h>
@@ -202,7 +202,7 @@ int main(int argc, char **argv)
        It makes only sense because this tiny examples writes packets
        directly. This is called "elementary stream" and only works for some
        codecs. To create a valid file, you usually need to write packets
-       into a proper file format or protocol; see mux.c.
+       into a proper file format or protocol; see muxing.c.
      */
     if (codec->id == AV_CODEC_ID_MPEG1VIDEO || codec->id == AV_CODEC_ID_MPEG2VIDEO)
         fwrite(endcode, 1, sizeof(endcode), f);

doc/examples/extract_mvs.c

@@ -21,14 +21,6 @@
  * THE SOFTWARE.
  */
 
-/**
- * @file libavcodec motion vectors extraction API usage example
- * @example extract_mvs.c
- *
- * Read from input file, decode video stream and print a motion vectors
- * representation to stdout.
- */
-
 #include <libavutil/motion_vector.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -69,11 +61,10 @@ static int decode_packet(const AVPacket *pkt)
                 const AVMotionVector *mvs = (const AVMotionVector *)sd->data;
                 for (i = 0; i < sd->size / sizeof(*mvs); i++) {
                     const AVMotionVector *mv = &mvs[i];
-                    printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64",%4d,%4d,%4d\n",
+                    printf("%d,%2d,%2d,%2d,%4d,%4d,%4d,%4d,0x%"PRIx64"\n",
                         video_frame_count, mv->source,
                         mv->w, mv->h, mv->src_x, mv->src_y,
-                        mv->dst_x, mv->dst_y, mv->flags,
-                        mv->motion_x, mv->motion_y, mv->motion_scale);
+                        mv->dst_x, mv->dst_y, mv->flags);
                 }
             }
             av_frame_unref(frame);
@@ -175,7 +166,7 @@ int main(int argc, char **argv)
         goto end;
     }
 
-    printf("framenum,source,blockw,blockh,srcx,srcy,dstx,dsty,flags,motion_x,motion_y,motion_scale\n");
+    printf("framenum,source,blockw,blockh,srcx,srcy,dstx,dsty,flags\n");
 
     /* read frames from the file */
     while (av_read_frame(fmt_ctx, pkt) >= 0) {

doc/examples/filter_audio.c

@@ -19,11 +19,13 @@
  */
 
 /**
- * @file libavfilter audio filtering API usage example
- * @example filter_audio.c
+ * @file
+ * libavfilter API usage example.
  *
- * This example will generate a sine wave audio, pass it through a simple filter
- * chain, and then compute the MD5 checksum of the output data.
+ * @example filter_audio.c
+ * This example will generate a sine wave audio,
+ * pass it through a simple filter chain, and then compute the MD5 checksum of
+ * the output data.
  *
  * The filter chain it uses is:
  * (input) -> abuffer -> volume -> aformat -> abuffersink -> (output)

doc/examples/filtering_audio.c

@@ -23,11 +23,9 @@
  */
 
 /**
- * @file audio decoding and filtering usage example
- * @example decode_filter_audio.c
- *
- * Demux, decode and filter audio input file, generate a raw audio
- * file to be played with ffplay.
+ * @file
+ * API example for audio decoding and filtering
+ * @example filtering_audio.c
  */
 
 #include <unistd.h>

doc/examples/filtering_video.c

@@ -24,7 +24,7 @@
 /**
  * @file
  * API example for decoding and filtering
- * @example decode_filter_video.c
+ * @example filtering_video.c
  */
 
 #define _XOPEN_SOURCE 600 /* for usleep */

doc/examples/http_multiclient.c

@@ -21,11 +21,12 @@
  */
 
 /**
- * @file libavformat multi-client network API usage example
- * @example avio_http_serve_files.c
+ * @file
+ * libavformat multi-client network API usage example.
  *
- * Serve a file without decoding or demuxing it over the HTTP protocol. Multiple
- * clients can connect and will receive the same file.
+ * @example http_multiclient.c
+ * This example will serve a file without decoding or demuxing it over http.
+ * Multiple clients can connect and will receive the same file.
  */
 
 #include <libavformat/avformat.h>

doc/examples/hw_decode.c

@@ -24,11 +24,12 @@
  */
 
 /**
- * @file HW-accelerated decoding API usage.example
- * @example hw_decode.c
+ * @file
+ * HW-Accelerated decoding example.
  *
- * Perform HW-accelerated decoding with output frames from HW video
- * surfaces.
+ * @example hw_decode.c
+ * This example shows how to do HW-accelerated decoding with output
+ * frames from the HW video surfaces.
  */
 
 #include <stdio.h>

doc/examples/metadata.c

@@ -21,10 +21,9 @@
  */
 
 /**
- * @file libavformat metadata extraction API usage example
- * @example show_metadata.c
- *
- * Show metadata from an input file.
+ * @file
+ * Shows how the metadata API can be used in application programs.
+ * @example metadata.c
  */
 
 #include <stdio.h>
@@ -53,7 +52,7 @@ int main (int argc, char **argv)
         return ret;
     }
 
-    while ((tag = av_dict_iterate(fmt_ctx->metadata, tag)))
+    while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
         printf("%s=%s\n", tag->key, tag->value);
 
     avformat_close_input(&fmt_ctx);

doc/examples/muxing.c

@@ -21,11 +21,12 @@
  */
 
 /**
- * @file libavformat muxing API usage example
- * @example mux.c
+ * @file
+ * libavformat API example.
  *
- * Generate a synthetic audio and video signal and mux them to a media file in
- * any supported libavformat format. The default codecs are used.
+ * Output a media file in any supported libavformat format. The default
+ * codecs are used.
+ * @example muxing.c
  */
 
 #include <stdlib.h>
@@ -218,6 +219,8 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
                                   int sample_rate, int nb_samples)
 {
     AVFrame *frame = av_frame_alloc();
+    int ret;
+
     if (!frame) {
         fprintf(stderr, "Error allocating an audio frame\n");
         exit(1);
@@ -229,7 +232,8 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
     frame->nb_samples = nb_samples;
 
     if (nb_samples) {
-        if (av_frame_get_buffer(frame, 0) < 0) {
+        ret = av_frame_get_buffer(frame, 0);
+        if (ret < 0) {
             fprintf(stderr, "Error allocating an audio buffer\n");
             exit(1);
         }
@@ -379,27 +383,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,
@@ -420,7 +424,7 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec,
     }
 
     /* allocate and init a re-usable frame */
-    ost->frame = alloc_frame(c->pix_fmt, c->width, c->height);
+    ost->frame = alloc_picture(c->pix_fmt, c->width, c->height);
     if (!ost->frame) {
         fprintf(stderr, "Could not allocate video frame\n");
         exit(1);
@@ -431,9 +435,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_transcode.c

@@ -1,435 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * @file Intel QSV-accelerated video transcoding API usage example
- * @example qsv_transcode.c
- *
- * Perform QSV-accelerated transcoding and show to dynamically change
- * encoder's options.
- *
- * Usage: qsv_transcode input_stream codec output_stream initial option
- *                      { frame_number new_option }
- * e.g: - qsv_transcode input.mp4 h264_qsv output_h264.mp4 "g 60"
- *      - qsv_transcode input.mp4 hevc_qsv output_hevc.mp4 "g 60 async_depth 1"
- *                      100 "g 120"
- *         (initialize codec with gop_size 60 and change it to 120 after 100
- *          frames)
- */
-
-#include <stdio.h>
-#include <errno.h>
-
-#include <libavutil/hwcontext.h>
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/opt.h>
-
-static AVFormatContext *ifmt_ctx = NULL, *ofmt_ctx = NULL;
-static AVBufferRef *hw_device_ctx = NULL;
-static AVCodecContext *decoder_ctx = NULL, *encoder_ctx = NULL;
-static int video_stream = -1;
-
-typedef struct DynamicSetting {
-    int frame_number;
-    char* optstr;
-} DynamicSetting;
-static DynamicSetting *dynamic_setting;
-static int setting_number;
-static int current_setting_number;
-
-static int str_to_dict(char* optstr, AVDictionary **opt)
-{
-    char *key, *value;
-    if (strlen(optstr) == 0)
-        return 0;
-    key = strtok(optstr, " ");
-    if (key == NULL)
-        return AVERROR(EINVAL);
-    value = strtok(NULL, " ");
-    if (value == NULL)
-        return AVERROR(EINVAL);
-    av_dict_set(opt, key, value, 0);
-    do {
-        key = strtok(NULL, " ");
-        if (key == NULL)
-            return 0;
-        value = strtok(NULL, " ");
-        if (value == NULL)
-            return AVERROR(EINVAL);
-        av_dict_set(opt, key, value, 0);
-    } while(1);
-}
-
-static int dynamic_set_parameter(AVCodecContext *avctx)
-{
-    AVDictionary *opts = NULL;
-    int ret = 0;
-    static int frame_number = 0;
-    frame_number++;
-    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);
-        if (ret < 0) {
-            fprintf(stderr, "The dynamic parameter is wrong\n");
-            goto fail;
-        }
-        /* Set common option. The dictionary will be freed and replaced
-         * by a new one containing all options not found in common option list.
-         * Then this new dictionary is used to set private option. */
-        if ((ret = av_opt_set_dict(avctx, &opts)) < 0)
-            goto fail;
-        /* Set codec specific option */
-        if ((ret = av_opt_set_dict(avctx->priv_data, &opts)) < 0)
-            goto fail;
-        /* 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);
-        if (e) {
-            avctx->framerate = av_d2q(atof(e->value), INT_MAX);
-            encoder_ctx->time_base = av_inv_q(encoder_ctx->framerate);
-        }
-    }
-fail:
-    av_dict_free(&opts);
-    return ret;
-}
-
-static int get_format(AVCodecContext *avctx, const enum AVPixelFormat *pix_fmts)
-{
-    while (*pix_fmts != AV_PIX_FMT_NONE) {
-        if (*pix_fmts == AV_PIX_FMT_QSV) {
-            return AV_PIX_FMT_QSV;
-        }
-
-        pix_fmts++;
-    }
-
-    fprintf(stderr, "The QSV pixel format not offered in get_format()\n");
-
-    return AV_PIX_FMT_NONE;
-}
-
-static int open_input_file(char *filename)
-{
-    int ret;
-    const AVCodec *decoder = NULL;
-    AVStream *video = NULL;
-
-    if ((ret = avformat_open_input(&ifmt_ctx, filename, NULL, NULL)) < 0) {
-        fprintf(stderr, "Cannot open input file '%s', Error code: %s\n",
-                filename, av_err2str(ret));
-        return ret;
-    }
-
-    if ((ret = avformat_find_stream_info(ifmt_ctx, NULL)) < 0) {
-        fprintf(stderr, "Cannot find input stream information. Error code: %s\n",
-                av_err2str(ret));
-        return ret;
-    }
-
-    ret = av_find_best_stream(ifmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Cannot find a video stream in the input file. "
-                "Error code: %s\n", av_err2str(ret));
-        return ret;
-    }
-    video_stream = ret;
-    video = ifmt_ctx->streams[video_stream];
-
-    switch(video->codecpar->codec_id) {
-    case AV_CODEC_ID_H264:
-        decoder = avcodec_find_decoder_by_name("h264_qsv");
-        break;
-    case AV_CODEC_ID_HEVC:
-        decoder = avcodec_find_decoder_by_name("hevc_qsv");
-        break;
-    case AV_CODEC_ID_VP9:
-        decoder = avcodec_find_decoder_by_name("vp9_qsv");
-        break;
-    case AV_CODEC_ID_VP8:
-        decoder = avcodec_find_decoder_by_name("vp8_qsv");
-        break;
-    case AV_CODEC_ID_AV1:
-        decoder = avcodec_find_decoder_by_name("av1_qsv");
-        break;
-    case AV_CODEC_ID_MPEG2VIDEO:
-        decoder = avcodec_find_decoder_by_name("mpeg2_qsv");
-        break;
-    case AV_CODEC_ID_MJPEG:
-        decoder = avcodec_find_decoder_by_name("mjpeg_qsv");
-        break;
-    default:
-        fprintf(stderr, "Codec is not supportted by qsv\n");
-        return AVERROR(EINVAL);
-    }
-
-    if (!(decoder_ctx = avcodec_alloc_context3(decoder)))
-        return AVERROR(ENOMEM);
-
-    if ((ret = avcodec_parameters_to_context(decoder_ctx, video->codecpar)) < 0) {
-        fprintf(stderr, "avcodec_parameters_to_context error. Error code: %s\n",
-                av_err2str(ret));
-        return ret;
-    }
-    decoder_ctx->framerate = av_guess_frame_rate(ifmt_ctx, video, NULL);
-
-    decoder_ctx->hw_device_ctx = av_buffer_ref(hw_device_ctx);
-    if (!decoder_ctx->hw_device_ctx) {
-        fprintf(stderr, "A hardware device reference create failed.\n");
-        return AVERROR(ENOMEM);
-    }
-    decoder_ctx->get_format    = get_format;
-    decoder_ctx->pkt_timebase = video->time_base;
-    if ((ret = avcodec_open2(decoder_ctx, decoder, NULL)) < 0)
-        fprintf(stderr, "Failed to open codec for decoding. Error code: %s\n",
-                av_err2str(ret));
-
-    return ret;
-}
-
-static int encode_write(AVPacket *enc_pkt, AVFrame *frame)
-{
-    int ret = 0;
-
-    av_packet_unref(enc_pkt);
-
-    if((ret = dynamic_set_parameter(encoder_ctx)) < 0) {
-        fprintf(stderr, "Failed to set dynamic parameter. Error code: %s\n",
-                av_err2str(ret));
-        goto end;
-    }
-
-    if ((ret = avcodec_send_frame(encoder_ctx, frame)) < 0) {
-        fprintf(stderr, "Error during encoding. Error code: %s\n", av_err2str(ret));
-        goto end;
-    }
-    while (1) {
-        if (ret = avcodec_receive_packet(encoder_ctx, enc_pkt))
-            break;
-        enc_pkt->stream_index = 0;
-        av_packet_rescale_ts(enc_pkt, encoder_ctx->time_base,
-                             ofmt_ctx->streams[0]->time_base);
-        if ((ret = av_interleaved_write_frame(ofmt_ctx, enc_pkt)) < 0) {
-            fprintf(stderr, "Error during writing data to output file. "
-                    "Error code: %s\n", av_err2str(ret));
-            return ret;
-        }
-    }
-
-end:
-    if (ret == AVERROR_EOF)
-        return 0;
-    ret = ((ret == AVERROR(EAGAIN)) ? 0:-1);
-    return ret;
-}
-
-static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec, char *optstr)
-{
-    AVFrame *frame;
-    int ret = 0;
-
-    ret = avcodec_send_packet(decoder_ctx, pkt);
-    if (ret < 0) {
-        fprintf(stderr, "Error during decoding. Error code: %s\n", av_err2str(ret));
-        return ret;
-    }
-
-    while (ret >= 0) {
-        if (!(frame = av_frame_alloc()))
-            return AVERROR(ENOMEM);
-
-        ret = avcodec_receive_frame(decoder_ctx, frame);
-        if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
-            av_frame_free(&frame);
-            return 0;
-        } else if (ret < 0) {
-            fprintf(stderr, "Error while decoding. Error code: %s\n", av_err2str(ret));
-            goto fail;
-        }
-        if (!encoder_ctx->hw_frames_ctx) {
-            AVDictionaryEntry *e = NULL;
-            AVDictionary *opts = NULL;
-            AVStream *ost;
-            /* we need to ref hw_frames_ctx of decoder to initialize encoder's codec.
-               Only after we get a decoded frame, can we obtain its hw_frames_ctx */
-            encoder_ctx->hw_frames_ctx = av_buffer_ref(decoder_ctx->hw_frames_ctx);
-            if (!encoder_ctx->hw_frames_ctx) {
-                ret = AVERROR(ENOMEM);
-                goto fail;
-            }
-            /* set AVCodecContext Parameters for encoder, here we keep them stay
-             * the same as decoder.
-             */
-            encoder_ctx->time_base = av_inv_q(decoder_ctx->framerate);
-            encoder_ctx->pix_fmt   = AV_PIX_FMT_QSV;
-            encoder_ctx->width     = decoder_ctx->width;
-            encoder_ctx->height    = decoder_ctx->height;
-            if ((ret = str_to_dict(optstr, &opts)) < 0) {
-                fprintf(stderr, "Failed to set encoding parameter.\n");
-                goto fail;
-            }
-            /* 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);
-            if (e) {
-                encoder_ctx->framerate = av_d2q(atof(e->value), INT_MAX);
-                encoder_ctx->time_base = av_inv_q(encoder_ctx->framerate);
-            }
-            if ((ret = avcodec_open2(encoder_ctx, enc_codec, &opts)) < 0) {
-                fprintf(stderr, "Failed to open encode codec. Error code: %s\n",
-                        av_err2str(ret));
-                av_dict_free(&opts);
-                goto fail;
-            }
-            av_dict_free(&opts);
-
-            if (!(ost = avformat_new_stream(ofmt_ctx, enc_codec))) {
-                fprintf(stderr, "Failed to allocate stream for output format.\n");
-                ret = AVERROR(ENOMEM);
-                goto fail;
-            }
-
-            ost->time_base = encoder_ctx->time_base;
-            ret = avcodec_parameters_from_context(ost->codecpar, encoder_ctx);
-            if (ret < 0) {
-                fprintf(stderr, "Failed to copy the stream parameters. "
-                        "Error code: %s\n", av_err2str(ret));
-                goto fail;
-            }
-
-            /* write the stream header */
-            if ((ret = avformat_write_header(ofmt_ctx, NULL)) < 0) {
-                fprintf(stderr, "Error while writing stream header. "
-                        "Error code: %s\n", av_err2str(ret));
-                goto fail;
-            }
-        }
-        frame->pts = av_rescale_q(frame->pts, decoder_ctx->pkt_timebase,
-                                  encoder_ctx->time_base);
-        if ((ret = encode_write(pkt, frame)) < 0)
-            fprintf(stderr, "Error during encoding and writing.\n");
-
-fail:
-        av_frame_free(&frame);
-    }
-    return ret;
-}
-
-int main(int argc, char **argv)
-{
-    const AVCodec *enc_codec;
-    int ret = 0;
-    AVPacket *dec_pkt = NULL;
-
-    if (argc < 5 || (argc - 5) % 2) {
-        av_log(NULL, AV_LOG_ERROR, "Usage: %s <input file> <encoder> <output file>"
-               " <\"encoding option set 0\"> [<frame_number> <\"encoding options set 1\">]...\n", argv[0]);
-        return 1;
-    }
-    setting_number = (argc - 5) / 2;
-    dynamic_setting = av_malloc(setting_number * sizeof(*dynamic_setting));
-    current_setting_number = 0;
-    for (int i = 0; i < setting_number; i++) {
-        dynamic_setting[i].frame_number = atoi(argv[i*2 + 5]);
-        dynamic_setting[i].optstr = argv[i*2 + 6];
-    }
-
-    ret = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_QSV, NULL, NULL, 0);
-    if (ret < 0) {
-        fprintf(stderr, "Failed to create a QSV device. Error code: %s\n", av_err2str(ret));
-        goto end;
-    }
-
-    dec_pkt = av_packet_alloc();
-    if (!dec_pkt) {
-        fprintf(stderr, "Failed to allocate decode packet\n");
-        goto end;
-    }
-
-    if ((ret = open_input_file(argv[1])) < 0)
-        goto end;
-
-    if (!(enc_codec = avcodec_find_encoder_by_name(argv[2]))) {
-        fprintf(stderr, "Could not find encoder '%s'\n", argv[2]);
-        ret = -1;
-        goto end;
-    }
-
-    if ((ret = (avformat_alloc_output_context2(&ofmt_ctx, NULL, NULL, argv[3]))) < 0) {
-        fprintf(stderr, "Failed to deduce output format from file extension. Error code: "
-                "%s\n", av_err2str(ret));
-        goto end;
-    }
-
-    if (!(encoder_ctx = avcodec_alloc_context3(enc_codec))) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
-    ret = avio_open(&ofmt_ctx->pb, argv[3], AVIO_FLAG_WRITE);
-    if (ret < 0) {
-        fprintf(stderr, "Cannot open output file. "
-                "Error code: %s\n", av_err2str(ret));
-        goto end;
-    }
-
-    /* read all packets and only transcoding video */
-    while (ret >= 0) {
-        if ((ret = av_read_frame(ifmt_ctx, dec_pkt)) < 0)
-            break;
-
-        if (video_stream == dec_pkt->stream_index)
-            ret = dec_enc(dec_pkt, enc_codec, argv[4]);
-
-        av_packet_unref(dec_pkt);
-    }
-
-    /* flush decoder */
-    av_packet_unref(dec_pkt);
-    if ((ret = dec_enc(dec_pkt, enc_codec, argv[4])) < 0) {
-        fprintf(stderr, "Failed to flush decoder %s\n", av_err2str(ret));
-        goto end;
-    }
-
-    /* flush encoder */
-    if ((ret = encode_write(dec_pkt, NULL)) < 0) {
-        fprintf(stderr, "Failed to flush encoder %s\n", av_err2str(ret));
-        goto end;
-    }
-
-    /* write the trailer for output stream */
-    if ((ret = av_write_trailer(ofmt_ctx)) < 0)
-        fprintf(stderr, "Failed to write trailer %s\n", av_err2str(ret));
-
-end:
-    avformat_close_input(&ifmt_ctx);
-    avformat_close_input(&ofmt_ctx);
-    avcodec_free_context(&decoder_ctx);
-    avcodec_free_context(&encoder_ctx);
-    av_buffer_unref(&hw_device_ctx);
-    av_packet_free(&dec_pkt);
-    av_freep(&dynamic_setting);
-    return ret;
-}

doc/examples/qsvdec.c

@@ -21,13 +21,16 @@
  */
 
 /**
- * @file Intel QSV-accelerated H.264 decoding API usage example
- * @example qsv_decode.c
+ * @file
+ * Intel QSV-accelerated H.264 decoding example.
  *
- * Perform QSV-accelerated H.264 decoding with output frames in the
- * GPU video surfaces, write the decoded frames to an output file.
+ * @example qsvdec.c
+ * This example shows how to do QSV-accelerated H.264 decoding with output
+ * frames in the GPU video surfaces.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "libavformat/avformat.h"

doc/examples/remuxing.c

@@ -21,11 +21,11 @@
  */
 
 /**
- * @file libavformat/libavcodec demuxing and muxing API usage example
- * @example remux.c
+ * @file
+ * libavformat/libavcodec demuxing and muxing API example.
  *
- * Remux streams from one container format to another. Data is copied from the
- * input to the output without transcoding.
+ * Remux streams from one container format to another.
+ * @example remuxing.c
  */
 
 #include <libavutil/timestamp.h>

doc/examples/resampling_audio.c

@@ -21,12 +21,8 @@
  */
 
 /**
- * @file audio resampling API usage example
- * @example resample_audio.c
- *
- * Generate a synthetic audio signal, and Use libswresample API to perform audio
- * resampling. The output is written to a raw audio file to be played with
- * ffplay.
+ * @example resampling_audio.c
+ * libswresample API use example.
  */
 
 #include <libavutil/opt.h>

doc/examples/scaling_video.c

@@ -21,10 +21,9 @@
  */
 
 /**
- * @file libswscale API usage example
- * @example scale_video.c
- *
- * Generate a synthetic video signal and use libswscale to perform rescaling.
+ * @file
+ * libswscale API use example.
+ * @example scaling_video.c
  */
 
 #include <libavutil/imgutils.h>

doc/examples/transcode_aac.c

@@ -19,11 +19,12 @@
  */
 
 /**
- * @file audio transcoding to MPEG/AAC API usage example
- * @example transcode_aac.c
+ * @file
+ * Simple audio converter
  *
- * Convert an input audio file to AAC in an MP4 container. Formats other than
- * MP4 are supported based on the output file extension.
+ * @example transcode_aac.c
+ * Convert an input audio file to AAC in an MP4 container using FFmpeg.
+ * Formats other than MP4 are supported based on the output file extension.
  * @author Andreas Unterweger (dustsigns@gmail.com)
  */
 
@@ -447,17 +448,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;
@@ -589,9 +599,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/transcoding.c

@@ -23,11 +23,9 @@
  */
 
 /**
- * @file demuxing, decoding, filtering, encoding and muxing API usage example
- * @example transcode.c
- *
- * Convert input to output file, applying some hard-coded filter-graph on both
- * audio and video streams.
+ * @file
+ * API example for demuxing, decoding, filtering, encoding and muxing
+ * @example transcoding.c
  */
 
 #include <libavcodec/avcodec.h>
@@ -97,11 +95,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) {
@@ -196,7 +189,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);
@@ -271,7 +264,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);
 
@@ -311,7 +304,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",
@@ -441,10 +434,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)
@@ -499,7 +488,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);
@@ -554,6 +542,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");
@@ -585,38 +576,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/vaapi_encode.c

@@ -1,4 +1,6 @@
 /*
+ * Video Acceleration API (video encoding) encode sample
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -19,12 +21,13 @@
  */
 
 /**
- * @file Intel VAAPI-accelerated encoding API usage example
- * @example vaapi_encode.c
+ * @file
+ * Intel VAAPI-accelerated encoding example.
+ *
+ * @example vaapi_encode.c
+ * This example shows how to do VAAPI-accelerated encoding. now only support NV12
+ * raw file, usage like: vaapi_encode 1920 1080 input.yuv output.h264
  *
- * Perform VAAPI-accelerated encoding. Read input from an NV12 raw
- * file, and write the H.264 encoded data to an output raw file.
- * Usage: vaapi_encode 1920 1080 input.yuv output.h264
  */
 
 #include <stdio.h>

doc/examples/vaapi_transcode.c

@@ -1,4 +1,6 @@
 /*
+ * Video Acceleration API (video transcoding) transcode sample
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -19,10 +21,11 @@
  */
 
 /**
- * @file Intel VAAPI-accelerated transcoding API usage example
- * @example vaapi_transcode.c
+ * @file
+ * Intel VAAPI-accelerated transcoding example.
  *
- * Perform VAAPI-accelerated transcoding.
+ * @example vaapi_transcode.c
+ * This example shows how to do VAAPI-accelerated transcoding.
  * Usage: vaapi_transcode input_stream codec output_stream
  * e.g: - vaapi_transcode input.mp4 h264_vaapi output_h264.mp4
  *      - vaapi_transcode input.mp4 vp9_vaapi output_vp9.ivf
@@ -215,8 +218,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
@@ -231,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

@@ -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
@@ -232,13 +232,6 @@ multimedia stream.
 Each media stream information is printed within a dedicated section
 with name "PROGRAM_STREAM".
 
-@item -show_stream_groups
-Show information about stream groups and their streams contained in the
-input multimedia stream.
-
-Each media stream information is printed within a dedicated section
-with name "STREAM_GROUP_STREAM".
-
 @item -show_chapters
 Show information about chapters stored in the format.
 
@@ -422,9 +415,8 @@ keyN=valN
 [/SECTION]
 @end example
 
-Metadata tags are printed as a line in the corresponding FORMAT, STREAM,
-STREAM_GROUP_STREAM or PROGRAM_STREAM section, and are prefixed by the
-string "TAG:".
+Metadata tags are printed as a line in the corresponding FORMAT, STREAM or
+PROGRAM_STREAM section, and are prefixed by the string "TAG:".
 
 A description of the accepted options follows.
 

doc/ffprobe.xsd

@@ -1,527 +1,386 @@
 <?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="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: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="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="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

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

doc/general_contents.texi

@@ -343,22 +343,6 @@ libxavs2 is under the GNU Public License Version 2 or later
 details), you must upgrade FFmpeg's license to GPL in order to use it.
 @end float
 
-@section eXtra-fast Essential Video Encoder (XEVE)
-
-FFmpeg can make use of the XEVE library for EVC video encoding.
-
-Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for
-installing the XEVE library. Then pass @code{--enable-libxeve} to configure to
-enable it.
-
-@section eXtra-fast Essential Video Decoder (XEVD)
-
-FFmpeg can make use of the XEVD library for EVC video decoding.
-
-Go to @url{https://github.com/mpeg5/xevd} and follow the instructions for
-installing the XEVD library. Then pass @code{--enable-libxevd} to configure to
-enable it.
-
 @section ZVBI
 
 ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB
@@ -526,8 +510,6 @@ library:
     @tab A format used by libvpx
 @item Internet Video Recording  @tab   @tab X
 @item IRCAM                     @tab X @tab X
-@item LAF                       @tab   @tab X
-    @tab Limitless Audio Format
 @item LATM                      @tab X @tab X
 @item LMLM4                     @tab   @tab X
     @tab Used by Linux Media Labs MPEG-4 PCI boards
@@ -550,8 +532,6 @@ library:
 @item Metal Gear Solid: The Twin Snakes @tab @tab X
 @item Megalux Frame             @tab   @tab X
     @tab Used by Megalux Ultimate Paint
-@item MobiClip MODS             @tab   @tab X
-@item MobiClip MOFLEX           @tab   @tab X
 @item Mobotix .mxg              @tab   @tab X
 @item Monkey's Audio            @tab   @tab X
 @item Motion Pixels MVI         @tab   @tab X
@@ -595,7 +575,6 @@ library:
 @item Ogg                       @tab X @tab X
 @item Playstation Portable PMP  @tab   @tab X
 @item Portable Voice Format     @tab   @tab X
-@item RK Audio (RKA)            @tab   @tab X
 @item TechnoTrend PVA           @tab   @tab X
     @tab Used by TechnoTrend DVB PCI boards.
 @item QCP                       @tab   @tab X
@@ -603,10 +582,8 @@ library:
 @item raw AC-3                  @tab X @tab X
 @item raw AMR-NB                @tab   @tab X
 @item raw AMR-WB                @tab   @tab X
-@item raw APAC                  @tab   @tab X
 @item raw aptX                  @tab X @tab X
 @item raw aptX HD               @tab X @tab X
-@item raw Bonk                  @tab   @tab X
 @item raw Chinese AVS video     @tab X @tab X
 @item raw DFPWM                 @tab X @tab X
 @item raw Dirac                 @tab X @tab X
@@ -614,7 +591,6 @@ library:
 @item raw DTS                   @tab X @tab X
 @item raw DTS-HD                @tab   @tab X
 @item raw E-AC-3                @tab X @tab X
-@item raw EVC                   @tab X @tab X
 @item raw FLAC                  @tab X @tab X
 @item raw GSM                   @tab   @tab X
 @item raw H.261                 @tab X @tab X
@@ -632,7 +608,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
@@ -670,8 +645,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.
@@ -685,10 +659,8 @@ library:
 @item Sample Dump eXchange      @tab   @tab X
 @item SAP                       @tab X @tab X
 @item SBG                       @tab   @tab X
-@item SDNS                      @tab   @tab X
 @item SDP                       @tab   @tab X
 @item SER                       @tab   @tab X
-@item Digital Pictures SGA      @tab   @tab X
 @item Sega FILM/CPK             @tab X @tab X
     @tab Used in many Sega Saturn console games.
 @item Silicon Graphics Movie    @tab   @tab X
@@ -726,9 +698,7 @@ library:
 @item Vivo                      @tab   @tab X
 @item VPK                       @tab   @tab X
     @tab Audio format used in Sony PS games.
-@item Marble WADY               @tab   @tab X
 @item WAV                       @tab X @tab X
-@item Waveform Archiver         @tab   @tab X
 @item WavPack                   @tab X @tab X
 @item WebM                      @tab X @tab X
 @item Windows Televison (WTV)   @tab X @tab X
@@ -740,7 +710,6 @@ library:
     @tab Multimedia format used in Westwood Studios games.
 @item Wideband Single-bit Data (WSD) @tab   @tab X
 @item WVE                       @tab   @tab X
-@item Konami XMD                @tab   @tab X
 @item XMV                       @tab   @tab X
     @tab Microsoft video container used in Xbox games.
 @item XVAG                      @tab   @tab X
@@ -780,8 +749,6 @@ following image formats are supported:
     @tab OpenEXR
 @item FITS         @tab X @tab X
     @tab Flexible Image Transport System
-@item HDR          @tab X @tab X
-    @tab Radiance HDR RGBE Image format
 @item IMG          @tab   @tab X
     @tab GEM Raster image
 @item JPEG         @tab X @tab X
@@ -790,7 +757,6 @@ following image formats are supported:
 @item JPEG-LS      @tab X @tab X
 @item LJPEG        @tab X @tab
     @tab Lossless JPEG
-@item Media 100    @tab   @tab X
 @item MSP          @tab   @tab X
     @tab Microsoft Paint image
 @item PAM          @tab X @tab X
@@ -833,8 +799,6 @@ following image formats are supported:
     @tab Targa (.TGA) image format
 @item VBN  @tab X @tab X
     @tab Vizrt Binary Image format
-@item WBMP         @tab X @tab X
-    @tab Wireless Application Protocol Bitmap image format
 @item WebP         @tab E @tab X
     @tab WebP image format, encoding supported through external library libwebp
 @item XBM  @tab X @tab X
@@ -962,8 +926,6 @@ following image formats are supported:
 @item Electronic Arts TQI video  @tab     @tab  X
 @item Escape 124             @tab     @tab  X
 @item Escape 130             @tab     @tab  X
-@item EVC / MPEG-5 Part 1    @tab  E  @tab  E
-    @tab encoding and decoding supported through external libraries libxeve and libxevd
 @item FFmpeg video codec #1  @tab  X  @tab  X
     @tab lossless codec (fourcc: FFV1)
 @item Flash Screen Video v1  @tab  X  @tab  X
@@ -1017,7 +979,6 @@ following image formats are supported:
 @item Lagarith               @tab     @tab  X
 @item LCL (LossLess Codec Library) MSZH  @tab     @tab  X
 @item LCL (LossLess Codec Library) ZLIB  @tab  E  @tab  E
-@item LEAD MCMP              @tab     @tab  X
 @item LOCO                   @tab     @tab  X
 @item LucasArts SANM/Smush   @tab     @tab  X
     @tab Used in LucasArts games / SMUSH animations.
@@ -1028,7 +989,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
@@ -1088,8 +1049,6 @@ following image formats are supported:
 @item RealVideo 4.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
@@ -1126,8 +1085,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
@@ -1194,7 +1151,6 @@ following image formats are supported:
 @item ADPCM IMA Electronic Arts SEAD  @tab     @tab  X
 @item ADPCM IMA Funcom       @tab     @tab  X
 @item ADPCM IMA High Voltage Software ALP      @tab  X  @tab  X
-@item ADPCM IMA Mobiclip MOFLEX  @tab     @tab  X
 @item ADPCM IMA QuickTime    @tab  X  @tab  X
 @item ADPCM IMA Simon & Schuster Interactive   @tab  X  @tab  X
 @item ADPCM IMA Ubisoft APM  @tab  X  @tab  X
@@ -1224,7 +1180,6 @@ following image formats are supported:
 @item ADPCM Sound Blaster Pro 4-bit  @tab     @tab  X
 @item ADPCM VIMA             @tab     @tab  X
     @tab Used in LucasArts SMUSH animations.
-@item ADPCM Konami XMD       @tab     @tab  X
 @item ADPCM Westwood Studios IMA      @tab  X @tab  X
     @tab Used in Westwood Studios games like Command and Conquer.
 @item ADPCM Yamaha           @tab  X  @tab  X
@@ -1246,7 +1201,6 @@ following image formats are supported:
 @item ATRAC9                 @tab     @tab  X
 @item Bink Audio             @tab     @tab  X
     @tab Used in Bink and Smacker files in many games.
-@item Bonk audio             @tab     @tab  X
 @item CELT                   @tab     @tab  E
     @tab decoding supported through external library libcelt
 @item codec2                 @tab  E  @tab  E
@@ -1262,12 +1216,9 @@ following image formats are supported:
 @item DCA (DTS Coherent Acoustics)  @tab  X  @tab  X
     @tab supported extensions: XCh, XXCH, X96, XBR, XLL, LBR (partially)
 @item Dolby E  @tab     @tab  X
-@item DPCM Cuberoot-Delta-Exact @tab  @tab  X
-    @tab Used in few games.
 @item DPCM Gremlin           @tab     @tab  X
 @item DPCM id RoQ            @tab  X  @tab  X
     @tab Used in Quake III, Jedi Knight 2 and other computer games.
-@item DPCM Marble WADY       @tab     @tab  X
 @item DPCM Interplay         @tab     @tab  X
     @tab Used in various Interplay computer games.
 @item DPCM Squareroot-Delta-Exact  @tab  @tab  X
@@ -1288,7 +1239,6 @@ following image formats are supported:
 @item Enhanced AC-3          @tab  X  @tab  X
 @item EVRC (Enhanced Variable Rate Codec) @tab     @tab  X
 @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.729                  @tab     @tab  X
 @item GSM                    @tab  E  @tab  X
@@ -1302,8 +1252,6 @@ following image formats are supported:
 @item Interplay ACM            @tab     @tab  X
 @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
 @item MLP (Meridian Lossless Packing)  @tab  X  @tab  X
     @tab Used in DVD-Audio discs.
 @item Monkey's Audio         @tab     @tab  X
@@ -1313,14 +1261,12 @@ following image formats are supported:
 @item MP3 (MPEG audio layer 3)  @tab  E  @tab IX
     @tab encoding supported through external library LAME, ADU MP3 and MP3onMP4 also supported
 @item MPEG-4 Audio Lossless Coding (ALS)  @tab     @tab  X
-@item MobiClip FastAudio     @tab     @tab  X
 @item Musepack SV7           @tab     @tab  X
 @item Musepack SV8           @tab     @tab  X
 @item Nellymoser Asao        @tab  X  @tab  X
 @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
@@ -1349,7 +1295,6 @@ following image formats are supported:
 @item PCM unsigned 24-bit little-endian  @tab  X  @tab  X
 @item PCM unsigned 32-bit big-endian  @tab  X  @tab  X
 @item PCM unsigned 32-bit little-endian  @tab  X  @tab  X
-@item PCM SGA                @tab     @tab  X
 @item QCELP / PureVoice      @tab     @tab  X
 @item QDesign Music Codec 1  @tab     @tab  X
 @item QDesign Music Codec 2  @tab     @tab  X
@@ -1362,7 +1307,6 @@ following image formats are supported:
     @tab Real low bitrate AC-3 codec
 @item RealAudio Lossless     @tab     @tab  X
 @item RealAudio SIPR / ACELP.NET @tab     @tab  X
-@item RK Audio (RKA)         @tab     @tab  X
 @item SBC (low-complexity subband codec) @tab  X  @tab  X
     @tab Used in Bluetooth A2DP
 @item Shorten                @tab     @tab  X
@@ -1383,11 +1327,9 @@ following image formats are supported:
 @item TwinVQ (VQF flavor)    @tab     @tab  X
 @item VIMA                   @tab     @tab  X
     @tab Used in LucasArts SMUSH animations.
-@item ViewQuest VQC          @tab     @tab  X
 @item Vorbis                 @tab  E  @tab  X
     @tab A native but very primitive encoder exists.
 @item Voxware MetaSound      @tab     @tab  X
-@item Waveform Archiver      @tab     @tab  X
 @item WavPack                @tab  X  @tab  X
 @item Westwood Audio (SND1)  @tab     @tab  X
 @item Windows Media Audio 1  @tab  X  @tab  X

doc/git-howto.texi

@@ -53,7 +53,7 @@ Most distribution and operating system provide a package for it.
 @section Cloning the source tree
 
 @example
-git clone https://git.ffmpeg.org/ffmpeg.git <target>
+git clone git://source.ffmpeg.org/ffmpeg <target>
 @end example
 
 This will put the FFmpeg sources into the directory @var{<target>}.
@@ -66,7 +66,7 @@ This will put the FFmpeg sources into the directory @var{<target>} and let
 you push back your changes to the remote repository.
 
 @example
-git clone git@@ffmpeg.org:ffmpeg-web <target>
+git clone gil@@ffmpeg.org:ffmpeg-web <target>
 @end example
 
 This will put the source of the FFmpeg website into the directory
@@ -187,18 +187,11 @@ to make sure you don't have untracked files or deletions.
 git add [-i|-p|-A] <filenames/dirnames>
 @end example
 
-Make sure you have told Git your name, email address and GPG key
+Make sure you have told Git your name and email address
 
 @example
 git config --global user.name "My Name"
 git config --global user.email my@@email.invalid
-git config --global user.signingkey ABCDEF0123245
-@end example
-
-Enable signing all commits or use -S
-
-@example
-git config --global commit.gpgsign true
 @end example
 
 Use @option{--global} to set the global configuration for all your Git checkouts.
@@ -430,19 +423,6 @@ git checkout -b svn_23456 $SHA1
 where @var{$SHA1} is the commit hash from the @command{git log} output.
 
 
-@chapter gpg key generation
-
-If you have no gpg key yet, we recommend that you create a ed25519 based key as it
-is small, fast and secure. Especially it results in small signatures in git.
-
-@example
-gpg --default-new-key-algo "ed25519/cert,sign+cv25519/encr" --quick-generate-key "human@@server.com"
-@end example
-
-When generating a key, make sure the email specified matches the email used in git as some sites like
-github consider mismatches a reason to declare such commits unverified. After generating a key you
-can add it to the MAINTAINER file and upload it to a keyserver.
-
 @chapter Pre-push checklist
 
 Once you have a set of commits that you feel are ready for pushing,

doc/indevs.texi

@@ -222,8 +222,7 @@ $ ffmpeg -f avfoundation -capture_raw_data true -i "zr100:none" out.dv
 
 @section bktr
 
-BSD video input device. Deprecated and will be removed - please contact
-the developers if you are interested in maintaining it.
+BSD video input device.
 
 @subsection Options
 
@@ -723,7 +722,7 @@ Win32 GDI-based screen capture device.
 
 This device allows you to capture a region of the display on Windows.
 
-Amongst options for the imput filenames are such elements as:
+There are two options for the input filename:
 @example
 desktop
 @end example
@@ -731,13 +730,9 @@ or
 @example
 title=@var{window_title}
 @end example
-or
-@example
-hwnd=@var{window_hwnd}
-@end example
 
 The first option will capture the entire desktop, or a fixed region of the
-desktop. The second and third options will instead capture the contents of a single
+desktop. The second option will instead capture the contents of a single
 window, regardless of its position on the screen.
 
 For example, to grab the entire desktop using @command{ffmpeg}:
@@ -996,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
 

doc/infra.txt

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

doc/mailing-list-faq.texi

@@ -344,7 +344,7 @@ recommended.
 Avoid sending the same message to multiple mailing lists.
 
 @item
-Please follow our @url{https://ffmpeg.org/community.html#Code-of-conduct, Code of Conduct}.
+Please follow our @url{https://ffmpeg.org/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,6 +48,11 @@ 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
@@ -65,6 +70,9 @@ Files that have MIPS copyright notice in them:
       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

doc/multithreading.txt

@@ -55,7 +55,8 @@ speed gain at this point but it should work.
 
 If there are inter-frame dependencies, so the codec calls
 ff_thread_report/await_progress(), set FF_CODEC_CAP_ALLOCATE_PROGRESS in
-FFCodec.caps_internal and use ff_thread_get_buffer() to allocate frames.
+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_thread_report_progress() after some part of the current picture has decoded.

doc/optimization.txt

@@ -267,11 +267,6 @@ CELL/SPU:
 http://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/30B3520C93F437AB87257060006FFE5E/$file/Language_Extensions_for_CBEA_2.4.pdf
 http://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/9F820A5FFA3ECE8C8725716A0062585F/$file/CBE_Handbook_v1.1_24APR2007_pub.pdf
 
-RISC-V-specific:
-----------------
-The RISC-V Instruction Set Manual, Volume 1, Unprivileged ISA:
-https://riscv.org/technical/specifications/
-
 GCC asm links:
 --------------
 official doc but quite ugly

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
@@ -302,7 +297,7 @@ ffmpeg -re -i INPUT -c:v rawvideo -pix_fmt bgra -f fbdev /dev/fb0
 See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1).
 
 @section opengl
-OpenGL output device. Deprecated and will be removed.
+OpenGL output device.
 
 To enable this output device you need to configure FFmpeg with @code{--enable-opengl}.
 
@@ -408,13 +403,7 @@ ffmpeg  -i INPUT -f pulse "stream name"
 
 @section sdl
 
-SDL (Simple DirectMedia Layer) output device. Deprecated and will be removed.
-
-For monitoring purposes in FFmpeg, pipes and a video player such as ffplay can be used:
-
-@example
-ffmpeg -i INPUT -f nut -c:v rawvideo - | ffplay -
-@end example
+SDL (Simple DirectMedia Layer) output device.
 
 "sdl2" can be used as alias for "sdl".
 
@@ -432,18 +421,13 @@ For more information about SDL, check:
 
 @table @option
 
-@item window_borderless
-Set SDL window border off.
-Default value is 0 (enable window border).
+@item window_title
+Set the SDL window title, if not specified default to the filename
+specified for the output device.
 
-@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).
-
-@item window_fullscreen
-Set fullscreen mode when non-zero value is provided.
-Default value is zero.
+@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
@@ -451,13 +435,18 @@ Set the SDL window size, can be a string of the form
 If not specified it defaults to the size of the input video,
 downscaled according to the aspect ratio.
 
-@item window_title
-Set the SDL window title, if not specified default to the filename
-specified for the output device.
-
 @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

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

doc/protocols.texi

@@ -275,33 +275,6 @@ For example, to convert a GIF file given inline with @command{ffmpeg}:
 ffmpeg -i "data:image/gif;base64,R0lGODdhCAAIAMIEAAAAAAAA//8AAP//AP///////////////ywAAAAACAAIAAADF0gEDLojDgdGiJdJqUX02iB4E8Q9jUMkADs=" smiley.png
 @end example
 
-@section fd
-
-File descriptor access protocol.
-
-The accepted syntax is:
-@example
-fd: -fd @var{file_descriptor}
-@end example
-
-If @option{fd} is not specified, by default the stdout file descriptor will be
-used for writing, stdin for reading. Unlike the pipe protocol, fd protocol has
-seek support if it corresponding to a regular file. fd protocol doesn't support
-pass file descriptor via URL for security.
-
-This protocol accepts the following options:
-
-@table @option
-@item blocksize
-Set I/O operation maximum block size, in bytes. Default value is
-@code{INT_MAX}, which results in not limiting the requested block size.
-Setting this value reasonably low improves user termination request reaction
-time, which is valuable if data transmission is slow.
-
-@item fd
-Set file descriptor.
-@end table
-
 @section file
 
 File access protocol.
@@ -649,6 +622,9 @@ This protocol wraps the IPFS native protocols (ipfs:// and ipns://) to be sent
 to such a gateway. Users can (and should) host their own node which means this
 protocol will use one's local gateway to access files on the IPFS network.
 
+If a user doesn't have a node of their own then the public gateway @code{https://dweb.link}
+is used by default.
+
 This protocol accepts the following options:
 
 @table @option
@@ -656,18 +632,18 @@ This protocol accepts the following options:
 @item gateway
 Defines the gateway to use. When not set, the protocol will first try
 locating the local gateway by looking at @code{$IPFS_GATEWAY}, @code{$IPFS_PATH}
-and @code{$HOME/.ipfs/}, in that order.
+and @code{$HOME/.ipfs/}, in that order. If that fails @code{https://dweb.link} will be used.
 
 @end table
 
 One can use this protocol in 2 ways. Using IPFS:
 @example
-ffplay ipfs://<hash>
+ffplay ipfs://QmbGtJg23skhvFmu9mJiePVByhfzu5rwo74MEkVDYAmF5T
 @end example
 
 Or the IPNS protocol (IPNS is mutable IPFS):
 @example
-ffplay ipns://<hash>
+ffplay ipns://QmbGtJg23skhvFmu9mJiePVByhfzu5rwo74MEkVDYAmF5T
 @end example
 
 @section mmst
@@ -714,7 +690,7 @@ The accepted syntax is:
 pipe:[@var{number}]
 @end example
 
-If @option{fd} isn't specified, @var{number} is the number corresponding to the file descriptor of the
+@var{number} is the number corresponding to the file descriptor of the
 pipe (e.g. 0 for stdin, 1 for stdout, 2 for stderr).  If @var{number}
 is not specified, by default the stdout file descriptor will be used
 for writing, stdin for reading.
@@ -741,8 +717,6 @@ Set I/O operation maximum block size, in bytes. Default value is
 @code{INT_MAX}, which results in not limiting the requested block size.
 Setting this value reasonably low improves user termination request reaction
 time, which is valuable if data transmission is slow.
-@item fd
-Set file descriptor.
 @end table
 
 Note that some formats (typically MOV), require the output protocol to
@@ -896,13 +870,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;
@@ -1211,59 +1178,6 @@ Options can be set on the @command{ffmpeg}/@command{ffplay} command
 line, or set in code via @code{AVOption}s or in
 @code{avformat_open_input}.
 
-@subsection Muxer
-The following options are supported.
-
-@table @option
-@item rtsp_transport
-Set RTSP transport protocols.
-
-It accepts the following values:
-@table @samp
-@item udp
-Use UDP as lower transport protocol.
-
-@item tcp
-Use TCP (interleaving within the RTSP control channel) as lower
-transport protocol.
-@end table
-
-Default value is @samp{0}.
-
-@item rtsp_flags
-Set RTSP flags.
-
-The following values are accepted:
-@table @samp
-@item latm
-Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC.
-@item rfc2190
-Use RFC 2190 packetization instead of RFC 4629 for H.263.
-@item skip_rtcp
-Don't send RTCP sender reports.
-@item h264_mode0
-Use mode 0 for H.264 in RTP.
-@item send_bye
-Send RTCP BYE packets when finishing.
-@end table
-
-Default value is @samp{0}.
-
-
-@item min_port
-Set minimum local UDP port. Default value is 5000.
-
-@item max_port
-Set maximum local UDP port. Default value is 65000.
-
-@item buffer_size
-Set the maximum socket buffer size in bytes.
-
-@item pkt_size
-Set max send packet size (in bytes). Default value is 1472.
-@end table
-
-@subsection Demuxer
 The following options are supported.
 
 @table @option
@@ -1289,10 +1203,6 @@ Use UDP multicast as lower transport protocol.
 @item http
 Use HTTP tunneling as lower transport protocol, which is useful for
 passing proxies.
-
-@item https
-Use HTTPs tunneling as lower transport protocol, which is useful for
-passing proxies and widely used for security consideration.
 @end table
 
 Multiple lower transport protocols may be specified, in that case they are
@@ -1310,9 +1220,6 @@ Accept packets only from negotiated peer address and port.
 Act as a server, listening for an incoming connection.
 @item prefer_tcp
 Try TCP for RTP transport first, if TCP is available as RTSP RTP transport.
-@item satip_raw
-Export raw MPEG-TS stream instead of demuxing. The flag will simply write out
-the raw stream, with the original PAT/PMT/PIDs intact.
 @end table
 
 Default value is @samp{none}.
@@ -1325,7 +1232,6 @@ The following flags are accepted:
 @item video
 @item audio
 @item data
-@item subtitle
 @end table
 
 By default it accepts all media types.
@@ -1350,9 +1256,6 @@ Set socket TCP I/O timeout in microseconds.
 @item user_agent
 Override User-Agent header. If not specified, it defaults to the
 libavformat identifier string.
-
-@item buffer_size
-Set the maximum socket buffer size in bytes.
 @end table
 
 When receiving data over UDP, the demuxer tries to reorder received packets
@@ -1889,12 +1792,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.
 

doc/resampler.texi

@@ -11,8 +11,18 @@ programmatic use.
 
 @table @option
 
-@item uchl, used_chlayout
-Set used input channel layout. Default is unset. This option is
+@item ich, in_channel_count
+Set the number of input channels. Default value is 0. Setting this
+value is not mandatory if the corresponding channel layout
+@option{in_channel_layout} is set.
+
+@item och, out_channel_count
+Set the number of output channels. Default value is 0. Setting this
+value is not mandatory if the corresponding channel layout
+@option{out_channel_layout} is set.
+
+@item uch, used_channel_count
+Set the number of used input channels. Default value is 0. This option is
 only used for special remapping.
 
 @item isr, in_sample_rate
@@ -31,8 +41,8 @@ Specify the output sample format. It is set by default to @code{none}.
 Set the internal sample format. Default value is @code{none}.
 This will automatically be chosen when it is not explicitly set.
 
-@item ichl, in_chlayout
-@item ochl, out_chlayout
+@item icl, in_channel_layout
+@item ocl, out_channel_layout
 Set the input/output channel layout.
 
 See @ref{channel layout syntax,,the Channel Layout section in the ffmpeg-utils(1) manual,ffmpeg-utils}

doc/t2h.pm

@@ -20,45 +20,8 @@
 # License along with FFmpeg; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-# Texinfo 7.0 changed the syntax of various functions.
-# Provide a shim for older versions.
-sub ff_set_from_init_file($$) {
-    my $key = shift;
-    my $value = shift;
-    if (exists &{'texinfo_set_from_init_file'}) {
-        texinfo_set_from_init_file($key, $value);
-    } else {
-        set_from_init_file($key, $value);
-    }
-}
-
-sub ff_get_conf($) {
-    my $key = shift;
-    if (exists &{'texinfo_get_conf'}) {
-        texinfo_get_conf($key);
-    } else {
-        get_conf($key);
-    }
-}
-
-sub get_formatting_function($$) {
-    my $obj = shift;
-    my $func = shift;
-
-    my $sub = $obj->can('formatting_function');
-    if ($sub) {
-        return $obj->formatting_function($func);
-    } else {
-        return $obj->{$func};
-    }
-}
-
-# determine texinfo version
-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);
+set_from_init_file('HEADERS', 0);
 
 sub ffmpeg_heading_command($$$$$)
 {
@@ -92,7 +55,7 @@ sub ffmpeg_heading_command($$$$$)
         $element = $command->{'parent'};
     }
     if ($element) {
-        $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
+        $result .= &{$self->{'format_element_header'}}($self, $cmdname,
                                                        $command, $element);
     }
 
@@ -149,11 +112,7 @@ sub ffmpeg_heading_command($$$$$)
                 $cmdname
                     = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
             }
-            # format_heading_text expects an array of headings for texinfo >= 7.0
-            if ($program_version_num >= 7.000000) {
-                $heading = [$heading];
-            }
-            $result .= &{get_formatting_function($self,'format_heading_text')}(
+            $result .= &{$self->{'format_heading_text'}}(
                         $self, $cmdname, $heading,
                         $heading_level +
                         $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command);
@@ -167,19 +126,23 @@ foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') {
     texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
+# determine if texinfo is at least version 6.8
+my $program_version_num = version->declare(get_conf('PACKAGE_VERSION'))->numify;
+my $program_version_6_8 = $program_version_num >= 6.008000;
+
 # print the TOC where @contents is used
 if ($program_version_6_8) {
-    ff_set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
+    set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
 } else {
-    ff_set_from_init_file('INLINE_CONTENTS', 1);
+    set_from_init_file('INLINE_CONTENTS', 1);
 }
 
 # make chapters <h2>
-ff_set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
+set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
 
 # Do not add <hr>
-ff_set_from_init_file('DEFAULT_RULE', '');
-ff_set_from_init_file('BIG_RULE', '');
+set_from_init_file('DEFAULT_RULE', '');
+set_from_init_file('BIG_RULE', '');
 
 # Customized file beginning
 sub ffmpeg_begin_file($$$)
@@ -196,18 +159,7 @@ sub ffmpeg_begin_file($$$)
     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.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);
-    } else {
-        ($title, $description, $encoding, $date, $css_lines,
-         $doctype, $bodytext, $copying_comment, $after_body_open,
-         $extra_head, $program_and_version, $program_homepage,
-         $program, $generator) = $self->_file_header_informations($command);
-    }
+        $program, $generator) = $self->_file_header_informations($command);
 
     my $links = $self->_get_links ($filename, $element);
 
@@ -271,7 +223,7 @@ if ($program_version_6_8) {
 sub ffmpeg_end_file($)
 {
     my $self = shift;
-    my $program_string = &{get_formatting_function($self,'format_program_string')}($self);
+    my $program_string = &{$self->{'format_program_string'}}($self);
     my $program_text = <<EOT;
       <p style="font-size: small;">
         $program_string
@@ -292,7 +244,7 @@ if ($program_version_6_8) {
 
 # Dummy title command
 # Ignore title. Title is handled through ffmpeg_begin_file().
-ff_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
+set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
 sub ffmpeg_title($$$$)
 {
     return '';
@@ -310,14 +262,8 @@ sub ffmpeg_float($$$$$)
     my $args = shift;
     my $content = shift;
 
-    my ($caption, $prepended);
-    if ($program_version_num >= 7.000000) {
-        ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self,
-                                                                                 $command);
-    } else {
-        ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
-                                                                     $command);
-    }
+    my ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
+                                                                $command);
     my $caption_text = '';
     my $prepended_text;
     my $prepended_save = '';
@@ -389,13 +335,8 @@ sub ffmpeg_float($$$$$)
             $caption->{'args'}->[0], 'float caption');
     }
     if ($prepended_text.$caption_text ne '') {
-        if ($program_version_num >= 7.000000) {
-            $prepended_text = $self->html_attribute_class('div',['float-caption']). '>'
-                    . $prepended_text;
-        } else {
-            $prepended_text = $self->_attribute_class('div','float-caption'). '>'
-                    . $prepended_text;
-        }
+        $prepended_text = $self->_attribute_class('div','float-caption'). '>'
+                . $prepended_text;
         $caption_text .= '</div>';
     }
     my $html_class = '';
@@ -408,13 +349,8 @@ sub ffmpeg_float($$$$$)
         $prepended_text = '';
         $caption_text   = '';
     }
-    if ($program_version_num >= 7.000000) {
-        return $self->html_attribute_class('div', [$html_class]). '>' . "\n" .
-            $prepended_text . $caption_text . $content . '</div>';
-    } else {
-        return $self->_attribute_class('div', $html_class). '>' . "\n" .
-            $prepended_text . $caption_text . $content . '</div>';
-    }
+    return $self->_attribute_class('div', $html_class). '>' . "\n" .
+        $prepended_text . $caption_text . $content . '</div>';
 }
 
 texinfo_register_command_formatting('float',

doc/transforms.md

@@ -704,326 +704,3 @@ Also note that this function requires a special iteration way, due to coefficien
 beginning to overlap, particularly `[o1]` with `[0]` after the second iteration.
 To iterate further, set `z = &z[16]` via `z += 8` for the second iteration. After
 the 4th iteration, the layout resets, so repeat the same.
-
-
-# 15-point AVX FFT transform
-The 15-point transform is based on the following unrolling. The input
-must be permuted via the following loop:
-
-``` C
-    for (int k = 0; k < s->sub[0].len; k++) {
-        int cnt = 0;
-        int tmp[15];
-        memcpy(tmp, &s->map[k*15], 15*sizeof(*tmp));
-        for (int i = 1; i < 15; i += 3) {
-            s->map[k*15 + cnt] = tmp[i];
-            cnt++;
-        }
-        for (int i = 2; i < 15; i += 3) {
-            s->map[k*15 + cnt] = tmp[i];
-            cnt++;
-        }
-        for (int i = 0; i < 15; i += 3) {
-            s->map[k*15 + cnt] = tmp[i];
-            cnt++;
-        }
-        memmove(&s->map[k*15 + 7], &s->map[k*15 + 6], 4*sizeof(int));
-        memmove(&s->map[k*15 + 3], &s->map[k*15 + 1], 4*sizeof(int));
-        s->map[k*15 + 1] = tmp[2];
-        s->map[k*15 + 2] = tmp[0];
-    }
-
-```
-
-This separates the ACs from the DCs and flips the SIMD direction to
-performing 5x3pt transforms at once, followed by 3x5pt transforms.
-
-``` C
-static av_always_inline void fft15(TXComplex *out, TXComplex *in,
-                                   ptrdiff_t stride)
-{
-    const TXSample *tab = TX_TAB(ff_tx_tab_53);
-    TXComplex q[20];
-    TXComplex dc[3], pc[32];
-    TXComplex y[32], k[32];
-    TXComplex t[32];
-    TXComplex r[32];
-    TXComplex z0[32];
-
-    /* DC */
-    pc[0].re = in[ 1].im - in[ 0].im;
-    pc[0].im = in[ 1].re - in[ 0].re;
-    pc[1].re = in[ 1].re + in[ 0].re;
-    pc[1].im = in[ 1].im + in[ 0].im;
-
-    dc[0].re = in[2].re + pc[1].re;
-    dc[0].im = in[2].im + pc[1].im;
-
-    pc[0].re = tab[ 8] * pc[0].re;
-    pc[0].im = tab[ 9] * pc[0].im;
-    pc[1].re = tab[10] * pc[1].re;
-    pc[1].im = tab[11] * pc[1].im;
-
-    dc[1].re = pc[0].re + pc[1].re;
-    dc[1].im = pc[0].im + pc[1].im;
-    dc[2].re = pc[1].re - pc[0].re;
-    dc[2].im = pc[1].im - pc[0].im;
-
-    dc[1].re = in[2].re - dc[1].re;
-    dc[1].im = in[2].im + dc[1].im;
-    dc[2].re = in[2].re - dc[2].re;
-    dc[2].im = in[2].im + dc[2].im;
-
-    /* ACs */
-    q[0].im = in[ 3].re - in[ 7].re; // NOTE THE ORDER
-    q[0].re = in[ 3].im - in[ 7].im;
-    q[1].im = in[ 4].re - in[ 8].re;
-    q[1].re = in[ 4].im - in[ 8].im;
-    q[2].im = in[ 5].re - in[ 9].re;
-    q[2].re = in[ 5].im - in[ 9].im;
-    q[3].re = in[ 6].im - in[10].im;
-    q[3].im = in[ 6].re - in[10].re;
-
-    q[4].re = in[ 3].re + in[ 7].re;
-    q[4].im = in[ 3].im + in[ 7].im;
-    q[5].re = in[ 4].re + in[ 8].re;
-    q[5].im = in[ 4].im + in[ 8].im;
-    q[6].re = in[ 5].re + in[ 9].re;
-    q[6].im = in[ 5].im + in[ 9].im;
-    q[7].re = in[ 6].re + in[10].re;
-    q[7].im = in[ 6].im + in[10].im;
-
-    y[0].re = in[11].re + q[4].re;
-    y[0].im = in[11].im + q[4].im;
-    y[1].re = in[12].re + q[5].re;
-    y[1].im = in[12].im + q[5].im;
-    y[2].re = in[13].re + q[6].re;
-    y[2].im = in[13].im + q[6].im;
-    y[3].re = in[14].re + q[7].re;
-    y[3].im = in[14].im + q[7].im;
-
-    q[0].re = tab[ 8] * q[0].re;
-    q[0].im = tab[ 9] * q[0].im;
-    q[1].re = tab[ 8] * q[1].re;
-    q[1].im = tab[ 9] * q[1].im;
-    q[2].re = tab[ 8] * q[2].re;
-    q[2].im = tab[ 9] * q[2].im;
-    q[3].re = tab[ 8] * q[3].re;
-    q[3].im = tab[ 9] * q[3].im;
-
-    q[4].re = tab[10] * q[4].re;
-    q[4].im = tab[11] * q[4].im;
-    q[5].re = tab[10] * q[5].re;
-    q[5].im = tab[11] * q[5].im;
-    q[6].re = tab[10] * q[6].re;
-    q[6].im = tab[11] * q[6].im;
-    q[7].re = tab[10] * q[7].re;
-    q[7].im = tab[11] * q[7].im;
-
-    k[0].re = q[4].re - q[0].re;
-    k[0].im = q[4].im - q[0].im;
-    k[1].re = q[5].re - q[1].re;
-    k[1].im = q[5].im - q[1].im;
-    k[2].re = q[6].re - q[2].re;
-    k[2].im = q[6].im - q[2].im;
-    k[3].re = q[7].re - q[3].re;
-    k[3].im = q[7].im - q[3].im;
-
-    k[4].re = q[4].re + q[0].re;
-    k[4].im = q[4].im + q[0].im;
-    k[5].re = q[5].re + q[1].re;
-    k[5].im = q[5].im + q[1].im;
-    k[6].re = q[6].re + q[2].re;
-    k[6].im = q[6].im + q[2].im;
-    k[7].re = q[7].re + q[3].re;
-    k[7].im = q[7].im + q[3].im;
-
-    k[0].re = in[11].re - k[0].re;
-    k[0].im = in[11].im + k[0].im;
-    k[1].re = in[12].re - k[1].re;
-    k[1].im = in[12].im + k[1].im;
-    k[2].re = in[13].re - k[2].re;
-    k[2].im = in[13].im + k[2].im;
-    k[3].re = in[14].re - k[3].re;
-    k[3].im = in[14].im + k[3].im;
-
-    k[4].re = in[11].re - k[4].re;
-    k[4].im = in[11].im + k[4].im;
-    k[5].re = in[12].re - k[5].re;
-    k[5].im = in[12].im + k[5].im;
-    k[6].re = in[13].re - k[6].re;
-    k[6].im = in[13].im + k[6].im;
-    k[7].re = in[14].re - k[7].re;
-    k[7].im = in[14].im + k[7].im;
-
-    /* 15pt start here */
-    t[0].re = y[3].re + y[0].re;
-    t[0].im = y[3].im + y[0].im;
-    t[1].re = y[2].re + y[1].re;
-    t[1].im = y[2].im + y[1].im;
-    t[2].re = y[1].re - y[2].re;
-    t[2].im = y[1].im - y[2].im;
-    t[3].re = y[0].re - y[3].re;
-    t[3].im = y[0].im - y[3].im;
-
-    t[4].re = k[3].re + k[0].re;
-    t[4].im = k[3].im + k[0].im;
-    t[5].re = k[2].re + k[1].re;
-    t[5].im = k[2].im + k[1].im;
-    t[6].re = k[1].re - k[2].re;
-    t[6].im = k[1].im - k[2].im;
-    t[7].re = k[0].re - k[3].re;
-    t[7].im = k[0].im - k[3].im;
-
-    t[ 8].re = k[7].re + k[4].re;
-    t[ 8].im = k[7].im + k[4].im;
-    t[ 9].re = k[6].re + k[5].re;
-    t[ 9].im = k[6].im + k[5].im;
-    t[10].re = k[5].re - k[6].re;
-    t[10].im = k[5].im - k[6].im;
-    t[11].re = k[4].re - k[7].re;
-    t[11].im = k[4].im - k[7].im;
-
-    out[ 0*stride].re = dc[0].re + t[0].re + t[ 1].re;
-    out[ 0*stride].im = dc[0].im + t[0].im + t[ 1].im;
-    out[10*stride].re = dc[1].re + t[4].re + t[ 5].re;
-    out[10*stride].im = dc[1].im + t[4].im + t[ 5].im;
-    out[ 5*stride].re = dc[2].re + t[8].re + t[ 9].re;
-    out[ 5*stride].im = dc[2].im + t[8].im + t[ 9].im;
-
-    r[0].re = t[0].re * tab[0];
-    r[0].im = t[0].im * tab[1];
-    r[1].re = t[1].re * tab[0];
-    r[1].im = t[1].im * tab[1];
-    r[2].re = t[2].re * tab[4];
-    r[2].im = t[2].im * tab[5];
-    r[3].re = t[3].re * tab[4];
-    r[3].im = t[3].im * tab[5];
-
-    r[4].re = t[4].re * tab[0];
-    r[4].im = t[4].im * tab[1];
-    r[5].re = t[5].re * tab[0];
-    r[5].im = t[5].im * tab[1];
-    r[6].re = t[6].re * tab[4];
-    r[6].im = t[6].im * tab[5];
-    r[7].re = t[7].re * tab[4];
-    r[7].im = t[7].im * tab[5];
-
-    r[ 8].re = t[ 8].re * tab[0];
-    r[ 8].im = t[ 8].im * tab[1];
-    r[ 9].re = t[ 9].re * tab[0];
-    r[ 9].im = t[ 9].im * tab[1];
-    r[10].re = t[10].re * tab[4];
-    r[10].im = t[10].im * tab[5];
-    r[11].re = t[11].re * tab[4];
-    r[11].im = t[11].im * tab[5];
-
-    t[0].re = t[0].re * tab[2];
-    t[0].im = t[0].im * tab[3];
-    t[1].re = t[1].re * tab[2];
-    t[1].im = t[1].im * tab[3];
-    t[2].re = t[2].re * tab[6];
-    t[2].im = t[2].im * tab[7];
-    t[3].re = t[3].re * tab[6];
-    t[3].im = t[3].im * tab[7];
-
-    t[4].re = t[4].re * tab[2];
-    t[4].im = t[4].im * tab[3];
-    t[5].re = t[5].re * tab[2];
-    t[5].im = t[5].im * tab[3];
-    t[6].re = t[6].re * tab[6];
-    t[6].im = t[6].im * tab[7];
-    t[7].re = t[7].re * tab[6];
-    t[7].im = t[7].im * tab[7];
-
-    t[ 8].re = t[ 8].re * tab[2];
-    t[ 8].im = t[ 8].im * tab[3];
-    t[ 9].re = t[ 9].re * tab[2];
-    t[ 9].im = t[ 9].im * tab[3];
-    t[10].re = t[10].re * tab[6];
-    t[10].im = t[10].im * tab[7];
-    t[11].re = t[11].re * tab[6];
-    t[11].im = t[11].im * tab[7];
-
-    r[0].re = r[0].re - t[1].re;
-    r[0].im = r[0].im - t[1].im;
-    r[1].re = r[1].re - t[0].re;
-    r[1].im = r[1].im - t[0].im;
-    r[2].re = r[2].re - t[3].re;
-    r[2].im = r[2].im - t[3].im;
-    r[3].re = r[3].re + t[2].re;
-    r[3].im = r[3].im + t[2].im;
-
-    r[4].re = r[4].re - t[5].re;
-    r[4].im = r[4].im - t[5].im;
-    r[5].re = r[5].re - t[4].re;
-    r[5].im = r[5].im - t[4].im;
-    r[6].re = r[6].re - t[7].re;
-    r[6].im = r[6].im - t[7].im;
-    r[7].re = r[7].re + t[6].re;
-    r[7].im = r[7].im + t[6].im;
-
-    r[ 8].re = r[ 8].re - t[ 9].re;
-    r[ 8].im = r[ 8].im - t[ 9].im;
-    r[ 9].re = r[ 9].re - t[ 8].re;
-    r[ 9].im = r[ 9].im - t[ 8].im;
-    r[10].re = r[10].re - t[11].re;
-    r[10].im = r[10].im - t[11].im;
-    r[11].re = r[11].re + t[10].re;
-    r[11].im = r[11].im + t[10].im;
-
-    z0[ 0].re = r[ 3].im + r[ 0].re;
-    z0[ 0].im = r[ 3].re + r[ 0].im;
-    z0[ 1].re = r[ 2].im + r[ 1].re;
-    z0[ 1].im = r[ 2].re + r[ 1].im;
-    z0[ 2].re = r[ 1].im - r[ 2].re;
-    z0[ 2].im = r[ 1].re - r[ 2].im;
-    z0[ 3].re = r[ 0].im - r[ 3].re;
-    z0[ 3].im = r[ 0].re - r[ 3].im;
-
-    z0[ 4].re = r[ 7].im + r[ 4].re;
-    z0[ 4].im = r[ 7].re + r[ 4].im;
-    z0[ 5].re = r[ 6].im + r[ 5].re;
-    z0[ 5].im = r[ 6].re + r[ 5].im;
-    z0[ 6].re = r[ 5].im - r[ 6].re;
-    z0[ 6].im = r[ 5].re - r[ 6].im;
-    z0[ 7].re = r[ 4].im - r[ 7].re;
-    z0[ 7].im = r[ 4].re - r[ 7].im;
-
-    z0[ 8].re = r[11].im + r[ 8].re;
-    z0[ 8].im = r[11].re + r[ 8].im;
-    z0[ 9].re = r[10].im + r[ 9].re;
-    z0[ 9].im = r[10].re + r[ 9].im;
-    z0[10].re = r[ 9].im - r[10].re;
-    z0[10].im = r[ 9].re - r[10].im;
-    z0[11].re = r[ 8].im - r[11].re;
-    z0[11].im = r[ 8].re - r[11].im;
-
-    out[ 6*stride].re = dc[0].re + z0[0].re;
-    out[ 6*stride].im = dc[0].im + z0[3].re;
-    out[12*stride].re = dc[0].re + z0[2].im;
-    out[12*stride].im = dc[0].im + z0[1].im;
-    out[ 3*stride].re = dc[0].re + z0[1].re;
-    out[ 3*stride].im = dc[0].im + z0[2].re;
-    out[ 9*stride].re = dc[0].re + z0[3].im;
-    out[ 9*stride].im = dc[0].im + z0[0].im;
-
-    out[ 1*stride].re = dc[1].re + z0[4].re;
-    out[ 1*stride].im = dc[1].im + z0[7].re;
-    out[ 7*stride].re = dc[1].re + z0[6].im;
-    out[ 7*stride].im = dc[1].im + z0[5].im;
-    out[13*stride].re = dc[1].re + z0[5].re;
-    out[13*stride].im = dc[1].im + z0[6].re;
-    out[ 4*stride].re = dc[1].re + z0[7].im;
-    out[ 4*stride].im = dc[1].im + z0[4].im;
-
-    out[11*stride].re = dc[2].re + z0[8].re;
-    out[11*stride].im = dc[2].im + z0[11].re;
-    out[ 2*stride].re = dc[2].re + z0[10].im;
-    out[ 2*stride].im = dc[2].im + z0[9].im;
-    out[ 8*stride].re = dc[2].re + z0[9].re;
-    out[ 8*stride].im = dc[2].im + z0[10].re;
-    out[14*stride].re = dc[2].re + z0[11].im;
-    out[14*stride].im = dc[2].im + z0[8].im;
-}
-```

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,22 +713,8 @@ 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
-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 hexadecagonal
 FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR
 @item downmix
@@ -815,7 +799,7 @@ Compute arcsine of @var{x}.
 @item atan(x)
 Compute arctangent of @var{x}.
 
-@item atan2(y, x)
+@item atan2(x, y)
 Compute principal value of the arc tangent of @var{y}/@var{x}.
 
 @item between(x, min, max)
@@ -939,15 +923,9 @@ Returns the value of the expression printed.
 
 Prints t with loglevel l
 
-@item random(idx)
-Return a pseudo random value between 0.0 and 1.0. @var{idx} is the
-index of the internal variable which will be used to save the
-seed/state.
-
-@item randomi(idx, min, max)
-Return a pseudo random value in the interval between @var{min} and
-@var{max}. @var{idx} is the index of the internal variable which will
-be used to save the seed/state.
+@item random(x)
+Return a pseudo random value between 0.0 and 1.0. @var{x} is the index of the
+internal variable which will be used to save the seed/state.
 
 @item root(expr, max)
 Find an input value for which the function represented by @var{expr}
@@ -1095,13 +1073,13 @@ indication of the corresponding powers of 10 and of 2.
 @item T
 10^12 / 2^40
 @item P
-10^15 / 2^50
+10^15 / 2^40
 @item E
-10^18 / 2^60
+10^18 / 2^50
 @item Z
-10^21 / 2^70
+10^21 / 2^60
 @item Y
-10^24 / 2^80
+10^24 / 2^70
 @end table
 
 @c man end EXPRESSION EVALUATION

ffbuild/arch.mak

@@ -15,8 +15,5 @@ OBJS-$(HAVE_LASX)      += $(LASX-OBJS)       $(LASX-OBJS-yes)
 OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
 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_MMX)     += $(MMX-OBJS)     $(MMX-OBJS-yes)
 OBJS-$(HAVE_X86ASM)  += $(X86ASM-OBJS)  $(X86ASM-OBJS-yes)

ffbuild/common.mak

@@ -130,7 +130,7 @@ $(BIN2CEXE): ffbuild/bin2c_host.o
 ifdef CONFIG_PTX_COMPRESSION
 %.ptx.gz: TAG = GZIP
 %.ptx.gz: %.ptx
-	$(M)gzip -nc9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@
+	$(M)gzip -c9 $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) >$@
 
 %.ptx.c: %.ptx.gz $(BIN2CEXE)
 	$(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@)))
@@ -140,7 +140,7 @@ else
 endif
 
 clean::
-	$(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
+	$(RM) $(BIN2CEXE)
 
 %.c %.h %.pc %.ver %.version: TAG = GEN
 

fftools/Makefile

@@ -10,26 +10,13 @@ ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
 ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
 
 OBJS-ffmpeg +=                  \
-    fftools/ffmpeg_dec.o        \
-    fftools/ffmpeg_demux.o      \
-    fftools/ffmpeg_enc.o        \
     fftools/ffmpeg_filter.o     \
     fftools/ffmpeg_hw.o         \
     fftools/ffmpeg_mux.o        \
-    fftools/ffmpeg_mux_init.o   \
     fftools/ffmpeg_opt.o        \
-    fftools/ffmpeg_sched.o      \
-    fftools/objpool.o           \
-    fftools/sync_queue.o        \
-    fftools/thread_queue.o      \
-
-OBJS-ffplay += fftools/ffplay_renderer.o
 
 define DOFFTOOL
 OBJS-$(1) += fftools/cmdutils.o fftools/opt_common.o fftools/$(1).o $(OBJS-$(1)-yes)
-ifdef HAVE_GNU_WINDRES
-OBJS-$(1) += fftools/fftoolsres.o
-endif
 $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
 $$(OBJS-$(1)): | fftools
 $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))

fftools/cmdutils.c

@@ -37,7 +37,6 @@
 #include "libswresample/swresample.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
-#include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/display.h"
 #include "libavutil/getenv_utf8.h"
@@ -84,8 +83,23 @@ void init_dynload(void)
 #endif
 }
 
-int parse_number(const char *context, const char *numstr, enum OptionType type,
-                 double min, double max, double *dst)
+static void (*program_exit)(int ret);
+
+void register_exit(void (*cb)(int ret))
+{
+    program_exit = cb;
+}
+
+void exit_program(int ret)
+{
+    if (program_exit)
+        program_exit(ret);
+
+    exit(ret);
+}
+
+double parse_number_or_die(const char *context, const char *numstr, int type,
+                           double min, double max)
 {
     char *tail;
     const char *error;
@@ -94,21 +108,31 @@ int parse_number(const char *context, const char *numstr, enum OptionType type,
         error = "Expected number for %s but found: %s\n";
     else if (d < min || d > max)
         error = "The value for %s was %s which is not within %f - %f\n";
-    else if (type == OPT_TYPE_INT64 && (int64_t)d != d)
+    else if (type == OPT_INT64 && (int64_t)d != d)
         error = "Expected int64 for %s but found %s\n";
-    else if (type == OPT_TYPE_INT && (int)d != d)
+    else if (type == OPT_INT && (int)d != d)
         error = "Expected int for %s but found %s\n";
-    else {
-        *dst = d;
-        return 0;
-    }
-
+    else
+        return d;
     av_log(NULL, AV_LOG_FATAL, error, context, numstr, min, max);
-    return AVERROR(EINVAL);
+    exit_program(1);
+    return 0;
+}
+
+int64_t parse_time_or_die(const char *context, const char *timestr,
+                          int is_duration)
+{
+    int64_t us;
+    if (av_parse_time(&us, timestr, is_duration) < 0) {
+        av_log(NULL, AV_LOG_FATAL, "Invalid %s specification for %s: %s\n",
+               is_duration ? "duration" : "date", context, timestr);
+        exit_program(1);
+    }
+    return us;
 }
 
 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
-                       int rej_flags)
+                       int rej_flags, int alt_flags)
 {
     const OptionDef *po;
     int first;
@@ -118,6 +142,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
         char buf[128];
 
         if (((po->flags & req_flags) != req_flags) ||
+            (alt_flags && !(po->flags & alt_flags)) ||
             (po->flags & rej_flags))
             continue;
 
@@ -126,15 +151,10 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
             first = 0;
         }
         av_strlcpy(buf, po->name, sizeof(buf));
-
-        if (po->flags & OPT_FLAG_PERSTREAM)
-            av_strlcat(buf, "[:<stream_spec>]", sizeof(buf));
-        else if (po->flags & OPT_FLAG_SPEC)
-            av_strlcat(buf, "[:<spec>]", sizeof(buf));
-
-        if (po->argname)
-            av_strlcatf(buf, sizeof(buf), " <%s>", po->argname);
-
+        if (po->argname) {
+            av_strlcat(buf, " ", sizeof(buf));
+            av_strlcat(buf, po->argname, sizeof(buf));
+        }
         printf("-%-17s  %s\n", buf, po->help);
     }
     printf("\n");
@@ -155,9 +175,6 @@ void show_help_children(const AVClass *class, int flags)
 
 static const OptionDef *find_option(const OptionDef *po, const char *name)
 {
-    if (*name == '/')
-        name++;
-
     while (po->name) {
         const char *end;
         if (av_strstart(name, po->name, &end) && (!*end || *end == ':'))
@@ -231,138 +248,59 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)
 }
 #endif /* HAVE_COMMANDLINETOARGVW */
 
-static int opt_has_arg(const OptionDef *o)
-{
-    if (o->type == OPT_TYPE_BOOL)
-        return 0;
-    if (o->type == OPT_TYPE_FUNC)
-        return !!(o->flags & OPT_FUNC_ARG);
-    return 1;
-}
-
 static int write_option(void *optctx, const OptionDef *po, const char *opt,
-                        const char *arg, const OptionDef *defs)
+                        const char *arg)
 {
     /* new-style options contain an offset into optctx, old-style address of
      * a global var*/
-    void *dst = po->flags & OPT_FLAG_OFFSET ?
+    void *dst = po->flags & (OPT_OFFSET | OPT_SPEC) ?
                 (uint8_t *)optctx + po->u.off : po->u.dst_ptr;
-    char *arg_allocated = NULL;
+    int *dstcount;
 
-    SpecifierOptList *sol = NULL;
-    double num;
-    int ret = 0;
-
-    if (*opt == '/') {
-        opt++;
-
-        if (po->type == OPT_TYPE_BOOL) {
-            av_log(NULL, AV_LOG_FATAL,
-                   "Requested to load an argument from file for a bool option '%s'\n",
-                   po->name);
-            return AVERROR(EINVAL);
-        }
-
-        arg_allocated = file_read(arg);
-        if (!arg_allocated) {
-            av_log(NULL, AV_LOG_FATAL,
-                   "Error reading the value for option '%s' from file: %s\n",
-                   opt, arg);
-            return AVERROR(EINVAL);
-        }
-
-        arg = arg_allocated;
-    }
-
-    if (po->flags & OPT_FLAG_SPEC) {
+    if (po->flags & OPT_SPEC) {
+        SpecifierOpt **so = dst;
         char *p = strchr(opt, ':');
         char *str;
 
-        sol = dst;
-        ret = GROW_ARRAY(sol->opt, sol->nb_opt);
-        if (ret < 0)
-            goto finish;
-
+        dstcount = (int *)(so + 1);
+        *so = grow_array(*so, sizeof(**so), dstcount, *dstcount + 1);
         str = av_strdup(p ? p + 1 : "");
-        if (!str) {
-            ret = AVERROR(ENOMEM);
-            goto finish;
-        }
-        sol->opt[sol->nb_opt - 1].specifier = str;
-        dst = &sol->opt[sol->nb_opt - 1].u;
+        if (!str)
+            return AVERROR(ENOMEM);
+        (*so)[*dstcount - 1].specifier = str;
+        dst = &(*so)[*dstcount - 1].u;
     }
 
-    if (po->type == OPT_TYPE_STRING) {
+    if (po->flags & OPT_STRING) {
         char *str;
-        if (arg_allocated) {
-            str           = arg_allocated;
-            arg_allocated = NULL;
-        } else
-            str = av_strdup(arg);
+        str = av_strdup(arg);
         av_freep(dst);
-
-        if (!str) {
-            ret = AVERROR(ENOMEM);
-            goto finish;
-        }
-
+        if (!str)
+            return AVERROR(ENOMEM);
         *(char **)dst = str;
-    } else if (po->type == OPT_TYPE_BOOL || po->type == OPT_TYPE_INT) {
-        ret = parse_number(opt, arg, OPT_TYPE_INT64, INT_MIN, INT_MAX, &num);
-        if (ret < 0)
-            goto finish;
-
-        *(int *)dst = num;
-    } else if (po->type == OPT_TYPE_INT64) {
-        ret = parse_number(opt, arg, OPT_TYPE_INT64, INT64_MIN, INT64_MAX, &num);
-        if (ret < 0)
-            goto finish;
-
-        *(int64_t *)dst = num;
-    } else if (po->type == OPT_TYPE_TIME) {
-        ret = av_parse_time(dst, arg, 1);
-        if (ret < 0) {
-            av_log(NULL, AV_LOG_ERROR, "Invalid duration for option %s: %s\n",
-                   opt, arg);
-            goto finish;
-        }
-    } else if (po->type == OPT_TYPE_FLOAT) {
-        ret = parse_number(opt, arg, OPT_TYPE_FLOAT, -INFINITY, INFINITY, &num);
-        if (ret < 0)
-            goto finish;
-
-        *(float *)dst = num;
-    } else if (po->type == OPT_TYPE_DOUBLE) {
-        ret = parse_number(opt, arg, OPT_TYPE_DOUBLE, -INFINITY, INFINITY, &num);
-        if (ret < 0)
-            goto finish;
-
-        *(double *)dst = num;
-    } else {
-        av_assert0(po->type == OPT_TYPE_FUNC && po->u.func_arg);
-
-        ret = po->u.func_arg(optctx, opt, arg);
+    } else if (po->flags & OPT_BOOL || po->flags & OPT_INT) {
+        *(int *)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
+    } else if (po->flags & OPT_INT64) {
+        *(int64_t *)dst = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);
+    } else if (po->flags & OPT_TIME) {
+        *(int64_t *)dst = parse_time_or_die(opt, arg, 1);
+    } else if (po->flags & OPT_FLOAT) {
+        *(float *)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);
+    } else if (po->flags & OPT_DOUBLE) {
+        *(double *)dst = parse_number_or_die(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY);
+    } else if (po->u.func_arg) {
+        int ret = po->u.func_arg(optctx, opt, arg);
         if (ret < 0) {
             av_log(NULL, AV_LOG_ERROR,
                    "Failed to set value '%s' for option '%s': %s\n",
                    arg, opt, av_err2str(ret));
-            goto finish;
+            return ret;
         }
     }
-    if (po->flags & OPT_EXIT) {
-        ret = AVERROR_EXIT;
-        goto finish;
-    }
+    if (po->flags & OPT_EXIT)
+        exit_program(0);
 
-    if (sol) {
-        sol->type = po->type;
-        sol->opt_canon = (po->flags & OPT_HAS_CANON) ?
-                         find_option(defs, po->u1.name_canon) : po;
-    }
-
-finish:
-    av_freep(&arg_allocated);
-    return ret;
+    return 0;
 }
 
 int parse_option(void *optctx, const char *opt, const char *arg,
@@ -370,8 +308,7 @@ int parse_option(void *optctx, const char *opt, const char *arg,
 {
     static const OptionDef opt_avoptions = {
         .name       = "AVOption passthrough",
-        .type       = OPT_TYPE_FUNC,
-        .flags      = OPT_FUNC_ARG,
+        .flags      = HAS_ARG,
         .u.func_arg = opt_default,
     };
 
@@ -382,9 +319,9 @@ int parse_option(void *optctx, const char *opt, const char *arg,
     if (!po->name && opt[0] == 'n' && opt[1] == 'o') {
         /* handle 'no' bool option */
         po = find_option(options, opt + 2);
-        if ((po->name && po->type == OPT_TYPE_BOOL))
+        if ((po->name && (po->flags & OPT_BOOL)))
             arg = "0";
-    } else if (po->type == OPT_TYPE_BOOL)
+    } else if (po->flags & OPT_BOOL)
         arg = "1";
 
     if (!po->name)
@@ -393,20 +330,20 @@ int parse_option(void *optctx, const char *opt, const char *arg,
         av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
         return AVERROR(EINVAL);
     }
-    if (opt_has_arg(po) && !arg) {
+    if (po->flags & HAS_ARG && !arg) {
         av_log(NULL, AV_LOG_ERROR, "Missing argument for option '%s'\n", opt);
         return AVERROR(EINVAL);
     }
 
-    ret = write_option(optctx, po, opt, arg, options);
+    ret = write_option(optctx, po, opt, arg);
     if (ret < 0)
         return ret;
 
-    return opt_has_arg(po);
+    return !!(po->flags & HAS_ARG);
 }
 
-int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
-                  int (*parse_arg_function)(void *, const char*))
+void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
+                   void (*parse_arg_function)(void *, const char*))
 {
     const char *opt;
     int optindex, handleoptions = 1, ret;
@@ -427,21 +364,16 @@ int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
             opt++;
 
             if ((ret = parse_option(optctx, opt, argv[optindex], options)) < 0)
-                return ret;
+                exit_program(1);
             optindex += ret;
         } else {
-            if (parse_arg_function) {
-                ret = parse_arg_function(optctx, opt);
-                if (ret < 0)
-                    return ret;
-            }
+            if (parse_arg_function)
+                parse_arg_function(optctx, opt);
         }
     }
-
-    return 0;
 }
 
-int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs)
+int parse_optgroup(void *optctx, OptionGroup *g)
 {
     int i, ret;
 
@@ -464,7 +396,7 @@ int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs)
         av_log(NULL, AV_LOG_DEBUG, "Applying option %s (%s) with argument %s.\n",
                o->key, o->opt->help, o->val);
 
-        ret = write_option(optctx, o->opt, o->key, o->val, defs);
+        ret = write_option(optctx, o->opt, o->key, o->val);
         if (ret < 0)
             return ret;
     }
@@ -494,7 +426,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
              (po->name && !strcmp(optname, po->name)))
             return i;
 
-        if (!po->name || opt_has_arg(po))
+        if (!po->name || po->flags & HAS_ARG)
             i++;
     }
     return 0;
@@ -528,14 +460,7 @@ static void check_options(const OptionDef *po)
 {
     while (po->name) {
         if (po->flags & OPT_PERFILE)
-            av_assert0(po->flags & (OPT_INPUT | OPT_OUTPUT | OPT_DECODER));
-
-        if (po->type == OPT_TYPE_FUNC)
-            av_assert0(!(po->flags & (OPT_FLAG_OFFSET | OPT_FLAG_SPEC)));
-
-        // OPT_FUNC_ARG can only be ser for OPT_TYPE_FUNC
-        av_assert0((po->type == OPT_TYPE_FUNC) || !(po->flags & OPT_FUNC_ARG));
-
+            av_assert0(po->flags & (OPT_INPUT | OPT_OUTPUT));
         po++;
     }
 }
@@ -674,17 +599,13 @@ static int match_group_separator(const OptionGroupDef *groups, int nb_groups,
  * @param group_idx which group definition should this group belong to
  * @param arg argument of the group delimiting option
  */
-static int finish_group(OptionParseContext *octx, int group_idx,
-                        const char *arg)
+static void finish_group(OptionParseContext *octx, int group_idx,
+                         const char *arg)
 {
     OptionGroupList *l = &octx->groups[group_idx];
     OptionGroup *g;
-    int ret;
-
-    ret = GROW_ARRAY(l->groups, l->nb_groups);
-    if (ret < 0)
-        return ret;
 
+    GROW_ARRAY(l->groups, l->nb_groups);
     g = &l->groups[l->nb_groups - 1];
 
     *g             = octx->cur_group;
@@ -701,51 +622,41 @@ static int finish_group(OptionParseContext *octx, int group_idx,
     swr_opts    = NULL;
 
     memset(&octx->cur_group, 0, sizeof(octx->cur_group));
-
-    return ret;
 }
 
 /*
  * Add an option instance to currently parsed group.
  */
-static int add_opt(OptionParseContext *octx, const OptionDef *opt,
-                   const char *key, const char *val)
+static void add_opt(OptionParseContext *octx, const OptionDef *opt,
+                    const char *key, const char *val)
 {
-    int global = !(opt->flags & OPT_PERFILE);
+    int global = !(opt->flags & (OPT_PERFILE | OPT_SPEC | OPT_OFFSET));
     OptionGroup *g = global ? &octx->global_opts : &octx->cur_group;
-    int ret;
-
-    ret = GROW_ARRAY(g->opts, g->nb_opts);
-    if (ret < 0)
-        return ret;
 
+    GROW_ARRAY(g->opts, g->nb_opts);
     g->opts[g->nb_opts - 1].opt = opt;
     g->opts[g->nb_opts - 1].key = key;
     g->opts[g->nb_opts - 1].val = val;
-
-    return 0;
 }
 
-static int init_parse_context(OptionParseContext *octx,
-                              const OptionGroupDef *groups, int nb_groups)
+static void init_parse_context(OptionParseContext *octx,
+                               const OptionGroupDef *groups, int nb_groups)
 {
     static const OptionGroupDef global_group = { "global" };
     int i;
 
     memset(octx, 0, sizeof(*octx));
 
-    octx->groups    = av_calloc(nb_groups, sizeof(*octx->groups));
-    if (!octx->groups)
-        return AVERROR(ENOMEM);
     octx->nb_groups = nb_groups;
+    octx->groups    = av_calloc(octx->nb_groups, sizeof(*octx->groups));
+    if (!octx->groups)
+        exit_program(1);
 
     for (i = 0; i < octx->nb_groups; i++)
         octx->groups[i].group_def = &groups[i];
 
     octx->global_opts.group_def = &global_group;
     octx->global_opts.arg       = "";
-
-    return 0;
 }
 
 void uninit_parse_context(OptionParseContext *octx)
@@ -777,23 +688,19 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
                       const OptionDef *options,
                       const OptionGroupDef *groups, int nb_groups)
 {
-    int ret;
     int optindex = 1;
     int dashdash = -2;
 
     /* perform system-dependent conversions for arguments list */
     prepare_app_arguments(&argc, &argv);
 
-    ret = init_parse_context(octx, groups, nb_groups);
-    if (ret < 0)
-        return ret;
-
+    init_parse_context(octx, groups, nb_groups);
     av_log(NULL, AV_LOG_DEBUG, "Splitting the commandline.\n");
 
     while (optindex < argc) {
         const char *opt = argv[optindex++], *arg;
         const OptionDef *po;
-        int ret, group_idx;
+        int ret;
 
         av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt);
 
@@ -803,10 +710,7 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[],
         }
         /* unnamed group separators, e.g. output filename */
         if (opt[0] != '-' || !opt[1] || dashdash+1 == optindex) {
-            ret = finish_group(octx, 0, opt);
-            if (ret < 0)
-                return ret;
-
+            finish_group(octx, 0, opt);
             av_log(NULL, AV_LOG_DEBUG, " matched as %s.\n", groups[0].name);
             continue;
         }
@@ -822,15 +726,11 @@ do {                                                                           \
 } while (0)
 
         /* named group separators, e.g. -i */
-        group_idx = match_group_separator(groups, nb_groups, opt);
-        if (group_idx >= 0) {
+        if ((ret = match_group_separator(groups, nb_groups, opt)) >= 0) {
             GET_ARG(arg);
-            ret = finish_group(octx, group_idx, arg);
-            if (ret < 0)
-                return ret;
-
+            finish_group(octx, ret, arg);
             av_log(NULL, AV_LOG_DEBUG, " matched as %s with argument '%s'.\n",
-                   groups[group_idx].name, arg);
+                   groups[ret].name, arg);
             continue;
         }
 
@@ -840,16 +740,13 @@ do {                                                                           \
             if (po->flags & OPT_EXIT) {
                 /* optional argument, e.g. -h */
                 arg = argv[optindex++];
-            } else if (opt_has_arg(po)) {
+            } else if (po->flags & HAS_ARG) {
                 GET_ARG(arg);
             } else {
                 arg = "1";
             }
 
-            ret = add_opt(octx, po, opt, arg);
-            if (ret < 0)
-                return ret;
-
+            add_opt(octx, po, opt, arg);
             av_log(NULL, AV_LOG_DEBUG, " matched as option '%s' (%s) with "
                    "argument '%s'.\n", po->name, po->help, arg);
             continue;
@@ -873,11 +770,8 @@ do {                                                                           \
         /* boolean -nofoo options */
         if (opt[0] == 'n' && opt[1] == 'o' &&
             (po = find_option(options, opt + 2)) &&
-            po->name && po->type == OPT_TYPE_BOOL) {
-            ret = add_opt(octx, po, opt, "0");
-            if (ret < 0)
-                return ret;
-
+            po->name && po->flags & OPT_BOOL) {
+            add_opt(octx, po, opt, "0");
             av_log(NULL, AV_LOG_DEBUG, " matched as option '%s' (%s) with "
                    "argument 0.\n", po->name, po->help);
             continue;
@@ -896,6 +790,16 @@ do {                                                                           \
     return 0;
 }
 
+void print_error(const char *filename, int err)
+{
+    char errbuf[128];
+    const char *errbuf_ptr = errbuf;
+
+    if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
+        errbuf_ptr = strerror(AVUNERROR(err));
+    av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
+}
+
 int read_yesno(void)
 {
     int c = getchar();
@@ -987,9 +891,8 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec)
     return ret;
 }
 
-int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
-                      AVFormatContext *s, AVStream *st, const AVCodec *codec,
-                      AVDictionary **dst)
+AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id,
+                                AVFormatContext *s, AVStream *st, const AVCodec *codec)
 {
     AVDictionary    *ret = NULL;
     const AVDictionaryEntry *t = NULL;
@@ -1017,21 +920,17 @@ int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
         break;
     }
 
-    while (t = av_dict_iterate(opts, t)) {
+    while (t = av_dict_get(opts, "", t, AV_DICT_IGNORE_SUFFIX)) {
         const AVClass *priv_class;
         char *p = strchr(t->key, ':');
 
         /* check stream specification in opt name */
-        if (p) {
-            int err = check_stream_specifier(s, st, p + 1);
-            if (err < 0) {
-                av_dict_free(&ret);
-                return err;
-            } else if (!err)
-                continue;
-
-            *p = 0;
-        }
+        if (p)
+            switch (check_stream_specifier(s, st, p + 1)) {
+            case  1: *p = 0; break;
+            case  0:         continue;
+            default:         exit_program(1);
+            }
 
         if (av_opt_find(&cc, t->key, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ) ||
             !codec ||
@@ -1047,58 +946,46 @@ int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
         if (p)
             *p = ':';
     }
-
-    *dst = ret;
-    return 0;
-}
-
-int setup_find_stream_info_opts(AVFormatContext *s,
-                                AVDictionary *codec_opts,
-                                AVDictionary ***dst)
-{
-    int ret;
-    AVDictionary **opts;
-
-    *dst = NULL;
-
-    if (!s->nb_streams)
-        return 0;
-
-    opts = av_calloc(s->nb_streams, sizeof(*opts));
-    if (!opts)
-        return AVERROR(ENOMEM);
-
-    for (int i = 0; i < s->nb_streams; i++) {
-        ret = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id,
-                                s, s->streams[i], NULL, &opts[i]);
-        if (ret < 0)
-            goto fail;
-    }
-    *dst = opts;
-    return 0;
-fail:
-    for (int i = 0; i < s->nb_streams; i++)
-        av_dict_free(&opts[i]);
-    av_freep(&opts);
     return ret;
 }
 
-int grow_array(void **array, int elem_size, int *size, int new_size)
+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
+                                           AVDictionary *codec_opts)
+{
+    int i;
+    AVDictionary **opts;
+
+    if (!s->nb_streams)
+        return NULL;
+    opts = av_calloc(s->nb_streams, sizeof(*opts));
+    if (!opts) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Could not alloc memory for stream options.\n");
+        exit_program(1);
+    }
+    for (i = 0; i < s->nb_streams; i++)
+        opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id,
+                                    s, s->streams[i], NULL);
+    return opts;
+}
+
+void *grow_array(void *array, int elem_size, int *size, int new_size)
 {
     if (new_size >= INT_MAX / elem_size) {
         av_log(NULL, AV_LOG_ERROR, "Array too big.\n");
-        return AVERROR(ERANGE);
+        exit_program(1);
     }
     if (*size < new_size) {
-        uint8_t *tmp = av_realloc_array(*array, new_size, elem_size);
-        if (!tmp)
-            return AVERROR(ENOMEM);
+        uint8_t *tmp = av_realloc_array(array, new_size, elem_size);
+        if (!tmp) {
+            av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n");
+            exit_program(1);
+        }
         memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
         *size = new_size;
-        *array = tmp;
-        return 0;
+        return tmp;
     }
-    return 0;
+    return array;
 }
 
 void *allocate_array_elem(void *ptr, size_t elem_size, int *nb_elems)
@@ -1106,16 +993,18 @@ void *allocate_array_elem(void *ptr, size_t elem_size, int *nb_elems)
     void *new_elem;
 
     if (!(new_elem = av_mallocz(elem_size)) ||
-        av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0)
-        return NULL;
+        av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n");
+        exit_program(1);
+    }
     return new_elem;
 }
 
-double get_rotation(const int32_t *displaymatrix)
+double get_rotation(int32_t *displaymatrix)
 {
     double theta = 0;
     if (displaymatrix)
-        theta = -round(av_display_rotation_get(displaymatrix));
+        theta = -round(av_display_rotation_get((int32_t*) displaymatrix));
 
     theta -= 360*floor(theta/360 + 0.9/360);
 
@@ -1127,29 +1016,3 @@ double get_rotation(const int32_t *displaymatrix)
 
     return theta;
 }
-
-/* read file contents into a string */
-char *file_read(const char *filename)
-{
-    AVIOContext *pb      = NULL;
-    int ret = avio_open(&pb, filename, AVIO_FLAG_READ);
-    AVBPrint bprint;
-    char *str;
-
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename);
-        return NULL;
-    }
-
-    av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED);
-    ret = avio_read_to_bprint(pb, &bprint, SIZE_MAX);
-    avio_closep(&pb);
-    if (ret < 0) {
-        av_bprint_finalize(&bprint, NULL);
-        return NULL;
-    }
-    ret = av_bprint_finalize(&bprint, &str);
-    if (ret < 0)
-        return NULL;
-    return str;
-}

fftools/cmdutils.h

@@ -49,6 +49,16 @@ extern AVDictionary *swr_opts;
 extern AVDictionary *format_opts, *codec_opts;
 extern int hide_banner;
 
+/**
+ * Register a program-specific cleanup routine.
+ */
+void register_exit(void (*cb)(int ret));
+
+/**
+ * Wraps exit with a program-specific cleanup routine.
+ */
+void exit_program(int ret) av_noreturn;
+
 /**
  * Initialize dynamic library loading
  */
@@ -77,19 +87,10 @@ int opt_default(void *optctx, const char *opt, const char *arg);
  */
 int opt_timelimit(void *optctx, const char *opt, const char *arg);
 
-enum OptionType {
-    OPT_TYPE_FUNC,
-    OPT_TYPE_BOOL,
-    OPT_TYPE_STRING,
-    OPT_TYPE_INT,
-    OPT_TYPE_INT64,
-    OPT_TYPE_FLOAT,
-    OPT_TYPE_DOUBLE,
-    OPT_TYPE_TIME,
-};
-
 /**
  * Parse a string and return its corresponding value as a double.
+ * Exit from the application if the string cannot be correctly
+ * parsed or the corresponding value is invalid.
  *
  * @param context the context of the value to be set (e.g. the
  * corresponding command line option name)
@@ -99,8 +100,25 @@ enum OptionType {
  * @param min the minimum valid accepted value
  * @param max the maximum valid accepted value
  */
-int parse_number(const char *context, const char *numstr, enum OptionType type,
-                 double min, double max, double *dst);
+double parse_number_or_die(const char *context, const char *numstr, int type,
+                           double min, double max);
+
+/**
+ * Parse a string specifying a time and return its corresponding
+ * value as a number of microseconds. Exit from the application if
+ * the string cannot be correctly parsed.
+ *
+ * @param context the context of the value to be set (e.g. the
+ * corresponding command line option name)
+ * @param timestr the string to be parsed
+ * @param is_duration a flag which tells how to interpret timestr, if
+ * not zero timestr is interpreted as a duration, otherwise as a
+ * date
+ *
+ * @see av_parse_time()
+ */
+int64_t parse_time_or_die(const char *context, const char *timestr,
+                          int is_duration);
 
 typedef struct SpecifierOpt {
     char *specifier;    /**< stream/chapter/program/... specifier */
@@ -114,70 +132,31 @@ typedef struct SpecifierOpt {
     } u;
 } SpecifierOpt;
 
-typedef struct SpecifierOptList {
-    SpecifierOpt    *opt;
-    int           nb_opt;
-
-    /* Canonical option definition that was parsed into this list. */
-    const struct OptionDef *opt_canon;
-    enum OptionType type;
-} SpecifierOptList;
-
 typedef struct OptionDef {
     const char *name;
-    enum OptionType type;
     int flags;
-
-/* The OPT_TYPE_FUNC option takes an argument.
- * Must not be used with other option types, as for those it holds:
- * - OPT_TYPE_BOOL do not take an argument
- * - all other types do
- */
-#define OPT_FUNC_ARG    (1 << 0)
-/* Program will immediately exit after processing this option */
-#define OPT_EXIT        (1 << 1)
-/* Option is intended for advanced users. Only affects
- * help output.
- */
-#define OPT_EXPERT      (1 << 2)
-#define OPT_VIDEO       (1 << 3)
-#define OPT_AUDIO       (1 << 4)
-#define OPT_SUBTITLE    (1 << 5)
-#define OPT_DATA        (1 << 6)
-/* The option is per-file (currently ffmpeg-only). At least one of OPT_INPUT,
- * OPT_OUTPUT, OPT_DECODER must be set when this flag is in use.
-   */
-#define OPT_PERFILE     (1 << 7)
-
-/* Option is specified as an offset in a passed optctx.
- * Always use as OPT_OFFSET in option definitions. */
-#define OPT_FLAG_OFFSET (1 << 8)
-#define OPT_OFFSET      (OPT_FLAG_OFFSET | OPT_PERFILE)
-
-/* Option is to be stored in a SpecifierOptList.
-   Always use as OPT_SPEC in option definitions. */
-#define OPT_FLAG_SPEC   (1 << 9)
-#define OPT_SPEC        (OPT_FLAG_SPEC | OPT_OFFSET)
-
-/* Option applies per-stream (implies OPT_SPEC). */
-#define OPT_FLAG_PERSTREAM  (1 << 10)
-#define OPT_PERSTREAM   (OPT_FLAG_PERSTREAM | OPT_SPEC)
-
-/* ffmpeg-only - specifies whether an OPT_PERFILE option applies to input,
- * output, or both. */
-#define OPT_INPUT       (1 << 11)
-#define OPT_OUTPUT      (1 << 12)
-
-/* This option is a "canonical" form, to which one or more alternatives
- * exist. These alternatives are listed in u1.names_alt. */
-#define OPT_HAS_ALT     (1 << 13)
-/* This option is an alternative form of some other option, whose
- * name is stored in u1.name_canon */
-#define OPT_HAS_CANON   (1 << 14)
-
-/* ffmpeg-only - OPT_PERFILE may apply to standalone decoders */
-#define OPT_DECODER     (1 << 15)
-
+#define HAS_ARG    0x0001
+#define OPT_BOOL   0x0002
+#define OPT_EXPERT 0x0004
+#define OPT_STRING 0x0008
+#define OPT_VIDEO  0x0010
+#define OPT_AUDIO  0x0020
+#define OPT_INT    0x0080
+#define OPT_FLOAT  0x0100
+#define OPT_SUBTITLE 0x0200
+#define OPT_INT64  0x0400
+#define OPT_EXIT   0x0800
+#define OPT_DATA   0x1000
+#define OPT_PERFILE  0x2000     /* the option is per-file (currently ffmpeg-only).
+                                   implied by OPT_OFFSET or OPT_SPEC */
+#define OPT_OFFSET 0x4000       /* option is specified as an offset in a passed optctx */
+#define OPT_SPEC   0x8000       /* option is to be stored in an array of SpecifierOpt.
+                                   Implies OPT_OFFSET. Next element after the offset is
+                                   an int containing element count in the array. */
+#define OPT_TIME  0x10000
+#define OPT_DOUBLE 0x20000
+#define OPT_INPUT  0x40000
+#define OPT_OUTPUT 0x80000
      union {
         void *dst_ptr;
         int (*func_arg)(void *, const char *, const char *);
@@ -185,15 +164,6 @@ typedef struct OptionDef {
     } u;
     const char *help;
     const char *argname;
-
-    union {
-        /* Name of the canonical form of this option.
-         * Is valid when OPT_HAS_CANON is set. */
-        const char *name_canon;
-        /* A NULL-terminated list of alternate forms of this option.
-         * Is valid when OPT_HAS_ALT is set. */
-        const char * const *names_alt;
-    } u1;
 } OptionDef;
 
 /**
@@ -203,9 +173,10 @@ typedef struct OptionDef {
  * @param msg title of this group. Only printed if at least one option matches.
  * @param req_flags print only options which have all those flags set.
  * @param rej_flags don't print options which have any of those flags set.
+ * @param alt_flags print only options that have at least one of those flags set
  */
 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
-                       int rej_flags);
+                       int rej_flags, int alt_flags);
 
 /**
  * Show help for all options with given flags in class and all its
@@ -231,8 +202,8 @@ void show_help_default(const char *opt, const char *arg);
  * argument without a leading option name flag. NULL if such arguments do
  * not have to be processed.
  */
-int parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
-                  int (* parse_arg_function)(void *optctx, const char*));
+void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,
+                   void (* parse_arg_function)(void *optctx, const char*));
 
 /**
  * Parse one given option.
@@ -307,7 +278,7 @@ typedef struct OptionParseContext {
  *
  * @param optctx an app-specific options context. NULL for global options group
  */
-int parse_optgroup(void *optctx, OptionGroup *g, const OptionDef *defs);
+int parse_optgroup(void *optctx, OptionGroup *g);
 
 /**
  * Split the commandline into an intermediate form convenient for further
@@ -370,12 +341,10 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec);
  * @param st A stream from s for which the options should be filtered.
  * @param codec The particular codec for which the options should be filtered.
  *              If null, the default one is looked up according to the codec id.
- * @param dst a pointer to the created dictionary
- * @return a non-negative number on success, a negative error code on failure
+ * @return a pointer to the created dictionary
  */
-int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
-                      AVFormatContext *s, AVStream *st, const AVCodec *codec,
-                      AVDictionary **dst);
+AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id,
+                                AVFormatContext *s, AVStream *st, const AVCodec *codec);
 
 /**
  * Setup AVCodecContext options for avformat_find_stream_info().
@@ -384,10 +353,12 @@ int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
  * contained in s.
  * Each dictionary will contain the options from codec_opts which can
  * be applied to the corresponding stream codec context.
+ *
+ * @return pointer to the created array of dictionaries.
+ * Calls exit() on failure.
  */
-int setup_find_stream_info_opts(AVFormatContext *s,
-                                AVDictionary *codec_opts,
-                                AVDictionary ***dst);
+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
+                                           AVDictionary *codec_opts);
 
 /**
  * Print an error message to stderr, indicating filename and a human
@@ -398,10 +369,7 @@ int setup_find_stream_info_opts(AVFormatContext *s,
  *
  * @see av_strerror()
  */
-static inline void print_error(const char *filename, int err)
-{
-    av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err));
-}
+void print_error(const char *filename, int err);
 
 /**
  * Print the program banner to stderr. The banner contents depend on the
@@ -439,31 +407,35 @@ FILE *get_preset_file(char *filename, size_t filename_size,
 
 /**
  * Realloc array to hold new_size elements of elem_size.
+ * Calls exit() on failure.
  *
- * @param array pointer to the array to reallocate, will be updated
- *              with a new pointer on success
+ * @param array array to reallocate
  * @param elem_size size in bytes of each element
  * @param size new element count will be written here
  * @param new_size number of elements to place in reallocated array
- * @return a non-negative number on success, a negative error code on failure
+ * @return reallocated array
  */
-int grow_array(void **array, int elem_size, int *size, int new_size);
+void *grow_array(void *array, int elem_size, int *size, int new_size);
 
 /**
  * Atomically add a new element to an array of pointers, i.e. allocate
  * a new entry, reallocate the array of pointers and make the new last
  * member of this array point to the newly allocated buffer.
+ * Calls exit() on failure.
  *
  * @param array     array of pointers to reallocate
  * @param elem_size size of the new element to allocate
  * @param nb_elems  pointer to the number of elements of the array array;
  *                  *nb_elems will be incremented by one by this function.
- * @return pointer to the newly allocated entry or NULL on failure
+ * @return pointer to the newly allocated entry
  */
 void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems);
 
 #define GROW_ARRAY(array, nb_elems)\
-    grow_array((void**)&array, sizeof(*array), &nb_elems, nb_elems + 1)
+    array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1)
+
+#define ALLOC_ARRAY_ELEM(array, nb_elems)\
+    allocate_array_elem(&array, sizeof(*array[0]), &nb_elems)
 
 #define GET_PIX_FMT_NAME(pix_fmt)\
     const char *name = av_get_pix_fmt_name(pix_fmt);
@@ -478,9 +450,6 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems);
     char name[16];\
     snprintf(name, sizeof(name), "%d", rate);
 
-double get_rotation(const int32_t *displaymatrix);
-
-/* read file contents into a string */
-char *file_read(const char *filename);
+double get_rotation(int32_t *displaymatrix);
 
 #endif /* FFTOOLS_CMDUTILS_H */

fftools/ffmpeg_enc.c

@@ -1,966 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <math.h>
-#include <stdint.h>
-
-#include "ffmpeg.h"
-#include "ffmpeg_utils.h"
-#include "thread_queue.h"
-
-#include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
-#include "libavutil/avutil.h"
-#include "libavutil/dict.h"
-#include "libavutil/display.h"
-#include "libavutil/eval.h"
-#include "libavutil/frame.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/log.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/rational.h"
-#include "libavutil/time.h"
-#include "libavutil/timestamp.h"
-
-#include "libavcodec/avcodec.h"
-
-#include "libavformat/avformat.h"
-
-struct Encoder {
-    // combined size of all the packets received from the encoder
-    uint64_t data_size;
-
-    // number of packets received from the encoder
-    uint64_t packets_encoded;
-
-    int opened;
-    int attach_par;
-
-    Scheduler      *sch;
-    unsigned        sch_idx;
-};
-
-// data that is local to the decoder thread and not visible outside of it
-typedef struct EncoderThread {
-    AVFrame *frame;
-    AVPacket  *pkt;
-} EncoderThread;
-
-void enc_free(Encoder **penc)
-{
-    Encoder *enc = *penc;
-
-    if (!enc)
-        return;
-
-    av_freep(penc);
-}
-
-int enc_alloc(Encoder **penc, const AVCodec *codec,
-              Scheduler *sch, unsigned sch_idx)
-{
-    Encoder *enc;
-
-    *penc = NULL;
-
-    enc = av_mallocz(sizeof(*enc));
-    if (!enc)
-        return AVERROR(ENOMEM);
-
-    enc->sch     = sch;
-    enc->sch_idx = sch_idx;
-
-    *penc = enc;
-
-    return 0;
-}
-
-static int hw_device_setup_for_encode(OutputStream *ost, AVBufferRef *frames_ref)
-{
-    const AVCodecHWConfig *config;
-    HWDevice *dev = NULL;
-
-    if (frames_ref &&
-        ((AVHWFramesContext*)frames_ref->data)->format ==
-        ost->enc_ctx->pix_fmt) {
-        // Matching format, will try to use hw_frames_ctx.
-    } else {
-        frames_ref = NULL;
-    }
-
-    for (int i = 0;; i++) {
-        config = avcodec_get_hw_config(ost->enc_ctx->codec, i);
-        if (!config)
-            break;
-
-        if (frames_ref &&
-            config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX &&
-            (config->pix_fmt == AV_PIX_FMT_NONE ||
-             config->pix_fmt == ost->enc_ctx->pix_fmt)) {
-            av_log(ost->enc_ctx, AV_LOG_VERBOSE, "Using input "
-                   "frames context (format %s) with %s encoder.\n",
-                   av_get_pix_fmt_name(ost->enc_ctx->pix_fmt),
-                   ost->enc_ctx->codec->name);
-            ost->enc_ctx->hw_frames_ctx = av_buffer_ref(frames_ref);
-            if (!ost->enc_ctx->hw_frames_ctx)
-                return AVERROR(ENOMEM);
-            return 0;
-        }
-
-        if (!dev &&
-            config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX)
-            dev = hw_device_get_by_type(config->device_type);
-    }
-
-    if (dev) {
-        av_log(ost->enc_ctx, AV_LOG_VERBOSE, "Using device %s "
-               "(type %s) with %s encoder.\n", dev->name,
-               av_hwdevice_get_type_name(dev->type), ost->enc_ctx->codec->name);
-        ost->enc_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref);
-        if (!ost->enc_ctx->hw_device_ctx)
-            return AVERROR(ENOMEM);
-    } else {
-        // No device required, or no device available.
-    }
-    return 0;
-}
-
-static int set_encoder_id(OutputFile *of, OutputStream *ost)
-{
-    const char *cname = ost->enc_ctx->codec->name;
-    uint8_t *encoder_string;
-    int encoder_string_len;
-
-    if (av_dict_get(ost->st->metadata, "encoder",  NULL, 0))
-        return 0;
-
-    encoder_string_len = sizeof(LIBAVCODEC_IDENT) + strlen(cname) + 2;
-    encoder_string     = av_mallocz(encoder_string_len);
-    if (!encoder_string)
-        return AVERROR(ENOMEM);
-
-    if (!of->bitexact && !ost->bitexact)
-        av_strlcpy(encoder_string, LIBAVCODEC_IDENT " ", encoder_string_len);
-    else
-        av_strlcpy(encoder_string, "Lavc ", encoder_string_len);
-    av_strlcat(encoder_string, cname, encoder_string_len);
-    av_dict_set(&ost->st->metadata, "encoder",  encoder_string,
-                AV_DICT_DONT_STRDUP_VAL | AV_DICT_DONT_OVERWRITE);
-
-    return 0;
-}
-
-int enc_open(void *opaque, const AVFrame *frame)
-{
-    OutputStream *ost = opaque;
-    InputStream *ist = ost->ist;
-    Encoder              *e = ost->enc;
-    AVCodecContext *enc_ctx = ost->enc_ctx;
-    Decoder            *dec;
-    const AVCodec      *enc = enc_ctx->codec;
-    OutputFile          *of = ost->file;
-    FrameData *fd;
-    int frame_samples = 0;
-    int ret;
-
-    if (e->opened)
-        return 0;
-
-    // frame is always non-NULL for audio and video
-    av_assert0(frame || (enc->type != AVMEDIA_TYPE_VIDEO && enc->type != AVMEDIA_TYPE_AUDIO));
-
-    if (frame) {
-        av_assert0(frame->opaque_ref);
-        fd = (FrameData*)frame->opaque_ref->data;
-    }
-
-    ret = set_encoder_id(of, ost);
-    if (ret < 0)
-        return ret;
-
-    if (ist)
-        dec = ist->decoder;
-
-    // the timebase is chosen by filtering code
-    if (ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO) {
-        enc_ctx->time_base      = frame->time_base;
-        enc_ctx->framerate      = fd->frame_rate_filter;
-        ost->st->avg_frame_rate = fd->frame_rate_filter;
-    }
-
-    switch (enc_ctx->codec_type) {
-    case AVMEDIA_TYPE_AUDIO:
-        av_assert0(frame->format != AV_SAMPLE_FMT_NONE &&
-                   frame->sample_rate > 0 &&
-                   frame->ch_layout.nb_channels > 0);
-        enc_ctx->sample_fmt     = frame->format;
-        enc_ctx->sample_rate    = frame->sample_rate;
-        ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout);
-        if (ret < 0)
-            return ret;
-
-        if (ost->bits_per_raw_sample)
-            enc_ctx->bits_per_raw_sample = ost->bits_per_raw_sample;
-        else
-            enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample,
-                                                 av_get_bytes_per_sample(enc_ctx->sample_fmt) << 3);
-        break;
-
-    case AVMEDIA_TYPE_VIDEO: {
-        av_assert0(frame->format != AV_PIX_FMT_NONE &&
-                   frame->width > 0 &&
-                   frame->height > 0);
-        enc_ctx->width  = frame->width;
-        enc_ctx->height = frame->height;
-        enc_ctx->sample_aspect_ratio = ost->st->sample_aspect_ratio =
-            ost->frame_aspect_ratio.num ? // overridden by the -aspect cli option
-            av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) :
-            frame->sample_aspect_ratio;
-
-        enc_ctx->pix_fmt = frame->format;
-
-        if (ost->bits_per_raw_sample)
-            enc_ctx->bits_per_raw_sample = ost->bits_per_raw_sample;
-        else
-            enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample,
-                                                 av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth);
-
-        enc_ctx->color_range            = frame->color_range;
-        enc_ctx->color_primaries        = frame->color_primaries;
-        enc_ctx->color_trc              = frame->color_trc;
-        enc_ctx->colorspace             = frame->colorspace;
-        enc_ctx->chroma_sample_location = frame->chroma_location;
-
-        for (int i = 0; i < frame->nb_side_data; i++) {
-            ret = av_frame_side_data_clone(
-                &enc_ctx->decoded_side_data, &enc_ctx->nb_decoded_side_data,
-                frame->side_data[i], AV_FRAME_SIDE_DATA_FLAG_UNIQUE);
-            if (ret < 0) {
-                av_frame_side_data_free(
-                    &enc_ctx->decoded_side_data,
-                    &enc_ctx->nb_decoded_side_data);
-                av_log(NULL, AV_LOG_ERROR,
-                        "failed to configure video encoder: %s!\n",
-                        av_err2str(ret));
-                return ret;
-            }
-        }
-
-        if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) ||
-            (frame->flags & AV_FRAME_FLAG_INTERLACED)
-#if FFMPEG_OPT_TOP
-            || ost->top_field_first >= 0
-#endif
-            ) {
-            int top_field_first =
-#if FFMPEG_OPT_TOP
-                ost->top_field_first >= 0 ?
-                ost->top_field_first :
-#endif
-                !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST);
-
-            if (enc->id == AV_CODEC_ID_MJPEG)
-                enc_ctx->field_order = top_field_first ? AV_FIELD_TT : AV_FIELD_BB;
-            else
-                enc_ctx->field_order = top_field_first ? AV_FIELD_TB : AV_FIELD_BT;
-        } else
-            enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
-
-        break;
-        }
-    case AVMEDIA_TYPE_SUBTITLE:
-        if (ost->enc_timebase.num)
-            av_log(ost, AV_LOG_WARNING,
-                   "-enc_time_base not supported for subtitles, ignoring\n");
-        enc_ctx->time_base = AV_TIME_BASE_Q;
-
-        if (!enc_ctx->width) {
-            enc_ctx->width     = ost->ist->par->width;
-            enc_ctx->height    = ost->ist->par->height;
-        }
-
-        av_assert0(dec);
-        if (dec->subtitle_header) {
-            /* ASS code assumes this buffer is null terminated so add extra byte. */
-            enc_ctx->subtitle_header = av_mallocz(dec->subtitle_header_size + 1);
-            if (!enc_ctx->subtitle_header)
-                return AVERROR(ENOMEM);
-            memcpy(enc_ctx->subtitle_header, dec->subtitle_header,
-                   dec->subtitle_header_size);
-            enc_ctx->subtitle_header_size = dec->subtitle_header_size;
-        }
-
-        break;
-    default:
-        av_assert0(0);
-        break;
-    }
-
-    if (ost->bitexact)
-        enc_ctx->flags |= AV_CODEC_FLAG_BITEXACT;
-
-    if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0))
-        av_dict_set(&ost->encoder_opts, "threads", "auto", 0);
-
-    if (enc->capabilities & AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE) {
-        ret = av_dict_set(&ost->encoder_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY);
-        if (ret < 0)
-            return ret;
-    }
-
-    av_dict_set(&ost->encoder_opts, "flags", "+frame_duration", AV_DICT_MULTIKEY);
-
-    ret = hw_device_setup_for_encode(ost, frame ? frame->hw_frames_ctx : NULL);
-    if (ret < 0) {
-        av_log(ost, AV_LOG_ERROR,
-               "Encoding hardware device setup failed: %s\n", av_err2str(ret));
-        return ret;
-    }
-
-    if ((ret = avcodec_open2(ost->enc_ctx, enc, &ost->encoder_opts)) < 0) {
-        if (ret != AVERROR_EXPERIMENTAL)
-            av_log(ost, AV_LOG_ERROR, "Error while opening encoder - maybe "
-                   "incorrect parameters such as bit_rate, rate, width or height.\n");
-        return ret;
-    }
-
-    e->opened = 1;
-
-    if (ost->enc_ctx->frame_size)
-        frame_samples = ost->enc_ctx->frame_size;
-
-    ret = check_avoptions(ost->encoder_opts);
-    if (ret < 0)
-        return ret;
-
-    if (ost->enc_ctx->bit_rate && ost->enc_ctx->bit_rate < 1000 &&
-        ost->enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 bit/s modes */)
-        av_log(ost, AV_LOG_WARNING, "The bitrate parameter is set too low."
-                                    " It takes bits/s as argument, not kbits/s\n");
-
-    ret = avcodec_parameters_from_context(ost->par_in, ost->enc_ctx);
-    if (ret < 0) {
-        av_log(ost, AV_LOG_FATAL,
-               "Error initializing the output stream codec context.\n");
-        return ret;
-    }
-
-    /*
-     * Add global input side data. For now this is naive, and copies it
-     * from the input stream's global side data. All side data should
-     * really be funneled over AVFrame and libavfilter, then added back to
-     * packet side data, and then potentially using the first packet for
-     * global side data.
-     */
-    if (ist) {
-        for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) {
-            AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i];
-            if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) {
-                AVPacketSideData *sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data,
-                                                                   &ost->par_in->nb_coded_side_data,
-                                                                   sd_src->type, sd_src->size, 0);
-                if (!sd_dst)
-                    return AVERROR(ENOMEM);
-                memcpy(sd_dst->data, sd_src->data, sd_src->size);
-                if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX)
-                    av_display_rotation_set((int32_t *)sd_dst->data, 0);
-            }
-        }
-    }
-
-    // copy timebase while removing common factors
-    if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0)
-        ost->st->time_base = av_add_q(ost->enc_ctx->time_base, (AVRational){0, 1});
-
-    ret = of_stream_init(of, ost);
-    if (ret < 0)
-        return ret;
-
-    return frame_samples;
-}
-
-static int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb)
-{
-    OutputFile *of = ost->file;
-
-    if (of->recording_time != INT64_MAX &&
-        av_compare_ts(ts, tb, of->recording_time, AV_TIME_BASE_Q) >= 0) {
-        return 0;
-    }
-    return 1;
-}
-
-static int do_subtitle_out(OutputFile *of, OutputStream *ost, const AVSubtitle *sub,
-                           AVPacket *pkt)
-{
-    Encoder *e = ost->enc;
-    int subtitle_out_max_size = 1024 * 1024;
-    int subtitle_out_size, nb, i, ret;
-    AVCodecContext *enc;
-    int64_t pts;
-
-    if (sub->pts == AV_NOPTS_VALUE) {
-        av_log(ost, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
-        return exit_on_error ? AVERROR(EINVAL) : 0;
-    }
-    if ((of->start_time != AV_NOPTS_VALUE && sub->pts < of->start_time))
-        return 0;
-
-    enc = ost->enc_ctx;
-
-    /* Note: DVB subtitle need one packet to draw them and one other
-       packet to clear them */
-    /* XXX: signal it in the codec context ? */
-    if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
-        nb = 2;
-    else if (enc->codec_id == AV_CODEC_ID_ASS)
-        nb = FFMAX(sub->num_rects, 1);
-    else
-        nb = 1;
-
-    /* shift timestamp to honor -ss and make check_recording_time() work with -t */
-    pts = sub->pts;
-    if (of->start_time != AV_NOPTS_VALUE)
-        pts -= of->start_time;
-    for (i = 0; i < nb; i++) {
-        AVSubtitle local_sub = *sub;
-
-        if (!check_recording_time(ost, pts, AV_TIME_BASE_Q))
-            return AVERROR_EOF;
-
-        ret = av_new_packet(pkt, subtitle_out_max_size);
-        if (ret < 0)
-            return AVERROR(ENOMEM);
-
-        local_sub.pts = pts;
-        // start_display_time is required to be 0
-        local_sub.pts               += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
-        local_sub.end_display_time  -= sub->start_display_time;
-        local_sub.start_display_time = 0;
-
-        if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE && i == 1)
-            local_sub.num_rects = 0;
-        else if (enc->codec_id == AV_CODEC_ID_ASS && sub->num_rects > 0) {
-            local_sub.num_rects = 1;
-            local_sub.rects += i;
-        }
-
-        ost->frames_encoded++;
-
-        subtitle_out_size = avcodec_encode_subtitle(enc, pkt->data, pkt->size, &local_sub);
-        if (subtitle_out_size < 0) {
-            av_log(ost, AV_LOG_FATAL, "Subtitle encoding failed\n");
-            return subtitle_out_size;
-        }
-
-        av_shrink_packet(pkt, subtitle_out_size);
-        pkt->time_base = AV_TIME_BASE_Q;
-        pkt->pts       = sub->pts;
-        pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
-        if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
-            /* XXX: the pts correction is handled here. Maybe handling
-               it in the codec would be better */
-            if (i == 0)
-                pkt->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
-            else
-                pkt->pts += av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
-        }
-        pkt->dts = pkt->pts;
-
-        ret = sch_enc_send(e->sch, e->sch_idx, pkt);
-        if (ret < 0) {
-            av_packet_unref(pkt);
-            return ret;
-        }
-    }
-
-    return 0;
-}
-
-void enc_stats_write(OutputStream *ost, EncStats *es,
-                     const AVFrame *frame, const AVPacket *pkt,
-                     uint64_t frame_num)
-{
-    Encoder      *e = ost->enc;
-    AVIOContext *io = es->io;
-    AVRational   tb = frame ? frame->time_base : pkt->time_base;
-    int64_t     pts = frame ? frame->pts : pkt->pts;
-
-    AVRational  tbi = (AVRational){ 0, 1};
-    int64_t    ptsi = INT64_MAX;
-
-    const FrameData *fd;
-
-    if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) {
-        fd   = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data);
-        tbi  = fd->dec.tb;
-        ptsi = fd->dec.pts;
-    }
-
-    pthread_mutex_lock(&es->lock);
-
-    for (size_t i = 0; i < es->nb_components; i++) {
-        const EncStatsComponent *c = &es->components[i];
-
-        switch (c->type) {
-        case ENC_STATS_LITERAL:         avio_write (io, c->str,     c->str_len);                    continue;
-        case ENC_STATS_FILE_IDX:        avio_printf(io, "%d",       ost->file->index);              continue;
-        case ENC_STATS_STREAM_IDX:      avio_printf(io, "%d",       ost->index);                    continue;
-        case ENC_STATS_TIMEBASE:        avio_printf(io, "%d/%d",    tb.num, tb.den);                continue;
-        case ENC_STATS_TIMEBASE_IN:     avio_printf(io, "%d/%d",    tbi.num, tbi.den);              continue;
-        case ENC_STATS_PTS:             avio_printf(io, "%"PRId64,  pts);                           continue;
-        case ENC_STATS_PTS_IN:          avio_printf(io, "%"PRId64,  ptsi);                          continue;
-        case ENC_STATS_PTS_TIME:        avio_printf(io, "%g",       pts * av_q2d(tb));              continue;
-        case ENC_STATS_PTS_TIME_IN:     avio_printf(io, "%g",       ptsi == INT64_MAX ?
-                                                                    INFINITY : ptsi * av_q2d(tbi)); continue;
-        case ENC_STATS_FRAME_NUM:       avio_printf(io, "%"PRIu64,  frame_num);                     continue;
-        case ENC_STATS_FRAME_NUM_IN:    avio_printf(io, "%"PRIu64,  fd ? fd->dec.frame_num : -1);   continue;
-        }
-
-        if (frame) {
-            switch (c->type) {
-            case ENC_STATS_SAMPLE_NUM:  avio_printf(io, "%"PRIu64,  ost->samples_encoded);          continue;
-            case ENC_STATS_NB_SAMPLES:  avio_printf(io, "%d",       frame->nb_samples);             continue;
-            default: av_assert0(0);
-            }
-        } else {
-            switch (c->type) {
-            case ENC_STATS_DTS:         avio_printf(io, "%"PRId64,  pkt->dts);                      continue;
-            case ENC_STATS_DTS_TIME:    avio_printf(io, "%g",       pkt->dts * av_q2d(tb));         continue;
-            case ENC_STATS_PKT_SIZE:    avio_printf(io, "%d",       pkt->size);                     continue;
-            case ENC_STATS_KEYFRAME:    avio_write(io, (pkt->flags & AV_PKT_FLAG_KEY) ?
-                                                       "K" : "N", 1);                               continue;
-            case ENC_STATS_BITRATE: {
-                double duration = FFMAX(pkt->duration, 1) * av_q2d(tb);
-                avio_printf(io, "%g",  8.0 * pkt->size / duration);
-                continue;
-            }
-            case ENC_STATS_AVG_BITRATE: {
-                double duration = pkt->dts * av_q2d(tb);
-                avio_printf(io, "%g",  duration > 0 ? 8.0 * e->data_size / duration : -1.);
-                continue;
-            }
-            default: av_assert0(0);
-            }
-        }
-    }
-    avio_w8(io, '\n');
-    avio_flush(io);
-
-    pthread_mutex_unlock(&es->lock);
-}
-
-static inline double psnr(double d)
-{
-    return -10.0 * log10(d);
-}
-
-static int update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_vstats)
-{
-    Encoder        *e = ost->enc;
-    const uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS,
-                                                NULL);
-    AVCodecContext *enc = ost->enc_ctx;
-    enum AVPictureType pict_type;
-    int64_t frame_number;
-    double ti1, bitrate, avg_bitrate;
-    double psnr_val = -1;
-    int quality;
-
-    quality        = sd ? AV_RL32(sd) : -1;
-    pict_type      = sd ? sd[4] : AV_PICTURE_TYPE_NONE;
-
-    atomic_store(&ost->quality, quality);
-
-    if ((enc->flags & AV_CODEC_FLAG_PSNR) && sd && sd[5]) {
-        // FIXME the scaling assumes 8bit
-        double error = AV_RL64(sd + 8) / (enc->width * enc->height * 255.0 * 255.0);
-        if (error >= 0 && error <= 1)
-            psnr_val = psnr(error);
-    }
-
-    if (!write_vstats)
-        return 0;
-
-    /* this is executed just the first time update_video_stats is called */
-    if (!vstats_file) {
-        vstats_file = fopen(vstats_filename, "w");
-        if (!vstats_file) {
-            perror("fopen");
-            return AVERROR(errno);
-        }
-    }
-
-    frame_number = e->packets_encoded;
-    if (vstats_version <= 1) {
-        fprintf(vstats_file, "frame= %5"PRId64" q= %2.1f ", frame_number,
-                quality / (float)FF_QP2LAMBDA);
-    } else  {
-        fprintf(vstats_file, "out= %2d st= %2d frame= %5"PRId64" q= %2.1f ",
-                ost->file->index, ost->index, frame_number,
-                quality / (float)FF_QP2LAMBDA);
-    }
-
-    if (psnr_val >= 0)
-        fprintf(vstats_file, "PSNR= %6.2f ", psnr_val);
-
-    fprintf(vstats_file,"f_size= %6d ", pkt->size);
-    /* compute pts value */
-    ti1 = pkt->dts * av_q2d(pkt->time_base);
-    if (ti1 < 0.01)
-        ti1 = 0.01;
-
-    bitrate     = (pkt->size * 8) / av_q2d(enc->time_base) / 1000.0;
-    avg_bitrate = (double)(e->data_size * 8) / ti1 / 1000.0;
-    fprintf(vstats_file, "s_size= %8.0fKiB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
-           (double)e->data_size / 1024, ti1, bitrate, avg_bitrate);
-    fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(pict_type));
-
-    return 0;
-}
-
-static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame,
-                        AVPacket *pkt)
-{
-    Encoder            *e = ost->enc;
-    AVCodecContext   *enc = ost->enc_ctx;
-    const char *type_desc = av_get_media_type_string(enc->codec_type);
-    const char    *action = frame ? "encode" : "flush";
-    int ret;
-
-    if (frame) {
-        FrameData *fd = frame_data(frame);
-
-        if (!fd)
-            return AVERROR(ENOMEM);
-
-        fd->wallclock[LATENCY_PROBE_ENC_PRE] = av_gettime_relative();
-
-        if (ost->enc_stats_pre.io)
-            enc_stats_write(ost, &ost->enc_stats_pre, frame, NULL,
-                            ost->frames_encoded);
-
-        ost->frames_encoded++;
-        ost->samples_encoded += frame->nb_samples;
-
-        if (debug_ts) {
-            av_log(ost, AV_LOG_INFO, "encoder <- type:%s "
-                   "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n",
-                   type_desc,
-                   av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base),
-                   enc->time_base.num, enc->time_base.den);
-        }
-
-        if (frame->sample_aspect_ratio.num && !ost->frame_aspect_ratio.num)
-            enc->sample_aspect_ratio = frame->sample_aspect_ratio;
-    }
-
-    update_benchmark(NULL);
-
-    ret = avcodec_send_frame(enc, frame);
-    if (ret < 0 && !(ret == AVERROR_EOF && !frame)) {
-        av_log(ost, AV_LOG_ERROR, "Error submitting %s frame to the encoder\n",
-               type_desc);
-        return ret;
-    }
-
-    while (1) {
-        FrameData *fd;
-
-        av_packet_unref(pkt);
-
-        ret = avcodec_receive_packet(enc, pkt);
-        update_benchmark("%s_%s %d.%d", action, type_desc,
-                         of->index, ost->index);
-
-        pkt->time_base = enc->time_base;
-
-        /* if two pass, output log on success and EOF */
-        if ((ret >= 0 || ret == AVERROR_EOF) && ost->logfile && enc->stats_out)
-            fprintf(ost->logfile, "%s", enc->stats_out);
-
-        if (ret == AVERROR(EAGAIN)) {
-            av_assert0(frame); // should never happen during flushing
-            return 0;
-        } else if (ret < 0) {
-            if (ret != AVERROR_EOF)
-                av_log(ost, AV_LOG_ERROR, "%s encoding failed\n", type_desc);
-            return ret;
-        }
-
-        fd = packet_data(pkt);
-        if (!fd)
-            return AVERROR(ENOMEM);
-        fd->wallclock[LATENCY_PROBE_ENC_POST] = av_gettime_relative();
-
-        // attach stream parameters to first packet if requested
-        avcodec_parameters_free(&fd->par_enc);
-        if (e->attach_par && !e->packets_encoded) {
-            fd->par_enc = avcodec_parameters_alloc();
-            if (!fd->par_enc)
-                return AVERROR(ENOMEM);
-
-            ret = avcodec_parameters_from_context(fd->par_enc, enc);
-            if (ret < 0)
-                return ret;
-        }
-
-        pkt->flags |= AV_PKT_FLAG_TRUSTED;
-
-        if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-            ret = update_video_stats(ost, pkt, !!vstats_filename);
-            if (ret < 0)
-                return ret;
-        }
-
-        if (ost->enc_stats_post.io)
-            enc_stats_write(ost, &ost->enc_stats_post, NULL, pkt,
-                            e->packets_encoded);
-
-        if (debug_ts) {
-            av_log(ost, AV_LOG_INFO, "encoder -> type:%s "
-                   "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s "
-                   "duration:%s duration_time:%s\n",
-                   type_desc,
-                   av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base),
-                   av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base),
-                   av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base));
-        }
-
-        e->data_size += pkt->size;
-
-        e->packets_encoded++;
-
-        ret = sch_enc_send(e->sch, e->sch_idx, pkt);
-        if (ret < 0) {
-            av_packet_unref(pkt);
-            return ret;
-        }
-    }
-
-    av_assert0(0);
-}
-
-static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf,
-                                          const AVFrame *frame)
-{
-    double pts_time;
-
-    if (kf->ref_pts == AV_NOPTS_VALUE)
-        kf->ref_pts = frame->pts;
-
-    pts_time = (frame->pts - kf->ref_pts) * av_q2d(frame->time_base);
-    if (kf->index < kf->nb_pts &&
-        av_compare_ts(frame->pts, frame->time_base, kf->pts[kf->index], AV_TIME_BASE_Q) >= 0) {
-        kf->index++;
-        goto force_keyframe;
-    } else if (kf->pexpr) {
-        double res;
-        kf->expr_const_values[FKF_T] = pts_time;
-        res = av_expr_eval(kf->pexpr,
-                           kf->expr_const_values, NULL);
-        av_log(logctx, AV_LOG_TRACE,
-               "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n",
-               kf->expr_const_values[FKF_N],
-               kf->expr_const_values[FKF_N_FORCED],
-               kf->expr_const_values[FKF_PREV_FORCED_N],
-               kf->expr_const_values[FKF_T],
-               kf->expr_const_values[FKF_PREV_FORCED_T],
-               res);
-
-        kf->expr_const_values[FKF_N] += 1;
-
-        if (res) {
-            kf->expr_const_values[FKF_PREV_FORCED_N] = kf->expr_const_values[FKF_N] - 1;
-            kf->expr_const_values[FKF_PREV_FORCED_T] = kf->expr_const_values[FKF_T];
-            kf->expr_const_values[FKF_N_FORCED]     += 1;
-            goto force_keyframe;
-        }
-    } else if (kf->type == KF_FORCE_SOURCE && (frame->flags & AV_FRAME_FLAG_KEY)) {
-        goto force_keyframe;
-    }
-
-    return AV_PICTURE_TYPE_NONE;
-
-force_keyframe:
-    av_log(logctx, AV_LOG_DEBUG, "Forced keyframe at time %f\n", pts_time);
-    return AV_PICTURE_TYPE_I;
-}
-
-static int frame_encode(OutputStream *ost, AVFrame *frame, AVPacket *pkt)
-{
-    OutputFile *of = ost->file;
-    enum AVMediaType type = ost->type;
-
-    if (type == AVMEDIA_TYPE_SUBTITLE) {
-        const AVSubtitle *subtitle = frame && frame->buf[0] ?
-                                     (AVSubtitle*)frame->buf[0]->data : NULL;
-
-        // no flushing for subtitles
-        return subtitle && subtitle->num_rects ?
-               do_subtitle_out(of, ost, subtitle, pkt) : 0;
-    }
-
-    if (frame) {
-        if (!check_recording_time(ost, frame->pts, frame->time_base))
-            return AVERROR_EOF;
-
-        if (type == AVMEDIA_TYPE_VIDEO) {
-            frame->quality   = ost->enc_ctx->global_quality;
-            frame->pict_type = forced_kf_apply(ost, &ost->kf, frame);
-
-#if FFMPEG_OPT_TOP
-            if (ost->top_field_first >= 0) {
-                frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
-                frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * (!!ost->top_field_first);
-            }
-#endif
-        } else {
-            if (!(ost->enc_ctx->codec->capabilities & AV_CODEC_CAP_PARAM_CHANGE) &&
-                ost->enc_ctx->ch_layout.nb_channels != frame->ch_layout.nb_channels) {
-                av_log(ost, AV_LOG_ERROR,
-                       "Audio channel count changed and encoder does not support parameter changes\n");
-                return 0;
-            }
-        }
-    }
-
-    return encode_frame(of, ost, frame, pkt);
-}
-
-static void enc_thread_set_name(const OutputStream *ost)
-{
-    char name[16];
-    snprintf(name, sizeof(name), "enc%d:%d:%s", ost->file->index, ost->index,
-             ost->enc_ctx->codec->name);
-    ff_thread_setname(name);
-}
-
-static void enc_thread_uninit(EncoderThread *et)
-{
-    av_packet_free(&et->pkt);
-    av_frame_free(&et->frame);
-
-    memset(et, 0, sizeof(*et));
-}
-
-static int enc_thread_init(EncoderThread *et)
-{
-    memset(et, 0, sizeof(*et));
-
-    et->frame = av_frame_alloc();
-    if (!et->frame)
-        goto fail;
-
-    et->pkt = av_packet_alloc();
-    if (!et->pkt)
-        goto fail;
-
-    return 0;
-
-fail:
-    enc_thread_uninit(et);
-    return AVERROR(ENOMEM);
-}
-
-int encoder_thread(void *arg)
-{
-    OutputStream *ost = arg;
-    Encoder        *e = ost->enc;
-    EncoderThread et;
-    int ret = 0, input_status = 0;
-    int name_set = 0;
-
-    ret = enc_thread_init(&et);
-    if (ret < 0)
-        goto finish;
-
-    /* Open the subtitle encoders immediately. AVFrame-based encoders
-     * are opened through a callback from the scheduler once they get
-     * their first frame
-     *
-     * N.B.: because the callback is called from a different thread,
-     * enc_ctx MUST NOT be accessed before sch_enc_receive() returns
-     * for the first time for audio/video. */
-    if (ost->type != AVMEDIA_TYPE_VIDEO && ost->type != AVMEDIA_TYPE_AUDIO) {
-        ret = enc_open(ost, NULL);
-        if (ret < 0)
-            goto finish;
-    }
-
-    while (!input_status) {
-        input_status = sch_enc_receive(e->sch, e->sch_idx, et.frame);
-        if (input_status < 0) {
-            if (input_status == AVERROR_EOF) {
-                av_log(ost, AV_LOG_VERBOSE, "Encoder thread received EOF\n");
-                if (e->opened)
-                    break;
-
-                av_log(ost, AV_LOG_ERROR, "Could not open encoder before EOF\n");
-                ret = AVERROR(EINVAL);
-            } else {
-                av_log(ost, AV_LOG_ERROR, "Error receiving a frame for encoding: %s\n",
-                       av_err2str(ret));
-                ret = input_status;
-            }
-            goto finish;
-        }
-
-        if (!name_set) {
-            enc_thread_set_name(ost);
-            name_set = 1;
-        }
-
-        ret = frame_encode(ost, et.frame, et.pkt);
-
-        av_packet_unref(et.pkt);
-        av_frame_unref(et.frame);
-
-        if (ret < 0) {
-            if (ret == AVERROR_EOF)
-                av_log(ost, AV_LOG_VERBOSE, "Encoder returned EOF, finishing\n");
-            else
-                av_log(ost, AV_LOG_ERROR, "Error encoding a frame: %s\n",
-                       av_err2str(ret));
-            break;
-        }
-    }
-
-    // flush the encoder
-    if (ret == 0 || ret == AVERROR_EOF) {
-        ret = frame_encode(ost, NULL, et.pkt);
-        if (ret < 0 && ret != AVERROR_EOF)
-            av_log(ost, AV_LOG_ERROR, "Error flushing encoder: %s\n",
-                   av_err2str(ret));
-    }
-
-    // EOF is normal thread termination
-    if (ret == AVERROR_EOF)
-        ret = 0;
-
-finish:
-    enc_thread_uninit(&et);
-
-    return ret;
-}
-
-int enc_loopback(Encoder *enc)
-{
-    enc->attach_par = 1;
-    return enc->sch_idx;
-}

fftools/ffmpeg_hw.c

@@ -27,7 +27,7 @@
 static int nb_hw_devices;
 static HWDevice **hw_devices;
 
-HWDevice *hw_device_get_by_type(enum AVHWDeviceType type)
+static HWDevice *hw_device_get_by_type(enum AVHWDeviceType type)
 {
     HWDevice *found = NULL;
     int i;
@@ -242,9 +242,9 @@ fail:
     goto done;
 }
 
-int hw_device_init_from_type(enum AVHWDeviceType type,
-                             const char *device,
-                             HWDevice **dev_out)
+static int hw_device_init_from_type(enum AVHWDeviceType type,
+                                    const char *device,
+                                    HWDevice **dev_out)
 {
     AVBufferRef *device_ref = NULL;
     HWDevice *dev;
@@ -297,14 +297,268 @@ void hw_device_free_all(void)
     nb_hw_devices = 0;
 }
 
-AVBufferRef *hw_device_for_filter(void)
+static HWDevice *hw_device_match_by_codec(const AVCodec *codec)
 {
+    const AVCodecHWConfig *config;
+    HWDevice *dev;
+    int i;
+    for (i = 0;; i++) {
+        config = avcodec_get_hw_config(codec, i);
+        if (!config)
+            return NULL;
+        if (!(config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX))
+            continue;
+        dev = hw_device_get_by_type(config->device_type);
+        if (dev)
+            return dev;
+    }
+}
+
+int hw_device_setup_for_decode(InputStream *ist)
+{
+    const AVCodecHWConfig *config;
+    enum AVHWDeviceType type;
+    HWDevice *dev = NULL;
+    int err, auto_device = 0;
+
+    if (ist->hwaccel_device) {
+        dev = hw_device_get_by_name(ist->hwaccel_device);
+        if (!dev) {
+            if (ist->hwaccel_id == HWACCEL_AUTO) {
+                auto_device = 1;
+            } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
+                type = ist->hwaccel_device_type;
+                err = hw_device_init_from_type(type, ist->hwaccel_device,
+                                               &dev);
+            } else {
+                // This will be dealt with by API-specific initialisation
+                // (using hwaccel_device), so nothing further needed here.
+                return 0;
+            }
+        } else {
+            if (ist->hwaccel_id == HWACCEL_AUTO) {
+                ist->hwaccel_device_type = dev->type;
+            } else if (ist->hwaccel_device_type != dev->type) {
+                av_log(ist->dec_ctx, AV_LOG_ERROR, "Invalid hwaccel device "
+                       "specified for decoder: device %s of type %s is not "
+                       "usable with hwaccel %s.\n", dev->name,
+                       av_hwdevice_get_type_name(dev->type),
+                       av_hwdevice_get_type_name(ist->hwaccel_device_type));
+                return AVERROR(EINVAL);
+            }
+        }
+    } else {
+        if (ist->hwaccel_id == HWACCEL_AUTO) {
+            auto_device = 1;
+        } else if (ist->hwaccel_id == HWACCEL_GENERIC) {
+            type = ist->hwaccel_device_type;
+            dev = hw_device_get_by_type(type);
+
+            // When "-qsv_device device" is used, an internal QSV device named
+            // as "__qsv_device" is created. Another QSV device is created too
+            // if "-init_hw_device qsv=name:device" is used. There are 2 QSV devices
+            // if both "-qsv_device device" and "-init_hw_device qsv=name:device"
+            // are used, hw_device_get_by_type(AV_HWDEVICE_TYPE_QSV) returns NULL.
+            // To keep back-compatibility with the removed ad-hoc libmfx setup code,
+            // call hw_device_get_by_name("__qsv_device") to select the internal QSV
+            // device.
+            if (!dev && type == AV_HWDEVICE_TYPE_QSV)
+                dev = hw_device_get_by_name("__qsv_device");
+
+            if (!dev)
+                err = hw_device_init_from_type(type, NULL, &dev);
+        } else {
+            dev = hw_device_match_by_codec(ist->dec);
+            if (!dev) {
+                // No device for this codec, but not using generic hwaccel
+                // and therefore may well not need one - ignore.
+                return 0;
+            }
+        }
+    }
+
+    if (auto_device) {
+        int i;
+        if (!avcodec_get_hw_config(ist->dec, 0)) {
+            // Decoder does not support any hardware devices.
+            return 0;
+        }
+        for (i = 0; !dev; i++) {
+            config = avcodec_get_hw_config(ist->dec, i);
+            if (!config)
+                break;
+            type = config->device_type;
+            dev = hw_device_get_by_type(type);
+            if (dev) {
+                av_log(ist->dec_ctx, AV_LOG_INFO, "Using auto "
+                       "hwaccel type %s with existing device %s.\n",
+                       av_hwdevice_get_type_name(type), dev->name);
+            }
+        }
+        for (i = 0; !dev; i++) {
+            config = avcodec_get_hw_config(ist->dec, i);
+            if (!config)
+                break;
+            type = config->device_type;
+            // Try to make a new device of this type.
+            err = hw_device_init_from_type(type, ist->hwaccel_device,
+                                           &dev);
+            if (err < 0) {
+                // Can't make a device of this type.
+                continue;
+            }
+            if (ist->hwaccel_device) {
+                av_log(ist->dec_ctx, AV_LOG_INFO, "Using auto "
+                       "hwaccel type %s with new device created "
+                       "from %s.\n", av_hwdevice_get_type_name(type),
+                       ist->hwaccel_device);
+            } else {
+                av_log(ist->dec_ctx, AV_LOG_INFO, "Using auto "
+                       "hwaccel type %s with new default device.\n",
+                       av_hwdevice_get_type_name(type));
+            }
+        }
+        if (dev) {
+            ist->hwaccel_device_type = type;
+        } else {
+            av_log(ist->dec_ctx, AV_LOG_INFO, "Auto hwaccel "
+                   "disabled: no device found.\n");
+            ist->hwaccel_id = HWACCEL_NONE;
+            return 0;
+        }
+    }
+
+    if (!dev) {
+        av_log(ist->dec_ctx, AV_LOG_ERROR, "No device available "
+               "for decoder: device type %s needed for codec %s.\n",
+               av_hwdevice_get_type_name(type), ist->dec->name);
+        return err;
+    }
+
+    ist->dec_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref);
+    if (!ist->dec_ctx->hw_device_ctx)
+        return AVERROR(ENOMEM);
+
+    return 0;
+}
+
+int hw_device_setup_for_encode(OutputStream *ost)
+{
+    const AVCodecHWConfig *config;
+    HWDevice *dev = NULL;
+    AVBufferRef *frames_ref = NULL;
+    int i;
+
+    if (ost->filter) {
+        frames_ref = av_buffersink_get_hw_frames_ctx(ost->filter->filter);
+        if (frames_ref &&
+            ((AVHWFramesContext*)frames_ref->data)->format ==
+            ost->enc_ctx->pix_fmt) {
+            // Matching format, will try to use hw_frames_ctx.
+        } else {
+            frames_ref = NULL;
+        }
+    }
+
+    for (i = 0;; i++) {
+        config = avcodec_get_hw_config(ost->enc, i);
+        if (!config)
+            break;
+
+        if (frames_ref &&
+            config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX &&
+            (config->pix_fmt == AV_PIX_FMT_NONE ||
+             config->pix_fmt == ost->enc_ctx->pix_fmt)) {
+            av_log(ost->enc_ctx, AV_LOG_VERBOSE, "Using input "
+                   "frames context (format %s) with %s encoder.\n",
+                   av_get_pix_fmt_name(ost->enc_ctx->pix_fmt),
+                   ost->enc->name);
+            ost->enc_ctx->hw_frames_ctx = av_buffer_ref(frames_ref);
+            if (!ost->enc_ctx->hw_frames_ctx)
+                return AVERROR(ENOMEM);
+            return 0;
+        }
+
+        if (!dev &&
+            config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX)
+            dev = hw_device_get_by_type(config->device_type);
+    }
+
+    if (dev) {
+        av_log(ost->enc_ctx, AV_LOG_VERBOSE, "Using device %s "
+               "(type %s) with %s encoder.\n", dev->name,
+               av_hwdevice_get_type_name(dev->type), ost->enc->name);
+        ost->enc_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref);
+        if (!ost->enc_ctx->hw_device_ctx)
+            return AVERROR(ENOMEM);
+    } else {
+        // No device required, or no device available.
+    }
+    return 0;
+}
+
+static int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input)
+{
+    InputStream *ist = avctx->opaque;
+    AVFrame *output = NULL;
+    enum AVPixelFormat output_format = ist->hwaccel_output_format;
+    int err;
+
+    if (input->format == output_format) {
+        // Nothing to do.
+        return 0;
+    }
+
+    output = av_frame_alloc();
+    if (!output)
+        return AVERROR(ENOMEM);
+
+    output->format = output_format;
+
+    err = av_hwframe_transfer_data(output, input, 0);
+    if (err < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to "
+               "output frame: %d.\n", err);
+        goto fail;
+    }
+
+    err = av_frame_copy_props(output, input);
+    if (err < 0) {
+        av_frame_unref(output);
+        goto fail;
+    }
+
+    av_frame_unref(input);
+    av_frame_move_ref(input, output);
+    av_frame_free(&output);
+
+    return 0;
+
+fail:
+    av_frame_free(&output);
+    return err;
+}
+
+int hwaccel_decode_init(AVCodecContext *avctx)
+{
+    InputStream *ist = avctx->opaque;
+
+    ist->hwaccel_retrieve_data = &hwaccel_retrieve_data;
+
+    return 0;
+}
+
+int hw_device_setup_for_filter(FilterGraph *fg)
+{
+    HWDevice *dev;
+    int i;
+
     // Pick the last hardware device if the user doesn't pick the device for
     // filters explicitly with the filter_hw_device option.
     if (filter_hw_device)
-        return filter_hw_device->device_ref;
+        dev = filter_hw_device;
     else if (nb_hw_devices > 0) {
-        HWDevice *dev = hw_devices[nb_hw_devices - 1];
+        dev = hw_devices[nb_hw_devices - 1];
 
         if (nb_hw_devices > 1)
             av_log(NULL, AV_LOG_WARNING, "There are %d hardware devices. device "
@@ -313,9 +567,17 @@ AVBufferRef *hw_device_for_filter(void)
                    "%s is not usable for filters.\n",
                    nb_hw_devices, dev->name,
                    av_hwdevice_get_type_name(dev->type), dev->name);
+    } else
+        dev = NULL;
 
-        return dev->device_ref;
+    if (dev) {
+        for (i = 0; i < fg->graph->nb_filters; i++) {
+            fg->graph->filters[i]->hw_device_ctx =
+                av_buffer_ref(dev->device_ref);
+            if (!fg->graph->filters[i]->hw_device_ctx)
+                return AVERROR(ENOMEM);
+        }
     }
 
-    return NULL;
+    return 0;
 }

fftools/ffmpeg_mux.h

@@ -1,113 +0,0 @@
-/*
- * Muxer internal APIs - should not be included outside of ffmpeg_mux*
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef FFTOOLS_FFMPEG_MUX_H
-#define FFTOOLS_FFMPEG_MUX_H
-
-#include <stdatomic.h>
-#include <stdint.h>
-
-#include "ffmpeg_sched.h"
-
-#include "libavformat/avformat.h"
-
-#include "libavcodec/packet.h"
-
-#include "libavutil/dict.h"
-#include "libavutil/fifo.h"
-
-typedef struct MuxStream {
-    OutputStream    ost;
-
-    // name used for logging
-    char            log_name[32];
-
-    AVBSFContext   *bsf_ctx;
-    AVPacket       *bsf_pkt;
-
-    AVPacket       *pkt;
-
-    EncStats        stats;
-
-    int             sch_idx;
-    int             sch_idx_enc;
-    int             sch_idx_src;
-
-    int             sq_idx_mux;
-
-    int64_t         max_frames;
-
-    // timestamp from which the streamcopied streams should start,
-    // in AV_TIME_BASE_Q;
-    // everything before it should be discarded
-    int64_t         ts_copy_start;
-
-    /* dts of the last packet sent to the muxer, in the stream timebase
-     * used for making up missing dts values */
-    int64_t         last_mux_dts;
-
-    int64_t         stream_duration;
-    AVRational      stream_duration_tb;
-
-    // state for av_rescale_delta() call for audio in write_packet()
-    int64_t         ts_rescale_delta_last;
-
-    // combined size of all the packets sent to the muxer
-    uint64_t        data_size_mux;
-
-    int             copy_initial_nonkeyframes;
-    int             copy_prior_start;
-    int             streamcopy_started;
-} MuxStream;
-
-typedef struct Muxer {
-    OutputFile              of;
-
-    // name used for logging
-    char                    log_name[32];
-
-    AVFormatContext        *fc;
-
-    Scheduler              *sch;
-    unsigned                sch_idx;
-
-    // OutputStream indices indexed by scheduler stream indices
-    int                    *sch_stream_idx;
-    int                  nb_sch_stream_idx;
-
-    AVDictionary           *opts;
-
-    /* filesize limit expressed in bytes */
-    int64_t                 limit_filesize;
-    atomic_int_least64_t    last_filesize;
-    int                     header_written;
-
-    SyncQueue              *sq_mux;
-    AVPacket               *sq_pkt;
-} Muxer;
-
-int mux_check_init(void *arg);
-
-static MuxStream *ms_from_ost(OutputStream *ost)
-{
-    return (MuxStream*)ost;
-}
-
-#endif /* FFTOOLS_FFMPEG_MUX_H */

fftools/ffmpeg_sched.h

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