cbs_av1: Support redundant frame headers

(cherry picked from commit f5894178fb)
cbs_av1: Fix header writing when already aligned
2018-11-05 23:11:03 +00:00 · 2018-11-05 23:10:57 +00:00 · 2018-11-05 23:10:49 +00:00 · 2018-11-05 23:10:41 +00:00 · 2018-11-04 22:06:20 -03:00 · 2018-11-04 22:06:11 -03:00
1440 changed files with 18047 additions and 60747 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@
 /lcov/
 /src
 /mapfile
-/tools/python/__pycache__/
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ cache:
  directories:
    - ffmpeg-samples
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
 install:
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
 script:
--- a/37
+++ b/37
@@ -1,43 +1,6 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.

-version 4.2:
- tpad filter
- AV1 decoding support through libdav1d
- dedot filter
- chromashift and rgbashift filters
- freezedetect filter
- truehd_core bitstream filter
- dhav demuxer
- PCM-DVD encoder
- GIF parser
- vividas demuxer
- hymt decoder
- anlmdn filter
- maskfun filter
- hcom demuxer and decoder
- ARBC decoder
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- removed libndi-newtek
- agm decoder
- KUX demuxer
- AV1 frame split bitstream filter
- lscr decoder
- lagfun filter
- asoftclip filter
- Support decoding of HEVC 4:4:4 content in vdpau
- colorhold filter
- xmedian filter
- asr filter
- showspatial multimedia filter
- VP4 video decoder
- IFV demuxer
- derain filter
- deesser filter
- mov muxer writes tracks with unspecified language instead of English by default
-
-
 version 4.1:
 - deblock filter
 - tmix filter
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-## Installing FFmpeg
+#Installing FFmpeg:

 1. Type `./configure` to create the configuration. A list of configure
 options is printed by running `configure --help`.
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -103,9 +103,18 @@ license version needs to be upgraded by passing `--enable-version3` to configure
 There are certain libraries you can combine with FFmpeg whose licenses are not
 compatible with the GPL and/or the LGPL. If you wish to enable these
 libraries, even in circumstances that their license may be incompatible, pass
-`--enable-nonfree` to configure. This will cause the resulting binary to be
+`--enable-nonfree` to configure. But note that if you enable any of these
+libraries the resulting binary will be under a complex license mix that is
+more restrictive than the LGPL and that may result in additional obligations.
+It is possible that these restrictions cause the resulting binary to be
 unredistributable.

 The Fraunhofer FDK AAC and OpenSSL libraries are under licenses which are
 incompatible with the GPLv2 and v3. To the best of our knowledge, they are
 compatible with the LGPL.
+
+The NVENC library, while its header file is licensed under the compatible MIT
+license, requires a proprietary binary blob at run time, and is deemed to be
+incompatible with the GPL. We are not certain if it is compatible with the
+LGPL, but we require `--enable-nonfree` even with LGPL configurations in case
+it is not.
--- a/11
+++ b/11
@@ -39,7 +39,7 @@ QuickTime faststart:
 Miscellaneous Areas
 ===================

-documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
+documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Lou Logan, Gyan Doshi
 project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
@@ -52,8 +52,8 @@ Communication

 website                                 Deby Barbara Lepage
 fate.ffmpeg.org                         Timothy Gu
-Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos
-mailing lists                           Baptiste Coudurier
+Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos, Lou Logan
+mailing lists                           Baptiste Coudurier, Lou Logan
 Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
 Twitter                                 Lou Logan, Reynaldo H. Verdejo Pinochet
 Launchpad                               Timothy Gu
@@ -143,7 +143,6 @@ Codecs:
  asv*                                  Michael Niedermayer
  atrac3plus*                           Maxim Poliakovski
  audiotoolbox*                         Rodger Combs
-  avs2*                                 Huiwen Ren
  bgmc.c, bgmc.h                        Thilo Borgmann
  binkaudio.c                           Peter Ross
  cavs*                                 Stefan Gehrer
@@ -168,6 +167,7 @@ Codecs:
  eacmv*, eaidct*, eat*                 Peter Ross
  evrc*                                 Paul B Mahol
  exif.c, exif.h                        Thilo Borgmann
+  exr.c                                 Martin Vignali
  ffv1*                                 Michael Niedermayer
  ffwavesynth.c                         Nicolas George
  fifo.c                                Jan Sebechlebsky
@@ -189,7 +189,6 @@ Codecs:
  libcelt_dec.c                         Nicolas George
  libcodec2.c                           Tomas Härdin
  libdirac*                             David Conrad
-  libdavs2.c                            Huiwen Ren
  libgsm.c                              Michel Bardiaux
  libkvazaar.c                          Arttu Ylä-Outinen
  libopenjpeg.c                         Jaikrishnan Menon
@@ -361,7 +360,6 @@ Filters:
  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

@@ -528,7 +526,6 @@ Alpha                                   Falk Hueffner
 MIPS                                    Manojkumar Bhosale, Shiyou Yin
 Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
-Linux / PowerPC                         Lauri Kasanen
 Windows MinGW                           Alex Beregszaszi, Ramiro Polla
 Windows Cygwin                          Victor Paesa
 Windows MSVC                            Matthew Oliver, Hendrik Leppkes
--- a/7
+++ b/7
@@ -50,9 +50,6 @@ $(TOOLS): %$(EXESUF): %.o
 target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)

-tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
-
 tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS)
 tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS)
@@ -138,7 +135,7 @@ uninstall-data:

 clean::
 	$(RM) $(CLEANSUFFIXES)
-	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
+	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
 	$(RM) -r coverage-html
 	$(RM) -rf coverage.info coverage.info.in lcov

@@ -162,7 +159,7 @@ check: all alltools examples testprogs fate

 include $(SRC_PATH)/tests/Makefile

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

 # Dummy rule to stop make trying to rebuild removed or renamed headers
--- a/2
+++ b/2
@@ -1 +1 @@
-4.1.git
+4.1
--- a/15
+++ b/15
@@ -0,0 +1,15 @@
+
+              ┌─────────────────────────────────────────────┐
+              │ RELEASE NOTES for FFmpeg 4.1 "al-Khwarizmi" │
+              └─────────────────────────────────────────────┘
+
+   The FFmpeg Project proudly presents FFmpeg 4.1 "al-Khwarizmi", about 6
+   months after the release of FFmpeg 4.0.
+
+   A complete Changelog is available at the root of the project, and the
+   complete Git history on https://git.ffmpeg.org/gitweb/ffmpeg.git
+
+   We hope you will like this release as much as we enjoyed working on it, and
+   as usual, if you have any questions about it, or any FFmpeg related topic,
+   feel free to join us on the #ffmpeg IRC channel (on irc.freenode.net) or ask
+   on the mailing-lists.
--- a/compat/avisynth/avisynth_c.h
+++ b/compat/avisynth/avisynth_c.h
@@ -34,22 +34,6 @@
 // NOTE: this is a partial update of the Avisynth C interface to recognize
 // new color spaces added in Avisynth 2.60. By no means is this document
 // completely Avisynth 2.60 compliant.
-// 170103: added new CPU constants (FMA4, AVX512xx)
-// 171102: define SIZETMOD. do not use yet, experimental. Offsets are size_t instead of int. Affects x64.
-// 171106: avs_get_row_size calls into avs_get_row_size_p, instead of direct field access
-// 171106: avs_get_height calls into avs_get_row_size_p, instead of direct field access
-// 180524: AVSC_EXPORT to dllexport in capi.h for avisynth_c_plugin_init
-// 180524: avs_is_same_colorspace VideoInfo parameters to const
-// 181230: Readability: functions regrouped to mix less AVSC_API and AVSC_INLINE, put together Avisynth+ specific stuff
-// 181230: use #ifndef AVSC_NO_DECLSPEC for AVSC_INLINE functions which are calling API functions
-// 181230: comments on avs_load_library (helper for loading API entries dynamically into a struct using AVSC_NO_DECLSPEC define)
-// 181230: define alias AVS_FRAME_ALIGN as FRAME_ALIGN
-// 181230: remove unused form of avs_get_rowsize and avs_get_height (kept earlier for reference)
-// 190104: avs_load_library: smart fallback mechanism for Avisynth+ specific functions:
-//         if they are not loadable, they will work in a classic Avisynth compatible mode
-//         Example#1: e.g. avs_is_444 will call the existing avs_is_yv24 instead
-//         Example#2: avs_bits_per_component will return 8 for all colorspaces (Classic Avisynth supports only 8 bits/pixel)
-//         Thus the Avisynth+ specific API functions are safely callable even when connected to classic Avisynth DLL

 #ifndef __AVISYNTH_C__
 #define __AVISYNTH_C__
@@ -58,7 +42,7 @@
 #include "avs/capi.h"
 #include "avs/types.h"

-#define AVS_FRAME_ALIGN FRAME_ALIGN
+
 /////////////////////////////////////////////////////////////////////
 //
 // Constants
@@ -140,7 +124,7 @@ enum {
    AVS_CS_GENERIC_YUVA444 = AVS_CS_PLANAR | AVS_CS_YUVA | AVS_CS_VPLANEFIRST | AVS_CS_SUB_HEIGHT_1 | AVS_CS_SUB_WIDTH_1 }; // 4:4:4:A planar


-  // Specific color formats
+  // Specific colorformats
 enum {
  AVS_CS_UNKNOWN = 0,
  AVS_CS_BGR24 = AVS_CS_RGB_TYPE  | AVS_CS_BGR | AVS_CS_INTERLEAVED,
@@ -150,18 +134,18 @@ enum {
  //  AVS_CS_I420  = 1<<4  Reserved
  AVS_CS_RAW32 = 1<<5 | AVS_CS_INTERLEAVED,

-  AVS_CS_YV24  = AVS_CS_GENERIC_YUV444 | AVS_CS_SAMPLE_BITS_8,  // YUV 4:4:4 planar
-  AVS_CS_YV16  = AVS_CS_GENERIC_YUV422 | AVS_CS_SAMPLE_BITS_8,  // YUV 4:2:2 planar
-  AVS_CS_YV12  = AVS_CS_GENERIC_YUV420 | AVS_CS_SAMPLE_BITS_8,  // YUV 4:2:0 planar
+  AVS_CS_YV24  = AVS_CS_GENERIC_YUV444 | AVS_CS_SAMPLE_BITS_8,  // YVU 4:4:4 planar
+  AVS_CS_YV16  = AVS_CS_GENERIC_YUV422 | AVS_CS_SAMPLE_BITS_8,  // YVU 4:2:2 planar
+  AVS_CS_YV12  = AVS_CS_GENERIC_YUV420 | AVS_CS_SAMPLE_BITS_8,  // YVU 4:2:0 planar
  AVS_CS_I420  = AVS_CS_PLANAR | AVS_CS_YUV | AVS_CS_SAMPLE_BITS_8 | AVS_CS_UPLANEFIRST | AVS_CS_SUB_HEIGHT_2 | AVS_CS_SUB_WIDTH_2,  // YUV 4:2:0 planar
  AVS_CS_IYUV  = AVS_CS_I420,
-  AVS_CS_YV411 = AVS_CS_PLANAR | AVS_CS_YUV | AVS_CS_SAMPLE_BITS_8 | AVS_CS_VPLANEFIRST | AVS_CS_SUB_HEIGHT_1 | AVS_CS_SUB_WIDTH_4,  // YUV 4:1:1 planar
-  AVS_CS_YUV9  = AVS_CS_PLANAR | AVS_CS_YUV | AVS_CS_SAMPLE_BITS_8 | AVS_CS_VPLANEFIRST | AVS_CS_SUB_HEIGHT_4 | AVS_CS_SUB_WIDTH_4,  // YUV 4:1:0 planar
+  AVS_CS_YV411 = AVS_CS_PLANAR | AVS_CS_YUV | AVS_CS_SAMPLE_BITS_8 | AVS_CS_VPLANEFIRST | AVS_CS_SUB_HEIGHT_1 | AVS_CS_SUB_WIDTH_4,  // YVU 4:1:1 planar
+  AVS_CS_YUV9  = AVS_CS_PLANAR | AVS_CS_YUV | AVS_CS_SAMPLE_BITS_8 | AVS_CS_VPLANEFIRST | AVS_CS_SUB_HEIGHT_4 | AVS_CS_SUB_WIDTH_4,  // YVU 4:1:0 planar
  AVS_CS_Y8    = AVS_CS_GENERIC_Y | AVS_CS_SAMPLE_BITS_8,       // Y   4:0:0 planar

  //-------------------------
  // AVS16: new planar constants go live! Experimental PF 160613
-  // 10-12-14-16 bit + planar RGB + BGR48/64 160725
+  // 10-12-14 bit + planar RGB + BRG48/64 160725
  AVS_CS_YUV444P10 = AVS_CS_GENERIC_YUV444 | AVS_CS_SAMPLE_BITS_10, // YUV 4:4:4 10bit samples
  AVS_CS_YUV422P10 = AVS_CS_GENERIC_YUV422 | AVS_CS_SAMPLE_BITS_10, // YUV 4:2:2 10bit samples
  AVS_CS_YUV420P10 = AVS_CS_GENERIC_YUV420 | AVS_CS_SAMPLE_BITS_10, // YUV 4:2:0 10bit samples
@@ -262,9 +246,9 @@ enum {  //SUBTYPES
 enum {
  // New 2.6 explicitly defined cache hints.
  AVS_CACHE_NOTHING=10, // Do not cache video.
-  AVS_CACHE_WINDOW=11, // Hard protect up to X frames within a range of X from the current frame N.
-  AVS_CACHE_GENERIC=12, // LRU cache up to X frames.
-  AVS_CACHE_FORCE_GENERIC=13, // LRU cache up to X frames, override any previous CACHE_WINDOW.
+  AVS_CACHE_WINDOW=11, // Hard protect upto X frames within a range of X from the current frame N.
+  AVS_CACHE_GENERIC=12, // LRU cache upto X frames.
+  AVS_CACHE_FORCE_GENERIC=13, // LRU cache upto X frames, override any previous CACHE_WINDOW.

  AVS_CACHE_GET_POLICY=30, // Get the current policy.
  AVS_CACHE_GET_WINDOW=31, // Get the current window h_span.
@@ -272,8 +256,8 @@ enum {

  AVS_CACHE_AUDIO=50, // Explicitly do cache audio, X byte cache.
  AVS_CACHE_AUDIO_NOTHING=51, // Explicitly do not cache audio.
-  AVS_CACHE_AUDIO_NONE=52, // Audio cache off (auto mode), X byte initial cache.
-  AVS_CACHE_AUDIO_AUTO=53, // Audio cache on (auto mode), X byte initial cache.
+  AVS_CACHE_AUDIO_NONE=52, // Audio cache off (auto mode), X byte intial cache.
+  AVS_CACHE_AUDIO_AUTO=53, // Audio cache on (auto mode), X byte intial cache.

  AVS_CACHE_GET_AUDIO_POLICY=70, // Get the current audio policy.
  AVS_CACHE_GET_AUDIO_SIZE=71, // Get the current audio cache size.
@@ -300,7 +284,7 @@ enum {
    AVS_CACHE_COST_MED=224, // Child response of medium cost. (Real time)
    AVS_CACHE_COST_HI=225, // Child response of heavy cost. (Slow)

-  AVS_CACHE_GETCHILD_THREAD_MODE=240, // Cache ask Child for thread safety.
+  AVS_CACHE_GETCHILD_THREAD_MODE=240, // Cache ask Child for thread safetyness.
    AVS_CACHE_THREAD_UNSAFE=241, // Only 1 thread allowed for all instances. 2.5 filters default!
    AVS_CACHE_THREAD_CLASS=242, // Only 1 thread allowed for each instance. 2.6 filters default!
    AVS_CACHE_THREAD_SAFE=243, //  Allow all threads in any instance.
@@ -313,8 +297,6 @@ enum {
  };

 #ifdef BUILDING_AVSCORE
-AVSValue create_c_video_filter(AVSValue args, void * user_data, IScriptEnvironment * e0);
-
 struct AVS_ScriptEnvironment {
        IScriptEnvironment * env;
        const char * error;
@@ -331,7 +313,7 @@ typedef struct AVS_ScriptEnvironment AVS_ScriptEnvironment;
 // AVS_VideoInfo
 //

-// AVS_VideoInfo is laid out identically to VideoInfo
+// AVS_VideoInfo is layed out identicly to VideoInfo
 typedef struct AVS_VideoInfo {
  int width, height;    // width=0 means no video
  unsigned fps_numerator, fps_denominator;
@@ -344,7 +326,7 @@ typedef struct AVS_VideoInfo {
  INT64 num_audio_samples;
  int nchannels;

-  // Image type properties
+  // Imagetype properties

  int image_type;
 } AVS_VideoInfo;
@@ -371,20 +353,77 @@ AVSC_INLINE int avs_is_yuv(const AVS_VideoInfo * p)
 AVSC_INLINE int avs_is_yuy2(const AVS_VideoInfo * p)
        { return (p->pixel_type & AVS_CS_YUY2) == AVS_CS_YUY2; }

-AVSC_API(int, avs_is_yv24)(const AVS_VideoInfo * p); // avs+: for generic 444 check, use avs_is_yuv444
+AVSC_API(int, avs_is_rgb48)(const AVS_VideoInfo * p);

-AVSC_API(int, avs_is_yv16)(const AVS_VideoInfo * p); // avs+: for generic 422 check, use avs_is_yuv422
+AVSC_API(int, avs_is_rgb64)(const AVS_VideoInfo * p);

-AVSC_API(int, avs_is_yv12)(const AVS_VideoInfo * p) ; // avs+: for generic 420 check, use avs_is_yuv420
+AVSC_API(int, avs_is_yv24)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yv16)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yv12)(const AVS_VideoInfo * p) ;

 AVSC_API(int, avs_is_yv411)(const AVS_VideoInfo * p);

-AVSC_API(int, avs_is_y8)(const AVS_VideoInfo * p); // avs+: for generic grayscale, use avs_is_y
+AVSC_API(int, avs_is_y8)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv444p16)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv422p16)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv420p16)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_y16)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv444ps)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv422ps)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuv420ps)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_y32)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_444)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_422)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_420)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_y)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_yuva)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_planar_rgb)(const AVS_VideoInfo * p);
+
+AVSC_API(int, avs_is_planar_rgba)(const AVS_VideoInfo * p);
+
+
+
+AVSC_INLINE int avs_is_property(const AVS_VideoInfo * p, int property)
+        { return ((p->image_type & property)==property ); }
+
+AVSC_INLINE int avs_is_planar(const AVS_VideoInfo * p)
+        { return !!(p->pixel_type & AVS_CS_PLANAR); }
+
+AVSC_API(int, avs_is_color_space)(const AVS_VideoInfo * p, int c_space);
+
+AVSC_INLINE int avs_is_field_based(const AVS_VideoInfo * p)
+        { return !!(p->image_type & AVS_IT_FIELDBASED); }
+
+AVSC_INLINE int avs_is_parity_known(const AVS_VideoInfo * p)
+        { return ((p->image_type & AVS_IT_FIELDBASED)&&(p->image_type & (AVS_IT_BFF | AVS_IT_TFF))); }
+
+AVSC_INLINE int avs_is_bff(const AVS_VideoInfo * p)
+        { return !!(p->image_type & AVS_IT_BFF); }
+
+AVSC_INLINE int avs_is_tff(const AVS_VideoInfo * p)
+        { return !!(p->image_type & AVS_IT_TFF); }

 AVSC_API(int, avs_get_plane_width_subsampling)(const AVS_VideoInfo * p, int plane);

 AVSC_API(int, avs_get_plane_height_subsampling)(const AVS_VideoInfo * p, int plane);

+
 AVSC_API(int, avs_bits_per_pixel)(const AVS_VideoInfo * p);

 AVSC_API(int, avs_bytes_from_pixels)(const AVS_VideoInfo * p, int pixels);
@@ -393,42 +432,10 @@ AVSC_API(int, avs_row_size)(const AVS_VideoInfo * p, int plane);

 AVSC_API(int, avs_bmp_size)(const AVS_VideoInfo * vi);

-AVSC_API(int, avs_is_color_space)(const AVS_VideoInfo * p, int c_space);
-
-// no API for these, inline helper functions
-AVSC_INLINE int avs_is_property(const AVS_VideoInfo * p, int property)
-{
-  return ((p->image_type & property) == property);
-}
-
-AVSC_INLINE int avs_is_planar(const AVS_VideoInfo * p)
-{
-  return !!(p->pixel_type & AVS_CS_PLANAR);
-}
-
-AVSC_INLINE int avs_is_field_based(const AVS_VideoInfo * p)
-{
-  return !!(p->image_type & AVS_IT_FIELDBASED);
-}
-
-AVSC_INLINE int avs_is_parity_known(const AVS_VideoInfo * p)
-{
-  return ((p->image_type & AVS_IT_FIELDBASED) && (p->image_type & (AVS_IT_BFF | AVS_IT_TFF)));
-}
-
-AVSC_INLINE int avs_is_bff(const AVS_VideoInfo * p)
-{
-  return !!(p->image_type & AVS_IT_BFF);
-}
-
-AVSC_INLINE int avs_is_tff(const AVS_VideoInfo * p)
-{
-  return !!(p->image_type & AVS_IT_TFF);
-}
-
 AVSC_INLINE int avs_samples_per_second(const AVS_VideoInfo * p)
        { return p->audio_samples_per_second; }

+
 AVSC_INLINE int avs_bytes_per_channel_sample(const AVS_VideoInfo * p)
 {
    switch (p->sample_type) {
@@ -440,7 +447,6 @@ AVSC_INLINE int avs_bytes_per_channel_sample(const AVS_VideoInfo * p)
      default: return 0;
    }
 }
-
 AVSC_INLINE int avs_bytes_per_audio_sample(const AVS_VideoInfo * p)
        { return p->nchannels*avs_bytes_per_channel_sample(p);}

@@ -482,56 +488,19 @@ AVSC_INLINE void avs_set_fps(AVS_VideoInfo * p, unsigned numerator, unsigned den
    p->fps_denominator = denominator/x;
 }

-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE int avs_is_same_colorspace(const AVS_VideoInfo * x, const AVS_VideoInfo * y)
+#ifdef AVS_IMPLICIT_FUNCTION_DECLARATION_ERROR
+AVSC_INLINE int avs_is_same_colorspace(AVS_VideoInfo * x, AVS_VideoInfo * y)
 {
        return (x->pixel_type == y->pixel_type)
                || (avs_is_yv12(x) && avs_is_yv12(y));
 }
 #endif

-// Avisynth+ extensions
-AVSC_API(int, avs_is_rgb48)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_rgb64)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_yuv444p16)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv444
-
-AVSC_API(int, avs_is_yuv422p16)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv422
-
-AVSC_API(int, avs_is_yuv420p16)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv420
-
-AVSC_API(int, avs_is_y16)(const AVS_VideoInfo * p); // obsolete, use avs_is_y
-
-AVSC_API(int, avs_is_yuv444ps)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv444
-
-AVSC_API(int, avs_is_yuv422ps)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv422
-
-AVSC_API(int, avs_is_yuv420ps)(const AVS_VideoInfo * p); // obsolete, use avs_is_yuv420
-
-AVSC_API(int, avs_is_y32)(const AVS_VideoInfo * p); // obsolete, use avs_is_y
-
-AVSC_API(int, avs_is_444)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_422)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_420)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_y)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_yuva)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_planar_rgb)(const AVS_VideoInfo * p);
-
-AVSC_API(int, avs_is_planar_rgba)(const AVS_VideoInfo * p);
-
 AVSC_API(int, avs_num_components)(const AVS_VideoInfo * p);

 AVSC_API(int, avs_component_size)(const AVS_VideoInfo * p);

 AVSC_API(int, avs_bits_per_component)(const AVS_VideoInfo * p);
-// end of Avisynth+ specific

 /////////////////////////////////////////////////////////////////////
 //
@@ -544,15 +513,11 @@ AVSC_API(int, avs_bits_per_component)(const AVS_VideoInfo * p);
 // to be reused.  The instances are deleted when the corresponding AVS
 // file is closed.

-// AVS_VideoFrameBuffer is laid out identically to VideoFrameBuffer
+// AVS_VideoFrameBuffer is layed out identicly to VideoFrameBuffer
 // DO NOT USE THIS STRUCTURE DIRECTLY
 typedef struct AVS_VideoFrameBuffer {
  BYTE * data;
-#ifdef SIZETMOD
-  size_t data_size;
-#else
  int data_size;
-#endif
  // sequence_number is incremented every time the buffer is changed, so
  // that stale views can tell they're no longer valid.
  volatile long sequence_number;
@@ -562,94 +527,56 @@ typedef struct AVS_VideoFrameBuffer {

 // VideoFrame holds a "window" into a VideoFrameBuffer.

-// AVS_VideoFrame is laid out identically to IVideoFrame
+// AVS_VideoFrame is layed out identicly to IVideoFrame
 // DO NOT USE THIS STRUCTURE DIRECTLY
 typedef struct AVS_VideoFrame {
  volatile long refcount;
  AVS_VideoFrameBuffer * vfb;
-#ifdef SIZETMOD
-  size_t offset;
-#else
-  int offset;
-#endif
-  int pitch, row_size, height;
-#ifdef SIZETMOD
-  size_t offsetU, offsetV;
-#else
-  int offsetU, offsetV;
-#endif
-  int pitchUV;  // U&V offsets are from top of picture.
-  int row_sizeUV, heightUV; // for Planar RGB offsetU, offsetV is for the 2nd and 3rd Plane.
-                            // for Planar RGB pitchUV and row_sizeUV = 0, because when no VideoInfo (MakeWriteable)
-                            // the decision on existence of UV is checked by zero pitch
-  // AVS+ extension, avisynth.h: class does not break plugins if appended here
-#ifdef SIZETMOD
-  size_t offsetA;
-#else
-  int offsetA;
-#endif
-  int pitchA, row_sizeA; // 4th alpha plane support, pitch and row_size is 0 is none
+  int offset, pitch, row_size, height, offsetU, offsetV, pitchUV;  // U&V offsets are from top of picture.
+  int row_sizeUV, heightUV;
 } AVS_VideoFrame;

 // Access functions for AVS_VideoFrame
 AVSC_API(int, avs_get_pitch_p)(const AVS_VideoFrame * p, int plane);

+#ifdef AVS_IMPLICIT_FUNCTION_DECLARATION_ERROR
+AVSC_INLINE int avs_get_pitch(const AVS_VideoFrame * p) {
+        return avs_get_pitch_p(p, 0);}
+#endif
+
 AVSC_API(int, avs_get_row_size_p)(const AVS_VideoFrame * p, int plane);

+AVSC_INLINE int avs_get_row_size(const AVS_VideoFrame * p) {
+        return p->row_size; }
+
 AVSC_API(int, avs_get_height_p)(const AVS_VideoFrame * p, int plane);

+AVSC_INLINE int avs_get_height(const AVS_VideoFrame * p) {
+        return p->height;}
+
 AVSC_API(const BYTE *, avs_get_read_ptr_p)(const AVS_VideoFrame * p, int plane);

+#ifdef AVS_IMPLICIT_FUNCTION_DECLARATION_ERROR
+AVSC_INLINE const BYTE* avs_get_read_ptr(const AVS_VideoFrame * p) {
+        return avs_get_read_ptr_p(p, 0);}
+#endif
+
 AVSC_API(int, avs_is_writable)(const AVS_VideoFrame * p);

 AVSC_API(BYTE *, avs_get_write_ptr_p)(const AVS_VideoFrame * p, int plane);

-AVSC_API(void, avs_release_video_frame)(AVS_VideoFrame *);
-// makes a shallow copy of a video frame
-AVSC_API(AVS_VideoFrame *, avs_copy_video_frame)(AVS_VideoFrame *);
-
-// no API for these, inline helper functions
-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE int avs_get_pitch(const AVS_VideoFrame * p) {
-  return avs_get_pitch_p(p, 0);
-}
-#endif
-
-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE int avs_get_row_size(const AVS_VideoFrame * p) {
-        return avs_get_row_size_p(p, 0); }
-#endif
-
-
-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE int avs_get_height(const AVS_VideoFrame * p) {
-  return avs_get_height_p(p, 0);
-}
-#endif
-
-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE const BYTE* avs_get_read_ptr(const AVS_VideoFrame * p) {
-        return avs_get_read_ptr_p(p, 0);}
-#endif
-
-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
+#ifdef AVS_IMPLICIT_FUNCTION_DECLARATION_ERROR
 AVSC_INLINE BYTE* avs_get_write_ptr(const AVS_VideoFrame * p) {
        return avs_get_write_ptr_p(p, 0);}
 #endif

-#ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE void avs_release_frame(AVS_VideoFrame * f)
-  {avs_release_video_frame(f);}
-#endif
+AVSC_API(void, avs_release_video_frame)(AVS_VideoFrame *);
+// makes a shallow copy of a video frame
+AVSC_API(AVS_VideoFrame *, avs_copy_video_frame)(AVS_VideoFrame *);

 #ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
+AVSC_INLINE void avs_release_frame(AVS_VideoFrame * f)
+  {avs_release_video_frame(f);}
 AVSC_INLINE AVS_VideoFrame * avs_copy_frame(AVS_VideoFrame * f)
  {return avs_copy_video_frame(f);}
 #endif
@@ -660,14 +587,14 @@ AVSC_INLINE AVS_VideoFrame * avs_copy_frame(AVS_VideoFrame * f)
 //

 // Treat AVS_Value as a fat pointer.  That is use avs_copy_value
-// and avs_release_value appropriately as you would if AVS_Value was
+// and avs_release_value appropiaty as you would if AVS_Value was
 // a pointer.

 // To maintain source code compatibility with future versions of the
 // avisynth_c API don't use the AVS_Value directly.  Use the helper
 // functions below.

-// AVS_Value is laid out identically to AVSValue
+// AVS_Value is layed out identicly to AVSValue
 typedef struct AVS_Value AVS_Value;
 struct AVS_Value {
  short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong
@@ -683,19 +610,15 @@ struct AVS_Value {
  } d;
 };

-// AVS_Value should be initialized with avs_void.
+// AVS_Value should be initilized with avs_void.
 // Should also set to avs_void after the value is released
-// with avs_copy_value.  Consider it the equivalent of setting
+// with avs_copy_value.  Consider it the equalvent of setting
 // a pointer to NULL
 static const AVS_Value avs_void = {'v'};

 AVSC_API(void, avs_copy_value)(AVS_Value * dest, AVS_Value src);
 AVSC_API(void, avs_release_value)(AVS_Value);
-AVSC_API(AVS_Clip *, avs_take_clip)(AVS_Value, AVS_ScriptEnvironment *);
-AVSC_API(void, avs_set_to_clip)(AVS_Value *, AVS_Clip *);

-
-// no API for these, inline helper functions
 AVSC_INLINE int avs_defined(AVS_Value v) { return v.type != 'v'; }
 AVSC_INLINE int avs_is_clip(AVS_Value v) { return v.type == 'c'; }
 AVSC_INLINE int avs_is_bool(AVS_Value v) { return v.type == 'b'; }
@@ -705,6 +628,9 @@ AVSC_INLINE int avs_is_string(AVS_Value v) { return v.type == 's'; }
 AVSC_INLINE int avs_is_array(AVS_Value v) { return v.type == 'a'; }
 AVSC_INLINE int avs_is_error(AVS_Value v) { return v.type == 'e'; }

+AVSC_API(AVS_Clip *, avs_take_clip)(AVS_Value, AVS_ScriptEnvironment *);
+AVSC_API(void, avs_set_to_clip)(AVS_Value *, AVS_Clip *);
+
 AVSC_INLINE int avs_as_bool(AVS_Value v)
        { return v.d.boolean; }
 AVSC_INLINE int avs_as_int(AVS_Value v)
@@ -735,13 +661,11 @@ AVSC_INLINE AVS_Value avs_new_value_float(float v0)
 AVSC_INLINE AVS_Value avs_new_value_error(const char * v0)
        { AVS_Value v; v.type = 'e'; v.d.string = v0; return v; }
 #ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
 AVSC_INLINE AVS_Value avs_new_value_clip(AVS_Clip * v0)
        { AVS_Value v; avs_set_to_clip(&v, v0); return v; }
 #endif
 AVSC_INLINE AVS_Value avs_new_value_array(AVS_Value * v0, int size)
        { AVS_Value v; v.type = 'a'; v.d.array = v0; v.array_size = (short)size; return v; }
-// end of inline helper functions

 /////////////////////////////////////////////////////////////////////
 //
@@ -798,7 +722,7 @@ struct AVS_FilterInfo

 // Create a new filter
 // fi is set to point to the AVS_FilterInfo so that you can
-//   modify it once it is initialized.
+//   modify it once it is initilized.
 // store_child should generally be set to true.  If it is not
 //    set than ALL methods (the function pointers) must be defined
 // If it is set than you do not need to worry about freeing the child
@@ -829,26 +753,10 @@ enum {
  AVS_CPUF_SSSE3      = 0x200,   //  Core 2
  AVS_CPUF_SSE4       = 0x400,   //  Penryn, Wolfdale, Yorkfield
  AVS_CPUF_SSE4_1     = 0x400,
-  AVS_CPUF_AVX        = 0x800,   //  Sandy Bridge, Bulldozer
+//AVS_CPUF_AVX        = 0x800,   //  Sandy Bridge, Bulldozer
  AVS_CPUF_SSE4_2    = 0x1000,   //  Nehalem
-  // AVS+
-  AVS_CPUF_AVX2      = 0x2000,   //  Haswell
-  AVS_CPUF_FMA3      = 0x4000,
-  AVS_CPUF_F16C      = 0x8000,
-  AVS_CPUF_MOVBE     = 0x10000,   // Big Endian Move
-  AVS_CPUF_POPCNT    = 0x20000,
-  AVS_CPUF_AES       = 0x40000,
-  AVS_CPUF_FMA4      = 0x80000,
-
-  AVS_CPUF_AVX512F    = 0x100000,  // AVX-512 Foundation.
-  AVS_CPUF_AVX512DQ   = 0x200000,  // AVX-512 DQ (Double/Quad granular) Instructions
-  AVS_CPUF_AVX512PF   = 0x400000,  // AVX-512 Prefetch
-  AVS_CPUF_AVX512ER   = 0x800000,  // AVX-512 Exponential and Reciprocal
-  AVS_CPUF_AVX512CD   = 0x1000000, // AVX-512 Conflict Detection
-  AVS_CPUF_AVX512BW   = 0x2000000, // AVX-512 BW (Byte/Word granular) Instructions
-  AVS_CPUF_AVX512VL   = 0x4000000, // AVX-512 VL (128/256 Vector Length) Extensions
-  AVS_CPUF_AVX512IFMA = 0x8000000, // AVX-512 IFMA integer 52 bit
-  AVS_CPUF_AVX512VBMI = 0x10000000 // AVX-512 VBMI
+//AVS_CPUF_AVX2      = 0x2000,   //  Haswell
+//AVS_CPUF_AVX512    = 0x4000,   //  Knights Landing
 };


@@ -885,23 +793,20 @@ AVSC_API(int, avs_set_global_var)(AVS_ScriptEnvironment *, const char* name, con

 AVSC_API(AVS_VideoFrame *, avs_new_video_frame_a)(AVS_ScriptEnvironment *,
                                          const AVS_VideoInfo * vi, int align);
-// align should be at least 16 for classic Avisynth
-// Avisynth+: any value, Avs+ ensures a minimum alignment if too small align is provided
+// align should be at least 16

-// no API for these, inline helper functions
 #ifndef AVSC_NO_DECLSPEC
-// this inline function is calling an API function
-AVSC_INLINE AVS_VideoFrame * avs_new_video_frame(AVS_ScriptEnvironment * env,
+AVSC_INLINE
+AVS_VideoFrame * avs_new_video_frame(AVS_ScriptEnvironment * env,
                                     const AVS_VideoInfo * vi)
-  {return avs_new_video_frame_a(env,vi,AVS_FRAME_ALIGN);}
+  {return avs_new_video_frame_a(env,vi,FRAME_ALIGN);}

-// an older compatibility alias
-// this inline function is calling an API function
-AVSC_INLINE AVS_VideoFrame * avs_new_frame(AVS_ScriptEnvironment * env,
+AVSC_INLINE
+AVS_VideoFrame * avs_new_frame(AVS_ScriptEnvironment * env,
                               const AVS_VideoInfo * vi)
-  {return avs_new_video_frame_a(env,vi,AVS_FRAME_ALIGN);}
+  {return avs_new_video_frame_a(env,vi,FRAME_ALIGN);}
 #endif
-// end of inline helper functions
+

 AVSC_API(int, avs_make_writable)(AVS_ScriptEnvironment *, AVS_VideoFrame * * pvf);

@@ -934,10 +839,7 @@ AVSC_API(AVS_VideoFrame *, avs_subframe_planar)(AVS_ScriptEnvironment *, AVS_Vid
 // The returned video frame must be be released

 #ifdef AVSC_NO_DECLSPEC
-// This part uses LoadLibrary and related functions to dynamically load Avisynth instead of declspec(dllimport)
-// When AVSC_NO_DECLSPEC is defined, you can use avs_load_library to populate API functions into a struct
-// AVSC_INLINE functions which call onto an API functions should be treated specially (todo)
-
+// use LoadLibrary and related functions to dynamically load Avisynth instead of declspec(dllimport)
 /*
  The following functions needs to have been declared, probably from windows.h

@@ -954,14 +856,6 @@ typedef struct AVS_Library AVS_Library;

 #define AVSC_DECLARE_FUNC(name) name##_func name

-// AVSC_DECLARE_FUNC helps keeping naming convention: type is xxxxx_func, function name is xxxxx
-// e.g. "AVSC_DECLARE_FUNC(avs_add_function);"
-// is a shortcut for "avs_add_function_func avs_add_function;"
-
-// Note: AVSC_INLINE functions which call into API,
-// are guarded by #ifndef AVSC_NO_DECLSPEC
-// They should call the appropriate library-> API entry
-
 struct AVS_Library {
  HMODULE handle;

@@ -1004,30 +898,13 @@ struct AVS_Library {
  AVSC_DECLARE_FUNC(avs_vsprintf);

  AVSC_DECLARE_FUNC(avs_get_error);
+  AVSC_DECLARE_FUNC(avs_is_rgb48);
+  AVSC_DECLARE_FUNC(avs_is_rgb64);
  AVSC_DECLARE_FUNC(avs_is_yv24);
  AVSC_DECLARE_FUNC(avs_is_yv16);
  AVSC_DECLARE_FUNC(avs_is_yv12);
  AVSC_DECLARE_FUNC(avs_is_yv411);
  AVSC_DECLARE_FUNC(avs_is_y8);
-  AVSC_DECLARE_FUNC(avs_is_color_space);
-
-  AVSC_DECLARE_FUNC(avs_get_plane_width_subsampling);
-  AVSC_DECLARE_FUNC(avs_get_plane_height_subsampling);
-  AVSC_DECLARE_FUNC(avs_bits_per_pixel);
-  AVSC_DECLARE_FUNC(avs_bytes_from_pixels);
-  AVSC_DECLARE_FUNC(avs_row_size);
-  AVSC_DECLARE_FUNC(avs_bmp_size);
-  AVSC_DECLARE_FUNC(avs_get_pitch_p);
-  AVSC_DECLARE_FUNC(avs_get_row_size_p);
-  AVSC_DECLARE_FUNC(avs_get_height_p);
-  AVSC_DECLARE_FUNC(avs_get_read_ptr_p);
-  AVSC_DECLARE_FUNC(avs_is_writable);
-  AVSC_DECLARE_FUNC(avs_get_write_ptr_p);
-
-  // Avisynth+ specific
-  // Note: these functions are simulated/use fallback to existing functions
-  AVSC_DECLARE_FUNC(avs_is_rgb48);
-  AVSC_DECLARE_FUNC(avs_is_rgb64);
  AVSC_DECLARE_FUNC(avs_is_yuv444p16);
  AVSC_DECLARE_FUNC(avs_is_yuv422p16);
  AVSC_DECLARE_FUNC(avs_is_yuv420p16);
@@ -1043,54 +920,29 @@ struct AVS_Library {
  AVSC_DECLARE_FUNC(avs_is_yuva);
  AVSC_DECLARE_FUNC(avs_is_planar_rgb);
  AVSC_DECLARE_FUNC(avs_is_planar_rgba);
+  AVSC_DECLARE_FUNC(avs_is_color_space);
+
+  AVSC_DECLARE_FUNC(avs_get_plane_width_subsampling);
+  AVSC_DECLARE_FUNC(avs_get_plane_height_subsampling);
+  AVSC_DECLARE_FUNC(avs_bits_per_pixel);
+  AVSC_DECLARE_FUNC(avs_bytes_from_pixels);
+  AVSC_DECLARE_FUNC(avs_row_size);
+  AVSC_DECLARE_FUNC(avs_bmp_size);
+  AVSC_DECLARE_FUNC(avs_get_pitch_p);
+  AVSC_DECLARE_FUNC(avs_get_row_size_p);
+  AVSC_DECLARE_FUNC(avs_get_height_p);
+  AVSC_DECLARE_FUNC(avs_get_read_ptr_p);
+  AVSC_DECLARE_FUNC(avs_is_writable);
+  AVSC_DECLARE_FUNC(avs_get_write_ptr_p);
+
  AVSC_DECLARE_FUNC(avs_num_components);
  AVSC_DECLARE_FUNC(avs_component_size);
  AVSC_DECLARE_FUNC(avs_bits_per_component);
-  // end of Avisynth+ specific

 };

 #undef AVSC_DECLARE_FUNC

-// Helper functions for fallback simulation
-// Avisynth+ extensions do not exist in classic Avisynth so they are simulated
-AVSC_INLINE int avs_is_xx_fallback_return_false(const AVS_VideoInfo * p)
-{
-  return 0;
-}
-
-// Avisynth+ extensions do not exist in classic Avisynth so they are simulated
-AVSC_INLINE int avs_num_components_fallback(const AVS_VideoInfo * p)
-{
-  switch (p->pixel_type) {
-  case AVS_CS_UNKNOWN:
-    return 0;
-  case AVS_CS_RAW32:
-  case AVS_CS_Y8:
-    return 1;
-  case AVS_CS_BGR32:
-    return 4; // not planar but return the count
-  default:
-    return 3;
-  }
-}
-
-// Avisynth+ extensions do not exist in classic Avisynth so they are simulated
-AVSC_INLINE int avs_component_size_fallback(const AVS_VideoInfo * p)
-{
-  return 1;
-}
-
-// Avisynth+ extensions do not exist in classic Avisynth so they are simulated
-AVSC_INLINE int avs_bits_per_component_fallback(const AVS_VideoInfo * p)
-{
-  return 8;
-}
-// End of helper functions for fallback simulation
-
-// avs_load_library() allocates an array for API procedure entries
-// reads and fills the entries with live procedure addresses.
-// AVSC_INLINE helpers which are calling into API procedures are not treated here (todo)

 AVSC_INLINE AVS_Library * avs_load_library() {
  AVS_Library *library = (AVS_Library *)malloc(sizeof(AVS_Library));
@@ -1108,55 +960,6 @@ AVSC_INLINE AVS_Library * avs_load_library() {
    goto fail;\
 }

-#if 0
-// FFmpeg-specific: we don't use the FALLBACK stuff, and it causes build errors,
-// so ifdef it out on our side.
-
-// When an API function is not loadable, let's try a replacement
-// Missing Avisynth+ functions will be substituted with classic Avisynth compatible methods
-/*
-Avisynth+                 When method is missing (classic Avisynth)
-avs_is_rgb48              constant false
-avs_is_rgb64              constant false
-avs_is_yuv444p16          constant false
-avs_is_yuv422p16          constant false
-avs_is_yuv420p16          constant false
-avs_is_y16                constant false
-avs_is_yuv444ps           constant false
-avs_is_yuv422ps           constant false
-avs_is_yuv420ps           constant false
-avs_is_y32                constant false
-avs_is_444                avs_is_yv24
-avs_is_422                avs_is_yv16
-avs_is_420                avs_is_yv12
-avs_is_y                  avs_is_y8
-avs_is_yuva               constant false
-avs_is_planar_rgb         constant false
-avs_is_planar_rgba        constant false
-avs_num_components        special: avs_num_components_fake Y8:1 RGB32:4 else 3
-avs_component_size        constant 1 (1 bytes/component)
-avs_bits_per_component    constant 8 (8 bits/component)
-*/
-
-  // try to load an alternative function
-#define AVSC_LOAD_FUNC_FALLBACK(name,name2) {\
-  library->name = (name##_func) GetProcAddress(library->handle, AVSC_STRINGIFY(name));\
-  if (library->name == NULL)\
-    library->name = (name##_func) GetProcAddress(library->handle, AVSC_STRINGIFY(name2));\
-  if (library->name == NULL)\
-    goto fail;\
-}
-
-  // try to assign a replacement function
-#define AVSC_LOAD_FUNC_FALLBACK_SIMULATED(name,name2) {\
-  library->name = (name##_func) GetProcAddress(library->handle, AVSC_STRINGIFY(name));\
-  if (library->name == NULL)\
-    library->name = name2;\
-  if (library->name == NULL)\
-    goto fail;\
-}
-#endif
-
  AVSC_LOAD_FUNC(avs_add_function);
  AVSC_LOAD_FUNC(avs_at_exit);
  AVSC_LOAD_FUNC(avs_bit_blt);
@@ -1196,11 +999,28 @@ avs_bits_per_component    constant 8 (8 bits/component)
  AVSC_LOAD_FUNC(avs_vsprintf);

  AVSC_LOAD_FUNC(avs_get_error);
+  AVSC_LOAD_FUNC(avs_is_rgb48);
+  AVSC_LOAD_FUNC(avs_is_rgb64);
  AVSC_LOAD_FUNC(avs_is_yv24);
  AVSC_LOAD_FUNC(avs_is_yv16);
  AVSC_LOAD_FUNC(avs_is_yv12);
  AVSC_LOAD_FUNC(avs_is_yv411);
  AVSC_LOAD_FUNC(avs_is_y8);
+  AVSC_LOAD_FUNC(avs_is_yuv444p16);
+  AVSC_LOAD_FUNC(avs_is_yuv422p16);
+  AVSC_LOAD_FUNC(avs_is_yuv420p16);
+  AVSC_LOAD_FUNC(avs_is_y16);
+  AVSC_LOAD_FUNC(avs_is_yuv444ps);
+  AVSC_LOAD_FUNC(avs_is_yuv422ps);
+  AVSC_LOAD_FUNC(avs_is_yuv420ps);
+  AVSC_LOAD_FUNC(avs_is_y32);
+  AVSC_LOAD_FUNC(avs_is_444);
+  AVSC_LOAD_FUNC(avs_is_422);
+  AVSC_LOAD_FUNC(avs_is_420);
+  AVSC_LOAD_FUNC(avs_is_y);
+  AVSC_LOAD_FUNC(avs_is_yuva);
+  AVSC_LOAD_FUNC(avs_is_planar_rgb);
+  AVSC_LOAD_FUNC(avs_is_planar_rgba);
  AVSC_LOAD_FUNC(avs_is_color_space);

  AVSC_LOAD_FUNC(avs_get_plane_width_subsampling);
@@ -1216,35 +1036,15 @@ avs_bits_per_component    constant 8 (8 bits/component)
  AVSC_LOAD_FUNC(avs_is_writable);
  AVSC_LOAD_FUNC(avs_get_write_ptr_p);

-#if 0
-  // Avisynth+ specific but made them callable for classic Avisynth hosts
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_rgb48, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_rgb64, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv444p16, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv422p16, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv420p16, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_y16, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv444ps, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv422ps, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuv420ps, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_y32, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK(avs_is_444, avs_is_yv24);
-  AVSC_LOAD_FUNC_FALLBACK(avs_is_422, avs_is_yv16);
-  AVSC_LOAD_FUNC_FALLBACK(avs_is_420, avs_is_yv12);
-  AVSC_LOAD_FUNC_FALLBACK(avs_is_y, avs_is_y8);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_yuva, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_planar_rgb, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_is_planar_rgba, avs_is_xx_fallback_return_false);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_num_components, avs_num_components_fallback);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_component_size, avs_component_size_fallback);
-  AVSC_LOAD_FUNC_FALLBACK_SIMULATED(avs_bits_per_component, avs_bits_per_component_fallback);
-#endif
+  AVSC_LOAD_FUNC(avs_num_components);
+  AVSC_LOAD_FUNC(avs_component_size);
+  AVSC_LOAD_FUNC(avs_bits_per_component);
+
+

 #undef __AVSC_STRINGIFY
 #undef AVSC_STRINGIFY
 #undef AVSC_LOAD_FUNC
-#undef AVSC_LOAD_FUNC_FALLBACK
-#undef AVSC_LOAD_FUNC_FALLBACK_SIMULATED

  return library;

--- a/compat/avisynth/avs/capi.h
+++ b/compat/avisynth/avs/capi.h
@@ -39,49 +39,17 @@
 #  define EXTERN_C
 #endif

-#ifdef BUILDING_AVSCORE
-#  if defined(GCC) && defined(X86_32)
-#    define AVSC_CC
-#  else // MSVC builds and 64-bit GCC
-#    ifndef AVSC_USE_STDCALL
-#      define AVSC_CC __cdecl
-#    else
-#      define AVSC_CC __stdcall
-#    endif
-#  endif
-#else // needed for programs that talk to AviSynth+
-#  ifndef AVSC_WIN32_GCC32 // see comment below
-#    ifndef AVSC_USE_STDCALL
-#      define AVSC_CC __cdecl
-#    else
-#      define AVSC_CC __stdcall
-#    endif
-#  else
-#    define AVSC_CC
-#  endif
+#ifndef AVSC_USE_STDCALL
+#  define AVSC_CC __cdecl
+#else
+#  define AVSC_CC __stdcall
 #endif

-// On 64-bit Windows, there's only one calling convention,
-// so there is no difference between MSVC and GCC. On 32-bit,
-// this isn't true. The convention that GCC needs to use to
-// even build AviSynth+ as 32-bit makes anything that uses
-// it incompatible with 32-bit MSVC builds of AviSynth+.
-// The AVSC_WIN32_GCC32 define is meant to provide a user
-// switchable way to make builds of FFmpeg to test 32-bit
-// GCC builds of AviSynth+ without having to screw around
-// with alternate headers, while still default to the usual
-// situation of using 32-bit MSVC builds of AviSynth+.
-
-// Hopefully, this situation will eventually be resolved
-// and a broadly compatible solution will arise so the
-// same 32-bit FFmpeg build can handle either MSVC or GCC
-// builds of AviSynth+.
-
 #define AVSC_INLINE static __inline

 #ifdef BUILDING_AVSCORE
-#  define AVSC_EXPORT __declspec(dllexport)
-#  define AVSC_API(ret, name) EXTERN_C AVSC_EXPORT ret AVSC_CC name
+#  define AVSC_EXPORT EXTERN_C
+#  define AVSC_API(ret, name) EXTERN_C __declspec(dllexport) ret AVSC_CC name
 #else
 #  define AVSC_EXPORT EXTERN_C __declspec(dllexport)
 #  ifndef AVSC_NO_DECLSPEC
--- a/compat/avisynth/avs/config.h
+++ b/compat/avisynth/avs/config.h
@@ -42,7 +42,7 @@
 // alignment. They should always request the exact alignment value they need.
 // This is to make sure that plugins work over the widest range of AviSynth
 // builds possible.
-#define FRAME_ALIGN 64
+#define FRAME_ALIGN 32

 #if   defined(_M_AMD64) || defined(__x86_64)
 #   define X86_64
@@ -52,19 +52,4 @@
 #   error Unsupported CPU architecture.
 #endif

-#if   defined(_MSC_VER)
-#   define MSVC
-#elif defined(__GNUC__)
-#   define GCC
-#elif defined(__clang__)
-#   define CLANG
-#else
-#   error Unsupported compiler.
-#endif
-
-#if   defined(GCC)
-#   undef __forceinline
-#   define __forceinline inline
-#endif
-
 #endif //AVS_CONFIG_H
--- a/compat/avisynth/avs/types.h
+++ b/compat/avisynth/avs/types.h
@@ -35,12 +35,6 @@

 // Define all types necessary for interfacing with avisynth.dll

-#ifdef __cplusplus
-  #include <cstddef>
-#else
-  #include <stddef.h>
-#endif
-
 // Raster types used by VirtualDub & Avisynth
 typedef unsigned int    Pixel32;
 typedef unsigned char   BYTE;
--- a/compat/cuda/ptx2c.sh
+++ b/compat/cuda/ptx2c.sh
@@ -27,7 +27,7 @@ IN="$2"
 NAME="$(basename "$IN" | sed 's/\..*//')"

 printf "const char %s_ptx[] = \\" "$NAME" > "$OUT"
-while IFS= read -r LINE
+while read LINE
 do
    printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed -e 's/\r//g' -e 's/["\\]/\\&/g')" >> "$OUT"
 done < "$IN"
--- a/compat/djgpp/math.c
+++ b/compat/djgpp/math.c
@@ -1,47 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <math.h>
-
-#define FUN(name, type, op) \
-type name(type x, type y) \
-{ \
-    if (fpclassify(x) == FP_NAN) return y; \
-    if (fpclassify(y) == FP_NAN) return x; \
-    return x op y ? x : y; \
-}
-
-FUN(fmin, double, <)
-FUN(fmax, double, >)
-FUN(fminf, float, <)
-FUN(fmaxf, float, >)
-
-long double fmodl(long double x, long double y)
-{
-    return fmod(x, y);
-}
-
-long double scalbnl(long double x, int exp)
-{
-    return scalbn(x, exp);
-}
-
-long double copysignl(long double x, long double y)
-{
-    return copysign(x, y);
-}
--- a/compat/windows/makedef
+++ b/compat/windows/makedef
@@ -48,7 +48,7 @@ trap 'rm -f -- $libname' EXIT
 if [ -n "$AR" ]; then
    $AR rcs ${libname} $@ >/dev/null
 else
-    lib.exe -out:${libname} $@ >/dev/null
+    lib -out:${libname} $@ >/dev/null
 fi
 if [ $? != 0 ]; then
    echo "Could not create temporary library." >&2
@@ -108,7 +108,7 @@ if [ -n "$NM" ]; then
              cut -d' ' -f3 |
              sed -e "s/^${prefix}//")
 else
-    dump=$(dumpbin.exe -linkermember:1 ${libname} |
+    dump=$(dumpbin -linkermember:1 ${libname} |
              sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
              tail -n +2 |
              cut -d' ' -f3)
--- a/compat/windows/mslink
+++ b/compat/windows/mslink
@@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
 if [ -x "$LINK_EXE_PATH" ]; then
    "$LINK_EXE_PATH" $@
 else
-    link.exe $@
+    link $@
 fi
 exit $?
--- a/278
+++ b/278
@@ -218,7 +218,6 @@ External library support:
  --enable-jni             enable JNI support [no]
  --enable-ladspa          enable LADSPA audio filtering [no]
  --enable-libaom          enable AV1 video encoding/decoding via libaom [no]
-  --enable-libaribb24      enable ARIB text and caption decoding via libaribb24 [no]
  --enable-libass          enable libass subtitles rendering,
                           needed for subtitles and ass filter [no]
  --enable-libbluray       enable BluRay reading using libbluray [no]
@@ -227,7 +226,6 @@ External library support:
  --enable-libcelt         enable CELT decoding via libcelt [no]
  --enable-libcdio         enable audio CD grabbing with libcdio [no]
  --enable-libcodec2       enable codec2 en/decoding using libcodec2 [no]
-  --enable-libdav1d        enable AV1 decoding via libdav1d [no]
  --enable-libdavs2        enable AVS2 decoding via libdavs2 [no]
  --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                           and libraw1394 [no]
@@ -298,6 +296,7 @@ External library support:
  --enable-lv2             enable LV2 audio filtering [no]
  --disable-lzma           disable lzma [autodetect]
  --enable-decklink        enable Blackmagic DeckLink I/O support [no]
+  --enable-libndi_newtek   enable Newteck NDI I/O support [no]
  --enable-mbedtls         enable mbedTLS, needed for https support
                           if openssl, gnutls or libtls is not used [no]
  --enable-mediacodec      enable Android MediaCodec support [no]
@@ -307,7 +306,6 @@ External library support:
  --enable-opengl          enable OpenGL rendering [no]
  --enable-openssl         enable openssl, needed for https support
                           if gnutls, libtls or mbedtls is not used [no]
-  --enable-pocketsphinx    enable PocketSphinx, needed for asr filter [no]
  --disable-sndio          disable sndio support [autodetect]
  --disable-schannel       disable SChannel SSP, needed for TLS support on
                           Windows if openssl and gnutls are not used [autodetect]
@@ -321,7 +319,7 @@ External library support:
  The following libraries provide various hardware acceleration features:
  --disable-amf            disable AMF video encoding code [autodetect]
  --disable-audiotoolbox   disable Apple AudioToolbox code [autodetect]
-  --enable-cuda-nvcc       enable Nvidia CUDA compiler [no]
+  --enable-cuda-sdk        enable CUDA features that require the CUDA SDK [no]
  --disable-cuvid          disable Nvidia CUVID support [autodetect]
  --disable-d3d11va        disable Microsoft Direct3D 11 video acceleration code [autodetect]
  --disable-dxva2          disable Microsoft DirectX 9 video acceleration code [autodetect]
@@ -381,7 +379,7 @@ Toolchain options:
  --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
  --host-ld=HOSTLD         use host linker HOSTLD
  --host-ldflags=HLDFLAGS  use HLDFLAGS when linking for host
-  --host-extralibs=HLIBS   use libs HLIBS when linking for host
+  --host-libs=HLIBS        use libs HLIBS when linking for host
  --host-os=OS             compiler host OS [$target_os]
  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]
  --extra-cxxflags=ECFLAGS add ECFLAGS to CXXFLAGS [$CXXFLAGS]
@@ -441,7 +439,6 @@ Optimization options (experts only):
  --disable-mipsdsp        disable MIPS DSP ASE R1 optimizations
  --disable-mipsdspr2      disable MIPS DSP ASE R2 optimizations
  --disable-msa            disable MSA optimizations
-  --disable-msa2           disable MSA2 optimizations
  --disable-mipsfpu        disable floating point MIPS optimizations
  --disable-mmi            disable Loongson SIMD optimizations
  --disable-fast-unaligned consider unaligned accesses slow
@@ -475,7 +472,7 @@ Developer options (useful when working on FFmpeg itself):
  --random-seed=VALUE      seed value for --enable/disable-random
  --disable-valgrind-backtrace do not print a backtrace under Valgrind
                           (only applies to --disable-optimizations builds)
-  --enable-ossfuzz         Enable building fuzzer tool
+  --enable-osfuzz          Enable building fuzzer tool
  --libfuzzer=PATH         path to libfuzzer
  --ignore-tests=TESTS     comma-separated list (without "fate-" prefix
                           in the name) of tests whose result is ignored
@@ -504,13 +501,9 @@ log(){
 }

 log_file(){
-    log BEGIN "$1"
-    log_file_i=1
-    while IFS= read -r log_file_line; do
-        printf '%5d\t%s\n' "$log_file_i" "$log_file_line"
-        log_file_i=$(($log_file_i+1))
-    done < "$1" >> "$logfile"
-    log END "$1"
+    log BEGIN $1
+    pr -n -t $1 >> $logfile
+    log END $1
 }

 warn(){
@@ -654,12 +647,6 @@ request(){
    done
 }

-warn_if_gets_disabled(){
-    for var in $*; do
-        WARN_IF_GETS_DISABLED_LIST="$WARN_IF_GETS_DISABLED_LIST $var"
-    done
-}
-
 enable(){
    set_all yes $*
 }
@@ -668,14 +655,6 @@ disable(){
    set_all no $*
 }

-disable_with_reason(){
-    disable $1
-    eval "${1}_disable_reason=\"$2\""
-    if requested $1; then
-        die "ERROR: $1 requested, but $2"
-    fi
-}
-
 enable_weak(){
    set_weak yes $*
 }
@@ -804,10 +783,10 @@ check_deps(){

            [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
            [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; }
-            enabled_all  $dep_all || { disable_with_reason $cfg "not all dependencies are satisfied: $dep_all"; }
-            enabled_any  $dep_any || { disable_with_reason $cfg "not any dependency is satisfied: $dep_any"; }
-            disabled_all $dep_con || { disable_with_reason $cfg "some conflicting dependencies are unsatisfied: $dep_con"; }
-            disabled_any $dep_sel && { disable_with_reason $cfg "some selected dependency is unsatisfied: $dep_sel"; }
+            enabled_all  $dep_all || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not all dependencies are satisfied: $dep_all"; }
+            enabled_any  $dep_any || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not any dependency is satisfied: $dep_any"; }
+            disabled_all $dep_con || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some conflicting dependencies are unsatisfied: $dep_con"; }
+            disabled_any $dep_sel && { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some selected dependency is unsatisfied: $dep_sel"; }

            enabled $cfg && enable_deep_weak $dep_sel $dep_sgs

@@ -1006,10 +985,6 @@ hostcc_o(){
    eval printf '%s\\n' $HOSTCC_O
 }

-nvcc_o(){
-    eval printf '%s\\n' $NVCC_O
-}
-
 test_cc(){
    log test_cc "$@"
    cat > $TMPC
@@ -1031,25 +1006,6 @@ test_objcc(){
    test_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
 }

-test_nvcc(){
-    log test_nvcc "$@"
-    cat > $TMPCU
-    log_file $TMPCU
-    tmpcu_=$TMPCU
-    tmpo_=$TMPO
-    [ -x "$(command -v cygpath)" ] && tmpcu_=$(cygpath -m $tmpcu_) && tmpo_=$(cygpath -m $tmpo_)
-    test_cmd $nvcc -ptx $NVCCFLAGS "$@" $NVCC_C $(nvcc_o $tmpo_) $tmpcu_
-}
-
-check_nvcc() {
-    log check_nvcc "$@"
-    test_nvcc <<EOF
-extern "C" {
-    __global__ void hello(unsigned char *data) {}
-}
-EOF
-}
-
 test_cpp(){
    log test_cpp "$@"
    cat > $TMPC
@@ -1718,6 +1674,7 @@ EXTERNAL_LIBRARY_GPL_LIST="

 EXTERNAL_LIBRARY_NONFREE_LIST="
    decklink
+    libndi_newtek
    libfdk_aac
    openssl
    libtls
@@ -1725,7 +1682,6 @@ EXTERNAL_LIBRARY_NONFREE_LIST="

 EXTERNAL_LIBRARY_VERSION3_LIST="
    gmp
-    libaribb24
    liblensfun
    libopencore_amrnb
    libopencore_amrwb
@@ -1756,7 +1712,6 @@ EXTERNAL_LIBRARY_LIST="
    libcaca
    libcelt
    libcodec2
-    libdav1d
    libdc1394
    libdrm
    libflite
@@ -1805,7 +1760,6 @@ EXTERNAL_LIBRARY_LIST="
    mediacodec
    openal
    opengl
-    pocketsphinx
    vapoursynth
 "

@@ -1834,7 +1788,6 @@ EXTRALIBS_LIST="
 "

 HWACCEL_LIBRARY_NONFREE_LIST="
-    cuda_nvcc
    cuda_sdk
    libnpp
 "
@@ -2000,7 +1953,6 @@ ARCH_EXT_LIST_MIPS="
    mipsdsp
    mipsdspr2
    msa
-    msa2
 "

 ARCH_EXT_LIST_LOONGSON="
@@ -2261,7 +2213,6 @@ TOOLCHAIN_FEATURES="

 TYPES_LIST="
    kCMVideoCodecType_HEVC
-    kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange
    socklen_t
    struct_addrinfo
    struct_group_source_req
@@ -2384,7 +2335,6 @@ CONFIG_EXTRA="
    rtpdec
    rtpenc_chain
    rv34dsp
-    scene_sad
    sinewin
    snappy
    srtp
@@ -2483,7 +2433,6 @@ CMDLINE_SET="
    tempprefix
    toolchain
    valgrind
-    windres
    x86asmexe
 "

@@ -2529,7 +2478,6 @@ mipsdsp_deps="mips"
 mipsdspr2_deps="mips"
 mmi_deps="mips"
 msa_deps="mipsfpu"
-msa2_deps="msa"

 cpunop_deps="i686"
 x86_64_select="i686"
@@ -2589,8 +2537,8 @@ threads_if_any="$THREADS_LIST"

 # subsystems
 cbs_av1_select="cbs"
-cbs_h264_select="cbs"
-cbs_h265_select="cbs"
+cbs_h264_select="cbs golomb"
+cbs_h265_select="cbs golomb"
 cbs_jpeg_select="cbs"
 cbs_mpeg2_select="cbs"
 cbs_vp9_select="cbs"
@@ -2711,7 +2659,6 @@ hap_encoder_select="texturedspenc"
 hevc_decoder_select="bswapdsp cabac golomb hevcparse videodsp"
 huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llvidencdsp"
-hymt_decoder_select="huffyuv_decoder"
 iac_decoder_select="imc_decoder"
 imc_decoder_select="bswapdsp fft mdct sinewin"
 indeo3_decoder_select="hpeldsp"
@@ -2722,7 +2669,6 @@ jpegls_decoder_select="mjpeg_decoder"
 jv_decoder_select="blockdsp"
 lagarith_decoder_select="llviddsp"
 ljpeg_encoder_select="idctdsp jpegtables mpegvideoenc"
-lscr_decoder_deps="zlib"
 magicyuv_decoder_select="llviddsp"
 magicyuv_encoder_select="llvidencdsp"
 mdec_decoder_select="blockdsp idctdsp mpegvideo"
@@ -2732,7 +2678,7 @@ mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"
 mjpeg_encoder_select="jpegtables mpegvideoenc"
 mjpegb_decoder_select="mjpeg_decoder"
 mlp_decoder_select="mlp_parser"
-mlp_encoder_select="lpc audio_frame_queue"
+mlp_encoder_select="lpc"
 motionpixels_decoder_select="bswapdsp"
 mp1_decoder_select="mpegaudio"
 mp1float_decoder_select="mpegaudio"
@@ -2814,7 +2760,7 @@ thp_decoder_select="mjpeg_decoder"
 tiff_decoder_suggest="zlib lzma"
 tiff_encoder_suggest="zlib"
 truehd_decoder_select="mlp_parser"
-truehd_encoder_select="lpc audio_frame_queue"
+truehd_encoder_select="lpc"
 truemotion2_decoder_select="bswapdsp"
 truespeech_decoder_select="bswapdsp"
 tscc_decoder_deps="zlib"
@@ -2828,7 +2774,6 @@ vc1image_decoder_select="vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="audio_frame_queue mdct"
 vp3_decoder_select="hpeldsp vp3dsp videodsp"
-vp4_decoder_select="vp3_decoder"
 vp5_decoder_select="h264chroma hpeldsp videodsp vp3dsp vp56dsp"
 vp6_decoder_select="h264chroma hpeldsp huffman videodsp vp3dsp vp56dsp"
 vp6a_decoder_select="vp6_decoder"
@@ -2867,7 +2812,6 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext"
 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32"
 ffnvcodec_deps_any="libdl LoadLibrary"
 nvdec_deps="ffnvcodec"
-vaapi_x11_deps="xlib"
 videotoolbox_hwaccel_deps="videotoolbox pthreads"
 videotoolbox_hwaccel_extralibs="-framework QuartzCore"
 xvmc_deps="X11_extensions_XvMClib_h"
@@ -2987,8 +2931,8 @@ v4l2_m2m_deps="linux_videodev2_h sem_timedwait"

 hwupload_cuda_filter_deps="ffnvcodec"
 scale_npp_filter_deps="ffnvcodec libnpp"
-scale_cuda_filter_deps="ffnvcodec cuda_nvcc"
-thumbnail_cuda_filter_deps="ffnvcodec cuda_nvcc"
+scale_cuda_filter_deps="cuda_sdk"
+thumbnail_cuda_filter_deps="cuda_sdk"
 transpose_npp_filter_deps="ffnvcodec libnpp"

 amf_deps_any="libdl LoadLibrary"
@@ -3088,7 +3032,6 @@ vc1_parser_select="vc1dsp"

 # bitstream_filters
 aac_adtstoasc_bsf_select="adts_header"
-av1_frame_split_bsf_select="cbs_av1"
 av1_metadata_bsf_select="cbs_av1"
 eac3_core_bsf_select="ac3_parser"
 filter_units_bsf_select="cbs"
@@ -3144,11 +3087,9 @@ hevc_videotoolbox_encoder_select="videotoolbox_encoder"
 libaom_av1_decoder_deps="libaom"
 libaom_av1_encoder_deps="libaom"
 libaom_av1_encoder_select="extract_extradata_bsf"
-libaribb24_decoder_deps="libaribb24"
 libcelt_decoder_deps="libcelt"
 libcodec2_decoder_deps="libcodec2"
 libcodec2_encoder_deps="libcodec2"
-libdav1d_decoder_deps="libdav1d"
 libdavs2_decoder_deps="libdavs2"
 libfdk_aac_decoder_deps="libfdk_aac"
 libfdk_aac_encoder_deps="libfdk_aac"
@@ -3309,6 +3250,10 @@ decklink_indev_extralibs="-lstdc++"
 decklink_outdev_deps="decklink threads"
 decklink_outdev_suggest="libklvanc"
 decklink_outdev_extralibs="-lstdc++"
+libndi_newtek_indev_deps="libndi_newtek"
+libndi_newtek_indev_extralibs="-lndi"
+libndi_newtek_outdev_deps="libndi_newtek"
+libndi_newtek_outdev_extralibs="-lndi"
 dshow_indev_deps="IBaseFilter"
 dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
 fbdev_indev_deps="linux_fb_h"
@@ -3410,7 +3355,6 @@ afir_filter_deps="avcodec"
 afir_filter_select="fft"
 amovie_filter_deps="avcodec avformat"
 aresample_filter_deps="swresample"
-asr_filter_deps="pocketsphinx"
 ass_filter_deps="libass"
 atempo_filter_deps="avcodec"
 atempo_filter_select="rdft"
@@ -3422,7 +3366,6 @@ bm3d_filter_select="dct"
 boxblur_filter_deps="gpl"
 boxblur_opencl_filter_deps="opencl gpl"
 bs2b_filter_deps="libbs2b"
-colorkey_opencl_filter_deps="opencl"
 colormatrix_filter_deps="gpl"
 convolution_opencl_filter_deps="opencl"
 convolve_filter_deps="avcodec"
@@ -3439,7 +3382,6 @@ deinterlace_qsv_filter_deps="libmfx"
 deinterlace_vaapi_filter_deps="vaapi"
 delogo_filter_deps="gpl"
 denoise_vaapi_filter_deps="vaapi"
-derain_filter_select="dnn"
 deshake_filter_select="pixelutils"
 dilation_opencl_filter_deps="opencl"
 drawtext_filter_deps="libfreetype"
@@ -3455,8 +3397,7 @@ find_rect_filter_deps="avcodec avformat gpl"
 firequalizer_filter_deps="avcodec"
 firequalizer_filter_select="rdft"
 flite_filter_deps="libflite"
-framerate_filter_select="scene_sad"
-freezedetect_filter_select="scene_sad"
+framerate_filter_select="pixelutils"
 frei0r_filter_deps="frei0r libdl"
 frei0r_src_filter_deps="frei0r libdl"
 fspp_filter_deps="gpl"
@@ -3472,10 +3413,8 @@ mcdeint_filter_deps="avcodec gpl"
 movie_filter_deps="avcodec avformat"
 mpdecimate_filter_deps="gpl"
 mpdecimate_filter_select="pixelutils"
-minterpolate_filter_select="scene_sad"
 mptestsrc_filter_deps="gpl"
 negate_filter_deps="lut_filter"
-nlmeans_opencl_filter_deps="opencl"
 nnedi_filter_deps="gpl"
 ocr_filter_deps="libtesseract"
 ocv_filter_deps="libopencv"
@@ -3502,7 +3441,7 @@ sab_filter_deps="gpl swscale"
 scale2ref_filter_deps="swscale"
 scale_filter_deps="swscale"
 scale_qsv_filter_deps="libmfx"
-select_filter_select="scene_sad"
+select_filter_select="pixelutils"
 sharpness_vaapi_filter_deps="vaapi"
 showcqt_filter_deps="avcodec avformat swscale"
 showcqt_filter_suggest="libfontconfig libfreetype"
@@ -3533,8 +3472,6 @@ tinterlace_merge_test_deps="tinterlace_filter"
 tinterlace_pad_test_deps="tinterlace_filter"
 tonemap_filter_deps="const_nan"
 tonemap_opencl_filter_deps="opencl const_nan"
-transpose_opencl_filter_deps="opencl"
-transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags"
 unsharp_opencl_filter_deps="opencl"
 uspp_filter_deps="gpl avcodec"
 vaguedenoiser_filter_deps="gpl"
@@ -3547,7 +3484,7 @@ zscale_filter_deps="libzimg const_nan"
 scale_vaapi_filter_deps="vaapi"
 vpp_qsv_filter_deps="libmfx"
 vpp_qsv_filter_select="qsvvpp"
-yadif_cuda_filter_deps="ffnvcodec cuda_nvcc"
+yadif_cuda_filter_deps="cuda_sdk"

 # examples
 avio_dir_cmd_deps="avformat avutil"
@@ -3598,15 +3535,15 @@ swresample_suggest="libm libsoxr"
 swscale_deps="avutil"
 swscale_suggest="libm"

-avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs"
+avcodec_extralibs="pthreads_extralibs iconv_extralibs"
 avfilter_extralibs="pthreads_extralibs"
 avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"

 # programs
 ffmpeg_deps="avcodec avfilter avformat"
 ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
-               hflip_filter null_filter
-               transpose_filter trim_filter vflip_filter"
+               null_filter
+               trim_filter"
 ffmpeg_suggest="ole32 psapi shell32"
 ffplay_deps="avcodec avformat swscale swresample sdl2"
 ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
@@ -3663,7 +3600,6 @@ host_os=$target_os_default
 if test "$target_os_default" = aix; then
    arch_default=$(uname -p)
    strip_default="strip -X32_64"
-    nm_default="nm -g -X32_64"
 else
    arch_default=$(uname -m)
 fi
@@ -3754,8 +3690,6 @@ mkdir -p ffbuild
 # find source path
 if test -f configure; then
    source_path=.
-elif test -f src/configure; then
-    source_path=src
 else
    source_path=$(cd $(dirname "$0"); pwd)
    case "$source_path" in
@@ -3782,7 +3716,8 @@ find_things_extern(){

 find_filters_extern(){
    file=$source_path/$1
-    sed -n 's/^extern AVFilter ff_[avfsinkrc]\{2,5\}_\([[:alnum:]_]\{1,\}\);/\1_filter/p' $file
+    #sed -n "s/^extern AVFilter ff_\([avfsinkrc]\{2,5\}\)_\(\w\+\);/\2_filter/p" $file
+    sed -E -n "s/^extern AVFilter ff_([avfsinkrc]{2,5})_([a-zA-Z0-9_]+);/\2_filter/p" $file
 }

 FILTER_LIST=$(find_filters_extern libavfilter/allfilters.c)
@@ -3846,22 +3781,8 @@ die_unknown(){
 }

 print_in_columns() {
-    tr ' ' '\n' | sort | tr '\r\n' '  ' | awk -v col_width=24 -v width="$ncols" '
-    {
-        num_cols = width > col_width ? int(width / col_width) : 1;
-        num_rows = int((NF + num_cols-1) / num_cols);
-        y = x = 1;
-        for (y = 1; y <= num_rows; y++) {
-            i = y;
-            for (x = 1; x <= num_cols; x++) {
-                if (i <= NF) {
-                  line = sprintf("%s%-" col_width "s", line, $i);
-                }
-                i = i + num_rows;
-            }
-            print line; line = "";
-        }
-    }' | sed 's/ *$//'
+    cols=$(expr $ncols / 24)
+    cat | tr ' ' '\n' | sort | pr -r "-$cols" -w $ncols -t
 }

 show_list() {
@@ -3947,7 +3868,6 @@ for opt do
            name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing}
            list=$(filter "$name" $list)
            [ "$list" = "" ] && warn "Option $opt did not match anything"
-            test $action = enable && warn_if_gets_disabled $list
            $action $list
        ;;
        --enable-yasm|--disable-yasm)
@@ -4141,22 +4061,22 @@ case "$toolchain" in
        # behaviour if the regexp was unable to match anything, since this
        # successfully parses the version number of existing supported
        # versions that require the converter (MSVC 2010 and 2012).
-        cl_major_ver=$(cl.exe 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
+        cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
        if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
-            cc_default="cl.exe"
-            cxx_default="cl.exe"
+            cc_default="cl"
+            cxx_default="cl"
        else
            die "Unsupported MSVC version (2013 or newer required)"
        fi
        ld_default="$source_path/compat/windows/mslink"
-        nm_default="dumpbin.exe -symbols"
-        ar_default="lib.exe"
+        nm_default="dumpbin -symbols"
+        ar_default="lib"
        case "$arch" in
        aarch64|arm64)
-            as_default="armasm64.exe"
+            as_default="armasm64"
            ;;
        arm*)
-            as_default="armasm.exe"
+            as_default="armasm"
            ;;
        esac
        target_os_default="win32"
@@ -4200,11 +4120,6 @@ if test -n "$cross_prefix"; then
    enable cross_compile
 fi

-set_default target_os
-if test "$target_os" = android; then
-    cc_default="clang"
-fi
-
 ar_default="${cross_prefix}${ar_default}"
 cc_default="${cross_prefix}${cc_default}"
 cxx_default="${cross_prefix}${cxx_default}"
@@ -4221,7 +4136,7 @@ windres_default="${cross_prefix}${windres_default}"
 sysinclude_default="${sysroot}/usr/include"

 set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
-    target_exec x86asmexe nvcc
+    target_exec target_os x86asmexe nvcc
 enabled cross_compile || host_cc_default=$cc
 set_default host_cc

@@ -4288,7 +4203,6 @@ tmpfile TMPCPP .cpp
 tmpfile TMPE   $EXESUF
 tmpfile TMPH   .h
 tmpfile TMPM   .m
-tmpfile TMPCU  .cu
 tmpfile TMPO   .o
 tmpfile TMPS   .S
 tmpfile TMPSH  .sh
@@ -4926,6 +4840,7 @@ elif enabled mips; then
                enable fast_cmov
                enable fast_unaligned
                disable aligned_stack
+                disable mipsfpu
                disable mipsdsp
                disable mipsdspr2
                # When gcc version less than 5.3.0, add -fno-expensive-optimizations flag.
@@ -5220,7 +5135,6 @@ case $target_os in
            echo "hwcap_1 = OVERRIDE;" > mapfile &&
            add_ldflags -Wl,-M,mapfile
        nm_default='nm -P -g'
-        striptype=""
        version_script='-M'
        VERSION_SCRIPT_POSTPROCESS_CMD='perl $(SRC_PATH)/compat/solaris/make_sunver.pl - $(OBJS)'
        ;;
@@ -5374,6 +5288,7 @@ case $target_os in
        network_extralibs="-lsocket"
        objformat="coff"
        enable dos_paths
+        add_cppflags -U__STRICT_ANSI__
        ;;
    linux)
        enable section_data_rel_ro
@@ -5444,7 +5359,7 @@ link_name=$(mktemp -u $TMPDIR/name_XXXXXXXX)
 mkdir "$link_dest"
 $ln_s "$link_dest" "$link_name"
 touch "$link_dest/test_file"
-if [ "$source_path" != "." ] && [ "$source_path" != "src" ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
+if [ "$source_path" != "." ] && ([ ! -d src ] || [ -L src ]) && [ -e "$link_name/test_file" ]; then
    # create link to source path
    [ -e src ] && rm src
    $ln_s "$source_path" src
@@ -5486,7 +5401,6 @@ probe_libc(){
            add_${pfx}cppflags -D__printf__=__gnu_printf__
        test_${pfx}cpp_condition windows.h "!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600" &&
            add_${pfx}cppflags -D_WIN32_WINNT=0x0600
-        add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
    elif test_${pfx}cpp_condition _mingw.h "defined __MINGW_VERSION"  ||
         test_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
        eval ${pfx}libc_type=mingw32
@@ -5500,7 +5414,6 @@ probe_libc(){
            add_${pfx}cppflags -D_WIN32_WINNT=0x0600
        eval test \$${pfx_no_}cc_type = "gcc" &&
            add_${pfx}cppflags -D__printf__=__gnu_printf__
-        add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
    elif test_${pfx}cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then
        eval ${pfx}libc_type=msvcrt
        if test_${pfx}cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION < 14"; then
@@ -5544,11 +5457,6 @@ EOF
    elif test_${pfx}cpp_condition sys/brand.h "defined LABELED_BRAND_NAME"; then
        eval ${pfx}libc_type=solaris
        add_${pfx}cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
-    elif test_${pfx}cpp_condition sys/version.h "defined __DJGPP__"; then
-        eval ${pfx}libc_type=djgpp
-        add_cppflags -U__STRICT_ANSI__
-        add_cflags "-include $source_path/compat/djgpp/math.h"
-        add_compat djgpp/math.o
    fi
    test_${pfx}cc <<EOF
 #include <time.h>
@@ -5756,7 +5664,6 @@ elif enabled mips; then
    enabled mipsfpu && enabled msa && check_inline_asm_flags msa '"addvi.b $w0, $w1, 1"' '-mmsa' && check_headers msa.h || disable msa
    enabled mipsdsp && check_inline_asm_flags mipsdsp '"addu.qb $t0, $t1, $t2"' '-mdsp'
    enabled mipsdspr2 && check_inline_asm_flags mipsdspr2 '"absq_s.qb $t0, $t1"' '-mdspr2'
-    enabled msa && enabled msa2 && check_inline_asm_flags msa2 '"nxbits.any.b $w0, $w0"' '-mmsa2' && check_headers msa2.h || disable msa2

    if enabled bigendian && enabled msa; then
        disable msa
@@ -6047,7 +5954,6 @@ enabled avfoundation && {
 enabled videotoolbox && {
    check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices"
    check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVC "-framework CoreMedia"
-    check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange "-framework CoreVideo"
 }

 check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
@@ -6058,19 +5964,20 @@ check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
 check_type "windows.h d3d11.h" "ID3D11VideoContext"
 check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602

+check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
+check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
+check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
+check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
+check_type "va/va.h va/va_enc_vp8.h"  "VAEncPictureParameterBufferVP8"
+check_type "va/va.h va/va_enc_vp9.h"  "VAEncPictureParameterBufferVP9"
+
 check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"

-if enabled cuda_sdk; then
-    warn "Option --enable-cuda-sdk is deprecated. Use --enable-cuda-nvcc instead."
-    enable cuda_nvcc
-fi
-
 if ! disabled ffnvcodec; then
-    ffnv_hdr_list="ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
-    check_pkg_config ffnvcodec "ffnvcodec >= 9.0.18.0" "$ffnv_hdr_list" "" || \
-      check_pkg_config ffnvcodec "ffnvcodec >= 8.2.15.8 ffnvcodec < 8.3" "$ffnv_hdr_list" "" || \
-      check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.9 ffnvcodec < 8.2" "$ffnv_hdr_list" "" || \
-      check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.9 ffnvcodec < 8.1" "$ffnv_hdr_list" ""
+    check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.2" \
+          "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" || \
+      check_pkg_config ffnvcodec "ffnvcodec >= 8.0.14.2 ffnvcodec < 8.1" \
+          "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" ""
 fi

 check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
@@ -6140,19 +6047,17 @@ for func in $COMPLEX_FUNCS; do
 done

 # these are off by default, so fail if requested and not available
-enabled cuda_nvcc         && { check_nvcc || die "ERROR: failed checking for nvcc."; }
+enabled cuda_sdk          && require cuda_sdk cuda.h cuCtxCreate -lcuda
 enabled chromaprint       && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
 enabled decklink          && { require_headers DeckLinkAPI.h &&
                               { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a090500" || die "ERROR: Decklink API version must be >= 10.9.5."; } }
-enabled frei0r            && require_headers "frei0r.h dlfcn.h"
+enabled libndi_newtek     && require_headers Processing.NDI.Lib.h
+enabled frei0r            && require_headers frei0r.h
 enabled gmp               && require gmp gmp.h mpz_export -lgmp
 enabled gnutls            && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
 enabled jni               && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
-enabled ladspa            && require_headers "ladspa.h dlfcn.h"
+enabled ladspa            && require_headers ladspa.h
 enabled libaom            && require_pkg_config libaom "aom >= 1.0.0" aom/aom_codec.h aom_codec_version
-enabled libaribb24        && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new ||
-                               { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
-                               die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; }
 enabled lv2               && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new
 enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
 enabled libass            && require_pkg_config libass libass ass/ass.h ass_library_init
@@ -6163,8 +6068,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                               die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
 enabled libcodec2         && require libcodec2 codec2/codec2.h codec2_create -lcodec2
-enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.2.1" "dav1d/dav1d.h" dav1d_version
-enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
+enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open
 enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
 enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
 enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
@@ -6247,19 +6151,21 @@ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h
 enabled libvpx            && {
    enabled libvpx_vp8_decoder && {
        check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
-            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp8_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
+            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+                die "ERROR: libvpx decoder version must be >=1.4.0";
    }
    enabled libvpx_vp8_encoder && {
        check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
-            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp8_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
+            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+                die "ERROR: libvpx encoder version must be >=1.4.0";
    }
    enabled libvpx_vp9_decoder && {
        check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
-            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
+            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
    }
    enabled libvpx_vp9_encoder && {
        check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
-            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
+            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
    }
    if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
        die "libvpx enabled but no supported decoders found"
@@ -6278,7 +6184,7 @@ enabled libx264           && { check_pkg_config libx264 x264 "stdint.h x264.h" x
 enabled libx265           && require_pkg_config libx265 x265 x265.h x265_api_get &&
                             require_cpp_condition libx265 x265.h "X265_BUILD >= 68"
 enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
-enabled libxavs2          && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
+enabled libxavs2          && require_pkg_config libxavs2 "xavs2 >= 1.2.77" "stdint.h xavs2.h" xavs2_api_get
 enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 enabled libzimg           && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version
 enabled libzmq            && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new
@@ -6326,7 +6232,6 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
                               check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                               check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
                               die "ERROR: openssl not found"; }
-enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
 enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
                               require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create &&
                               { enabled libdrm ||
@@ -6490,14 +6395,6 @@ if enabled vaapi; then
    fi

    check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)"
-
-    check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC"
-    check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth
-    check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags
-    check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
-    check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
-    check_type "va/va.h va/va_enc_vp8.h"  "VAEncPictureParameterBufferVP8"
-    check_type "va/va.h va/va_enc_vp9.h"  "VAEncPictureParameterBufferVP9"
 fi

 if enabled_all opencl libdrm ; then
@@ -6508,12 +6405,9 @@ if enabled_all opencl libdrm ; then
 fi

 if enabled_all opencl vaapi ; then
-    if enabled opencl_drm_beignet ; then
-        enable opencl_vaapi_beignet
-    else
-        check_type "CL/cl.h CL/cl_va_api_media_sharing_intel.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
-            enable opencl_vaapi_intel_media
-    fi
+    enabled opencl_drm_beignet && enable opencl_vaapi_beignet
+    check_type "CL/cl.h CL/va_ext.h" "clCreateFromVA_APIMediaSurfaceINTEL_fn" &&
+        enable opencl_vaapi_intel_media
 fi

 if enabled_all opencl dxva2 ; then
@@ -6542,14 +6436,6 @@ if enabled x86; then
            disable ffnvcodec cuvid nvdec nvenc
            ;;
    esac
-elif enabled ppc64 && ! enabled bigendian; then
-    case $target_os in
-        linux)
-            ;;
-        *)
-            disable ffnvcodec cuvid nvdec nvenc
-            ;;
-    esac
 else
    disable ffnvcodec cuvid nvdec nvenc
 fi
@@ -6613,7 +6499,6 @@ check_disable_warning -Wno-format-zero-length
 check_disable_warning -Wno-pointer-sign
 check_disable_warning -Wno-unused-const-variable
 check_disable_warning -Wno-bool-operation
-check_disable_warning -Wno-char-subscripts

 check_disable_warning_headers(){
    warning_flag=-W${1#-Wno-}
@@ -6629,7 +6514,7 @@ EOF

 # add some linker flags
 check_ldflags -Wl,--warn-common
-check_ldflags -Wl,-rpath-link=:libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
+check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 enabled rpath && add_ldexeflags -Wl,-rpath,$libdir && add_ldsoflags -Wl,-rpath,$libdir
 test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic

@@ -6896,17 +6781,10 @@ check_deps $CONFIG_LIST       \
 enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
 enabled avresample && warn "Building with deprecated library libavresample"

-case $target_os in
-haiku)
+if test $target_os = "haiku"; then
    disable memalign
    disable posix_memalign
-    ;;
-*-dos|freedos|opendos)
-    if test_cpp_condition sys/version.h "defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ == 5"; then
-        disable memalign
-    fi
-    ;;
-esac
+fi

 flatten_extralibs(){
    nested_entries=
@@ -7132,7 +7010,6 @@ if enabled mips; then
    echo "MIPS DSP R1 enabled       ${mipsdsp-no}"
    echo "MIPS DSP R2 enabled       ${mipsdspr2-no}"
    echo "MIPS MSA enabled          ${msa-no}"
-    echo "MIPS MSA2 enabled         ${msa2-no}"
    echo "LOONGSON MMI enabled      ${mmi-no}"
 fi
 if enabled ppc; then
@@ -7195,15 +7072,6 @@ echo "License: $license"

 fi # test "$quiet" != "yes"

-if test -n "$WARN_IF_GETS_DISABLED_LIST"; then
-    for cfg in $WARN_IF_GETS_DISABLED_LIST; do
-        if disabled $cfg; then
-            varname=${cfg}_disable_reason
-            eval "warn \"Disabled $cfg because \$$varname\""
-        fi
-    done
-fi
-
 if test -n "$WARNINGS"; then
    printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color"
    enabled fatal_warnings && exit 1
@@ -7374,7 +7242,7 @@ cat > $TMPH <<EOF
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
-#define CONFIG_THIS_YEAR 2019
+#define CONFIG_THIS_YEAR 2018
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
 #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,34 +15,6 @@ libavutil:     2017-10-21

 API changes, most recent first:

-------- 8< --------- FFmpeg 4.2 was cut here -------- 8< ---------
-
-2019-06-21 - a30e44098a - lavu 56.30.100 - frame.h
-  Add FF_DECODE_ERROR_DECODE_SLICES
-
-2019-06-14 - edfced8c04 - lavu 56.29.100 - frame.h
-  Add FF_DECODE_ERROR_CONCEALMENT_ACTIVE
-
-2019-05-15 - b79b29ddb1 - lavu 56.28.100 - tx.h
-  Add av_tx_init(), av_tx_uninit() and related definitions.
-
-2019-04-20 - 3153a6502a - lavc 58.52.100 - avcodec.h
-  Add AV_CODEC_FLAG_DROPCHANGED to allow avcodec_receive_frame to drop
-  frames whose parameters differ from first decoded frame in stream.
-
-2019-04-12 - abfeba9724 - lavf 58.27.102
-  Rename hls,applehttp demuxer to hls
-
-2019-01-27 - 5bcefceec8 - lavc 58.46.100 - avcodec.h
-  Add discard_damaged_percentage
-
-2019-01-08 - 1ef4828276 - lavu 56.26.100 - frame.h
-  Add AV_FRAME_DATA_REGIONS_OF_INTEREST
-
-2018-12-21 - 2744d6b364 - lavu 56.25.100 - hdr_dynamic_metadata.h
-  Add AV_FRAME_DATA_DYNAMIC_HDR_PLUS enum value, av_dynamic_hdr_plus_alloc(),
-  av_dynamic_hdr_plus_create_side_data() functions, and related structs.
-
 -------- 8< --------- FFmpeg 4.1 was cut here -------- 8< ---------

 2018-10-27 - 718044dc19 - lavu 56.21.100 - pixdesc.h
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 4.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
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -87,9 +87,6 @@ the timing info in the sequence header.
 Set the number of ticks in each picture, to indicate that the stream
 has a fixed framerate.  Ignored if @option{tick_rate} is not also set.

-@item delete_padding
-Deletes Padding OBUs.
-
@end table

@section chomp
@@ -103,9 +100,7 @@ DTS-HD.

@section dump_extra

-Add extradata to the beginning of the filtered packets except when
-said packets already exactly begin with the extradata that is intended
-to be added.
+Add extradata to the beginning of the filtered packets.

@table @option
@item freq
@@ -122,7 +117,7 @@ add extradata to all packets
@end table
@end table

-If not specified it is assumed @samp{k}.
+If not specified it is assumed @samp{e}.

 For example the following @command{ffmpeg} command forces a global
 header (thus disabling individual packet headers) in the H.264 packets
@@ -363,15 +358,6 @@ will replace the current ones if the stream is already cropped.
 These fields are set in pixels.  Note that some sizes may not be
 representable if the chroma is subsampled (H.265 section 7.4.3.2.1).

-@item level
-Set the level in the VPS and SPS.  See H.265 section A.4 and tables
-A.6 and A.7.
-
-The argument must be the name of a level (for example, @samp{5.1}), a
-@emph{general_level_idc} value (for example, @samp{153} for level 5.1),
-or the special name @samp{auto} indicating that the filter should
-attempt to guess the level from the input stream properties.
-
@end table

@section hevc_mp4toannexb
@@ -544,72 +530,6 @@ ffmpeg -i INPUT -c copy -bsf noise[=1] output.mkv
@section null
 This bitstream filter passes the packets through unchanged.

-@section prores_metadata
-
-Modify color property metadata embedded in prores stream.
-
-@table @option
-@item color_primaries
-Set the color primaries.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same color primaries property (default).
-
-@item unknown
-@item bt709
-@item bt470bg
-BT601 625
-
-@item smpte170m
-BT601 525
-
-@item bt2020
-@item smpte431
-DCI P3
-
-@item smpte432
-P3 D65
-
-@end table
-
-@item transfer_characteristics
-Set the color transfer.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same transfer characteristics property (default).
-
-@item unknown
-@item bt709
-BT 601, BT 709, BT 2020
-@end table
-
-
-@item matrix_coefficients
-Set the matrix coefficient.
-Available values are:
-
-@table @samp
-@item auto
-Keep the same transfer characteristics property (default).
-
-@item unknown
-@item bt709
-@item smpte170m
-BT 601
-
-@item bt2020nc
-@end table
-@end table
-
-Set Rec709 colorspace for each frame of the file
-@example
-ffmpeg -i INPUT -c copy -bsf:v prores_metadata=color_primaries=bt709:color_trc=bt709:colorspace=bt709 output.mov
-@end example
-
@section remove_extra

 Remove extradata from packets.
@@ -646,12 +566,7 @@ Log trace output containing all syntax elements in the coded stream
 headers (everything above the level of individual coded blocks).
 This can be useful for debugging low-level stream issues.

-Supports AV1, H.264, H.265, (M)JPEG, MPEG-2 and VP9, but depending
-on the build only a subset of these may be available.
-
-@section truehd_core
-
-Extract the core from a TrueHD stream, dropping ATMOS data.
+Supports H.264, H.265, MPEG-2 and VP9.

@section vp9_metadata

--- a/doc/build_system.txt
+++ b/doc/build_system.txt
@@ -36,11 +36,11 @@ install
 examples
    Build all examples located in doc/examples.

-checkheaders
-    Check headers dependencies.
+libavformat/output-example
+    Build the libavformat basic example.

-alltools
-    Build all tools in tools directory.
+libswscale/swscale-test
+    Build the swscale self-test (useful also as an example).

 config
    Reconfigure the project with the current configuration.
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -55,9 +55,6 @@ Do not draw edges.
@item psnr
 Set error[?] variables during encoding.
@item truncated
-@item drop_changed
-Don't output frames whose parameters differ from first decoded frame in stream.
-Error AVERROR_INPUT_CHANGED is returned when a frame is dropped.

@item ildct
 Use interlaced DCT.
@@ -778,6 +775,8 @@ Place global headers at every keyframe instead of in extradata.
 Frame data might be split into multiple chunks.
@item showall
 Show all frames before the first keyframe.
+@item skiprd
+Deprecated, use mpegvideo private options instead.
@item export_mvs
 Export motion vectors into frame side-data (see @code{AV_FRAME_DATA_MOTION_VECTORS})
 for codecs that support it. See also @file{doc/examples/export_mvs.c}.
@@ -963,9 +962,6 @@ Discard all bidirectional frames.
@item nokey
 Discard all frames excepts keyframes.

-@item nointra
-Discard all frames except I frames.
-
@item all
 Discard all frames.
@end table
@@ -1236,7 +1232,7 @@ instead of alpha. Default is 0.
@item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
 Stream parameters.
-For example, to separate the fields with newlines and indentation:
+For example to separate the fields with newlines and indention:
@example
 ffprobe -dump_separator "
                          "  -i ~/videos/matrixbench_mpeg2.mpg
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -47,32 +47,6 @@ top-field-first is assumed

@end table

-@section libdav1d
-
-dav1d AV1 decoder.
-
-libdav1d allows libavcodec to decode the AOMedia Video 1 (AV1) codec.
-Requires the presence of the libdav1d headers and library during configuration.
-You need to explicitly configure the build with @code{--enable-libdav1d}.
-
-@subsection Options
-
-The following option is supported by the libdav1d wrapper.
-
-@table @option
-
-@item framethreads
-Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
-
-@item tilethreads
-Set amount of tile threads to use during decoding. The default value is 0 (autodetect).
-
-@item filmgrain
-Apply film grain to the decoded video if present in the bitstream. The default value
-is true.
-
-@end table
-
@section libdavs2

 AVS2-P2/IEEE1857.4 video decoder wrapper.
@@ -220,31 +194,6 @@ without this library.
@chapter Subtitles Decoders
@c man begin SUBTILES DECODERS

-@section libaribb24
-
-ARIB STD-B24 caption decoder.
-
-Implements profiles A and C of the ARIB STD-B24 standard.
-
-@subsection libaribb24 Decoder Options
-
-@table @option
-
-@item -aribb24-base-path @var{path}
-Sets the base path for the libaribb24 library. This is utilized for reading of
-configuration files (for custom unicode conversions), and for dumping of
-non-text symbols as images under that location.
-
-Unset by default.
-
-@item -aribb24-skip-ruby-text @var{boolean}
-Tells the decoder wrapper to skip text blocks that contain half-height ruby
-text.
-
-Enabled by default.
-
-@end table
-
@section dvbsub

@subsection Options
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -25,6 +25,17 @@ Audible Format 2, 3, and 4 demuxer.

 This demuxer is used to demux Audible Format 2, 3, and 4 (.aa) files.

+@section applehttp
+
+Apple HTTP Live Streaming demuxer.
+
+This demuxer presents all AVStreams from all variant streams.
+The id field is set to the bitrate variant index number. By setting
+the discard flags on AVStreams (by pressing 'a' or 'v' in ffplay),
+the caller can decide which variant streams to actually receive.
+The total bitrate of the variant that the stream belongs to is
+available in a metadata key named "variant_bitrate".
+
@section apng

 Animated Portable Network Graphics demuxer.
@@ -309,15 +320,6 @@ infinitely.

 HLS demuxer

-Apple HTTP Live Streaming demuxer.
-
-This demuxer presents all AVStreams from all variant streams.
-The id field is set to the bitrate variant index number. By setting
-the discard flags on AVStreams (by pressing 'a' or 'v' in ffplay),
-the caller can decide which variant streams to actually receive.
-The total bitrate of the variant that the stream belongs to is
-available in a metadata key named "variant_bitrate".
-
 It accepts the following options:

@table @option
@@ -479,84 +481,14 @@ ffmpeg -framerate 10 -pattern_type glob -i "*.png" out.mkv

 The Game Music Emu library is a collection of video game music file emulators.

-See @url{https://bitbucket.org/mpyne/game-music-emu/overview} for more information.
+See @url{http://code.google.com/p/game-music-emu/} for more information.

-It accepts the following options:
+Some files have multiple tracks. The demuxer will pick the first track by
+default. The @option{track_index} option can be used to select a different
+track. Track indexes start at 0. The demuxer exports the number of tracks as
+@var{tracks} meta data entry.

-@table @option
-
-@item track_index
-Set the index of which track to demux. The demuxer can only export one track.
-Track indexes start at 0. Default is to pick the first track. Number of tracks
-is exported as @var{tracks} metadata entry.
-
-@item sample_rate
-Set the sampling rate of the exported track. Range is 1000 to 999999. Default is 44100.
-
-@item max_size @emph{(bytes)}
-The demuxer buffers the entire file into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of files that can be read.
-Default is 50 MiB.
-
-@end table
-
-@section libmodplug
-
-ModPlug based module demuxer
-
-See @url{https://github.com/Konstanty/libmodplug}
-
-It will export one 2-channel 16-bit 44.1 kHz audio stream.
-Optionally, a @code{pal8} 16-color video stream can be exported with or without printed metadata.
-
-It accepts the following options:
-
-@table @option
-@item noise_reduction
-Apply a simple low-pass filter. Can be 1 (on) or 0 (off). Default is 0.
-
-@item reverb_depth
-Set amount of reverb. Range 0-100. Default is 0.
-
-@item reverb_delay
-Set delay in ms, clamped to 40-250 ms. Default is 0.
-
-@item bass_amount
-Apply bass expansion a.k.a. XBass or megabass. Range is 0 (quiet) to 100 (loud). Default is 0.
-
-@item bass_range
-Set cutoff i.e. upper-bound for bass frequencies. Range is 10-100 Hz. Default is 0.
-
-@item surround_depth
-Apply a Dolby Pro-Logic surround effect. Range is 0 (quiet) to 100 (heavy). Default is 0.
-
-@item surround_delay
-Set surround delay in ms, clamped to 5-40 ms. Default is 0.
-
-@item max_size
-The demuxer buffers the entire file into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of files that can be read. Range is 0 to 100 MiB.
-0 removes buffer size limit (not recommended). Default is 5 MiB.
-
-@item video_stream_expr
-String which is evaluated using the eval API to assign colors to the generated video stream.
-Variables which can be used are @code{x}, @code{y}, @code{w}, @code{h}, @code{t}, @code{speed},
-@code{tempo}, @code{order}, @code{pattern} and @code{row}.
-
-@item video_stream
-Generate video stream. Can be 1 (on) or 0 (off). Default is 0.
-
-@item video_stream_w
-Set video frame width in 'chars' where one char indicates 8 pixels. Range is 20-512. Default is 30.
-
-@item video_stream_h
-Set video frame height in 'chars' where one char indicates 8 pixels. Range is 20-512. Default is 30.
-
-@item video_stream_ptxt
-Print metadata on video stream. Includes @code{speed}, @code{tempo}, @code{order}, @code{pattern},
-@code{row} and @code{ts} (time in ms). Can be 1 (on) or 0 (off). Default is 1.
-
-@end table
+For very large files, the @option{max_size} option may have to be adjusted.

@section libopenmpt

@@ -730,20 +662,4 @@ Example: convert the captions to a format most players understand:
 ffmpeg -i http://www.ted.com/talks/subtitles/id/1/lang/en talk1-en.srt
@end example

-@section vapoursynth
-
-Vapoursynth wrapper.
-
-Due to security concerns, Vapoursynth scripts will not
-be autodetected so the input format has to be forced. For ff* CLI tools,
-add @code{-f vapoursynth} before the input @code{-i yourscript.vpy}.
-
-This demuxer accepts the following option:
-@table @option
-@item max_script_size
-The demuxer buffers the entire script into memory. Adjust this value to set the maximum buffer size,
-which in turn, acts as a ceiling for the size of scripts that can be read.
-Default is 1 MiB.
-@end table
-
@c man end DEMUXERS
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -733,14 +733,6 @@ if set to 0.

 Default value is 0.

-@item eld_v2
-Enable ELDv2 (LD-MPS extension for ELD stereo signals) for ELDv2 if set to 1,
-disabled if set to 0.
-
-Note that option is available when fdk-aac version (AACENCODER_LIB_VL0.AACENCODER_LIB_VL1.AACENCODER_LIB_VL2) > (4.0.0).
-
-Default value is 0.
-
@item signaling
 Set SBR/PS signaling style.

@@ -1378,181 +1370,6 @@ makes it possible to store non-rgb pix_fmts.

@end table

-@section libaom-av1
-
-libaom AV1 encoder wrapper.
-
-Requires the presence of the libaom headers and library during
-configuration.  You need to explicitly configure the build with
-@code{--enable-libaom}.
-
-@subsection Options
-
-The wrapper supports the following standard libavcodec options:
-
-@table @option
-
-@item b
-Set bitrate target in bits/second.  By default this will use
-variable-bitrate mode.  If @option{maxrate} and @option{minrate} are
-also set to the same value then it will use constant-bitrate mode,
-otherwise if @option{crf} is set as well then it will use
-constrained-quality mode.
-
-@item g keyint_min
-Set key frame placement.  The GOP size sets the maximum distance between
-key frames; if zero the output stream will be intra-only.  The minimum
-distance is ignored unless it is the same as the GOP size, in which case
-key frames will always appear at a fixed interval.  Not set by default,
-so without this option the library has completely free choice about
-where to place key frames.
-
-@item qmin qmax
-Set minimum/maximum quantisation values.  Valid range is from 0 to 63
-(warning: this does not match the quantiser values actually used by AV1
- divide by four to map real quantiser values to this range).  Defaults
-to min/max (no constraint).
-
-@item minrate maxrate bufsize rc_init_occupancy
-Set rate control buffering parameters.  Not used if not set - defaults
-to unconstrained variable bitrate.
-
-@item threads
-Set the number of threads to use while encoding.  This may require the
-@option{tiles} or @option{row-mt} options to also be set to actually
-use the specified number of threads fully. Defaults to the number of
-hardware threads supported by the host machine.
-
-@item profile
-Set the encoding profile.  Defaults to using the profile which matches
-the bit depth and chroma subsampling of the input.
-
-@end table
-
-The wrapper also has some specific options:
-
-@table @option
-
-@item cpu-used
-Set the quality/encoding speed tradeoff.  Valid range is from 0 to 8,
-higher numbers indicating greater speed and lower quality.  The default
-value is 1, which will be slow and high quality.
-
-@item auto-alt-ref
-Enable use of alternate reference frames.  Defaults to the internal
-default of the library.
-
-@item arnr-max-frames (@emph{frames})
-Set altref noise reduction max frame count. Default is -1.
-
-@item arnr-strength (@emph{strength})
-Set altref noise reduction filter strength. Range is -1 to 6. Default is -1.
-
-@item aq-mode (@emph{aq-mode})
-Set adaptive quantization mode. Possible values:
-
-@table @samp
-@item none (@emph{0})
-Disabled.
-
-@item variance (@emph{1})
-Variance-based.
-
-@item complexity (@emph{2})
-Complexity-based.
-
-@item cyclic (@emph{3})
-Cyclic refresh.
-@end table
-
-@item lag-in-frames
-Set the maximum number of frames which the encoder may keep in flight
-at any one time for lookahead purposes.  Defaults to the internal
-default of the library.
-
-@item error-resilience
-Enable error resilience features:
-@table @option
-@item default
-Improve resilience against losses of whole frames.
-@end table
-Not enabled by default.
-
-@item crf
-Set the quality/size tradeoff for constant-quality (no bitrate target)
-and constrained-quality (with maximum bitrate target) modes. Valid
-range is 0 to 63, higher numbers indicating lower quality and smaller
-output size.  Only used if set; by default only the bitrate target is
-used.
-
-@item static-thresh
-Set a change threshold on blocks below which they will be skipped by
-the encoder.  Defined in arbitrary units as a nonnegative integer,
-defaulting to zero (no blocks are skipped).
-
-@item drop-threshold
-Set a threshold for dropping frames when close to rate control bounds.
-Defined as a percentage of the target buffer - when the rate control
-buffer falls below this percentage, frames will be dropped until it
-has refilled above the threshold.  Defaults to zero (no frames are
-dropped).
-
-@item denoise-noise-level (@emph{level})
-Amount of noise to be removed for grain synthesis. Grain synthesis is disabled if
-this option is not set or set to 0.
-
-@item denoise-block-size (@emph{pixels})
-Block size used for denoising for grain synthesis. If not set, AV1 codec
-uses the default value of 32.
-
-@item undershoot-pct (@emph{pct})
-Set datarate undershoot (min) percentage of the target bitrate. Range is -1 to 100.
-Default is -1.
-
-@item overshoot-pct (@emph{pct})
-Set datarate overshoot (max) percentage of the target bitrate. Range is -1 to 1000.
-Default is -1.
-
-@item minsection-pct (@emph{pct})
-Minimum percentage variation of the GOP bitrate from the target bitrate. If minsection-pct
-is not set, the libaomenc wrapper computes it as follows: @code{(minrate * 100 / bitrate)}.
-Range is -1 to 100. Default is -1 (unset).
-
-@item maxsection-pct (@emph{pct})
-Maximum percentage variation of the GOP bitrate from the target bitrate. If maxsection-pct
-is not set, the libaomenc wrapper computes it as follows: @code{(maxrate * 100 / bitrate)}.
-Range is -1 to 5000. Default is -1 (unset).
-
-@item frame-parallel (@emph{boolean})
-Enable frame parallel decodability features. Default is true.
-
-@item tiles
-Set the number of tiles to encode the input video with, as columns x
-rows.  Larger numbers allow greater parallelism in both encoding and
-decoding, but may decrease coding efficiency.  Defaults to the minimum
-number of tiles required by the size of the input video (this is 1x1
-(that is, a single tile) for sizes up to and including 4K).
-
-@item tile-columns tile-rows
-Set the number of tiles as log2 of the number of tile rows and columns.
-Provided for compatibility with libvpx/VP9.
-
-@item row-mt (Requires libaom >= 1.0.0-759-g90a15f4f2)
-Enable row based multi-threading. Disabled by default.
-
-@item enable-cdef (@emph{boolean})
-Enable Constrained Directional Enhancement Filter. The libaom-av1
-encoder enables CDEF by default.
-
-@item enable-global-motion (@emph{boolean})
-Enable the use of global motion for block prediction. Default is true.
-
-@item enable-intrabc (@emph{boolean})
-Enable block copy mode for intra block prediction. This mode is
-useful for screen content. Default is true.
-
-@end table
-
@section libkvazaar

 Kvazaar H.265/HEVC encoder.
@@ -1824,8 +1641,7 @@ means unlimited.
@table @option
@item auto-alt-ref
 Enable use of alternate reference frames (2-pass only).
-Values greater than 1 enable multi-layer alternate reference frames (VP9 only).
-@item arnr-maxframes
+@item arnr-max-frames
 Set altref noise reduction max frame count.
@item arnr-type
 Set altref noise reduction filter type: backward, forward, centered.
@@ -1838,38 +1654,6 @@ Set number of frames to look ahead for frametype and ratecontrol.
@item error-resilient
 Enable error resiliency features.

-@item sharpness @var{integer}
-Increase sharpness at the expense of lower PSNR.
-The valid range is [0, 7].
-
-@item VP8-specific options
-@table @option
-@item ts-parameters
-Sets the temporal scalability configuration using a :-separated list of
-key=value pairs. For example, to specify temporal scalability parameters
-with @code{ffmpeg}:
-@example
-ffmpeg -i INPUT -c:v libvpx -ts-parameters ts_number_layers=3:\
-ts_target_bitrate=250000,500000,1000000:ts_rate_decimator=4,2,1:\
-ts_periodicity=4:ts_layer_id=0,2,1,2 OUTPUT
-@end example
-Below is a brief explanation of each of the parameters, please
-refer to @code{struct vpx_codec_enc_cfg} in @code{vpx/vpx_encoder.h} for more
-details.
-@table @option
-@item ts_number_layers
-Number of temporal coding layers.
-@item ts_target_bitrate
-Target bitrate for each temporal layer.
-@item ts_rate_decimator
-Frame rate decimation factor for each temporal layer.
-@item ts_periodicity
-Length of the sequence defining frame temporal layer membership.
-@item ts_layer_id
-Template defining the membership of frames to temporal layers.
-@end table
-@end table
-
@item VP9-specific options
@table @option
@item lossless
@@ -1908,8 +1692,6 @@ Corpus VBR mode is a variant of standard VBR where the complexity distribution
 midpoint is passed in rather than calculated for a specific clip or chunk.

 The valid range is [0, 10000]. 0 (default) uses standard VBR.
-@item enable-tpl @var{boolean}
-Enable temporal dependency model.
@end table

@end table
@@ -2398,63 +2180,6 @@ ffmpeg -i input -c:v libx265 -x265-params crf=26:psy-rd=1 output.mp4
@end example
@end table

-@section libxavs2
-
-xavs2 AVS2-P2/IEEE1857.4 encoder wrapper.
-
-This encoder requires the presence of the libxavs2 headers and library
-during configuration. You need to explicitly configure the build with
-@option{--enable-libxavs2}.
-
-The following standard libavcodec options are used:
-@itemize
-@item
-@option{b} / @option{bit_rate}
-@item
-@option{g} / @option{gop_size}
-@item
-@option{bf} / @option{max_b_frames}
-@end itemize
-
-The encoder also has its own specific options:
-@subsection Options
-
-@table @option
-@item lcu_row_threads
-Set the number of parallel threads for rows from 1 to 8 (default 5).
-
-@item initial_qp
-Set the xavs2 quantization parameter from 1 to 63 (default 34). This is
-used to set the initial qp for the first frame.
-
-@item qp
-Set the xavs2 quantization parameter from 1 to 63 (default 34). This is
-used to set the qp value under constant-QP mode.
-
-@item max_qp
-Set the max qp for rate control from 1 to 63 (default 55).
-
-@item min_qp
-Set the min qp for rate control from 1 to 63 (default 20).
-
-@item speed_level
-Set the Speed level from 0 to 9 (default 0). Higher is better but slower.
-
-@item log_level
-Set the log level from -1 to 3 (default 0). -1: none, 0: error,
-1: warning, 2: info, 3: debug.
-
-@item xavs2-params
-Set xavs2 options using a list of @var{key}=@var{value} couples separated
-by ":".
-
-For example to specify libxavs2 encoding options with @option{-xavs2-params}:
-
-@example
-ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2
-@end example
-@end table
-
@section libxvid

 Xvid MPEG-4 Part 2 encoder wrapper.
@@ -2645,9 +2370,6 @@ Specifies the video_format written into the sequence display extension
 indicating the source of the video pictures. The default is @samp{unspecified},
 can be @samp{component}, @samp{pal}, @samp{ntsc}, @samp{secam} or @samp{mac}.
 For maximum compatibility, use @samp{component}.
-@item a53cc @var{boolean}
-Import closed captions (which must be ATSC compatible format) into output.
-Default is 1 (on).
@end table

@section png
@@ -2881,48 +2603,15 @@ Size / quality tradeoff: higher values are smaller / worse quality.
@end itemize

 All encoders support the following options:
-@table @option
-@item low_power
+@itemize
+@item
+@option{low_power}
+
 Some drivers/platforms offer a second encoder for some codecs intended to use
 less power than the default encoder; setting this option will attempt to use
 that encoder.  Note that it may support a reduced feature set, so some other
 options may not be available in this mode.
-
-@item idr_interval
-Set the number of normal intra frames between full-refresh (IDR) frames in
-open-GOP mode.  The intra frames are still IRAPs, but will not include global
-headers and may have non-decodable leading pictures.
-
-@item b_depth
-Set the B-frame reference depth.  When set to one (the default), all B-frames
-will refer only to P- or I-frames.  When set to greater values multiple layers
-of B-frames will be present, frames in each layer only referring to frames in
-higher layers.
-
-@item rc_mode
-Set the rate control mode to use.  A given driver may only support a subset of
-modes.
-
-Possible modes:
-@table @option
-@item auto
-Choose the mode automatically based on driver support and the other options.
-This is the default.
-@item CQP
-Constant-quality.
-@item CBR
-Constant-bitrate.
-@item VBR
-Variable-bitrate.
-@item ICQ
-Intelligent constant-quality.
-@item QVBR
-Quality-defined variable-bitrate.
-@item AVBR
-Average variable bitrate.
-@end table
-
-@end table
+@end itemize

 Each encoder also has its own specific options:
@table @option
@@ -3102,6 +2791,52 @@ Reduces detail but attempts to preserve color at extremely low bitrates.

@end table

+@section libxavs2
+
+xavs2 AVS2-P2/IEEE1857.4 encoder wrapper.
+
+This encoder requires the presence of the libxavs2 headers and library
+during configuration. You need to explicitly configure the build with
+@option{--enable-libxavs2}.
+
+@subsection Options
+
+@table @option
+@item lcu_row_threads
+Set the number of parallel threads for rows from 1 to 8 (default 5).
+
+@item initial_qp
+Set the xavs2 quantization parameter from 1 to 63 (default 34). This is
+used to set the initial qp for the first frame.
+
+@item qp
+Set the xavs2 quantization parameter from 1 to 63 (default 34). This is
+used to set the qp value under constant-QP mode.
+
+@item max_qp
+Set the max qp for rate control from 1 to 63 (default 55).
+
+@item min_qp
+Set the min qp for rate control from 1 to 63 (default 20).
+
+@item speed_level
+Set the Speed level from 0 to 9 (default 0). Higher is better but slower.
+
+@item log_level
+Set the log level from -1 to 3 (default 0). -1: none, 0: error,
+1: warning, 2: info, 3: debug.
+
+@item xavs2-params
+Set xavs2 options using a list of @var{key}=@var{value} couples separated
+by ":".
+
+For example to specify libxavs2 encoding options with @option{-xavs2-params}:
+
+@example
+ffmpeg -i input -c:v libxavs2 -xavs2-params preset_level=5 output.avs2
+@end example
+@end table
+
@c man end VIDEO ENCODERS

@chapter Subtitles Encoders
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -37,7 +37,7 @@ $(EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o
 examples: $(EXAMPLES)

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

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

--- a/doc/examples/avio_reading.c
+++ b/doc/examples/avio_reading.c
@@ -117,12 +117,11 @@ int main(int argc, char *argv[])

 end:
    avformat_close_input(&fmt_ctx);
-
    /* note: the internal buffer could have changed, and be != avio_ctx_buffer */
-    if (avio_ctx)
+    if (avio_ctx) {
        av_freep(&avio_ctx->buffer);
-    avio_context_free(&avio_ctx);
-
+        av_freep(&avio_ctx);
+    }
    av_file_unmap(buffer, buffer_size);

    if (ret < 0) {
--- a/doc/examples/metadata.c
+++ b/doc/examples/metadata.c
@@ -47,11 +47,6 @@ int main (int argc, char **argv)
    if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL)))
        return ret;

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

--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -76,7 +76,7 @@ the gcc developers. Note that we will not add workarounds for gcc bugs.

 Also note that (some of) the gcc developers believe this is not a bug or
 not a bug they should fix:
-@url{https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11203}.
+@url{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11203}.
 Then again, some of them do not know the difference between an undecidable
 problem and an NP-hard problem...

@@ -257,13 +257,13 @@ default.
@section Which are good parameters for encoding high quality MPEG-4?

 '-mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1/2',
-things to try: '-bf 2', '-mpv_flags qp_rd', '-mpv_flags mv0', '-mpv_flags skip_rd'.
+things to try: '-bf 2', '-flags qprd', '-flags mv0', '-flags skiprd'.

@section Which are good parameters for encoding high quality MPEG-1/MPEG-2?

 '-mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 100 -pass 1/2'
 but beware the '-g 100' might cause problems with some decoders.
-Things to try: '-bf 2', '-mpv_flags qp_rd', '-mpv_flags mv0', '-mpv_flags skip_rd'.
+Things to try: '-bf 2', '-flags qprd', '-flags mv0', '-flags skiprd.

@section Interlaced video looks very bad when encoded with ffmpeg, what is wrong?

@@ -516,7 +516,7 @@ in the ffmpeg invocation. This is effective whether you run ffmpeg in a shell
 or invoke ffmpeg in its own process via an operating system API.

 As an alternative, when you are running ffmpeg in a shell, you can redirect
-standard input to @code{/dev/null} (on Linux and macOS)
+standard input to @code{/dev/null} (on Linux and Mac OS)
 or @code{NUL} (on Windows). You can do this redirect either
 on the ffmpeg invocation, or from a shell script which calls ffmpeg.

@@ -526,7 +526,7 @@ For example:
 ffmpeg -nostdin -i INPUT OUTPUT
@end example

-or (on Linux, macOS, and other UNIX-like shells):
+or (on Linux, Mac OS, and other UNIX-like shells):

@example
 ffmpeg -i INPUT OUTPUT </dev/null
@@ -601,7 +601,7 @@ No. These tools are too bloated and they complicate the build.
 FFmpeg is already organized in a highly modular manner and does not need to
 be rewritten in a formal object language. Further, many of the developers
 favor straight C; it works for them. For more arguments on this matter,
-read @uref{https://web.archive.org/web/20111004021423/http://kernel.org/pub/linux/docs/lkml/#s15, "Programming Religion"}.
+read @uref{http://www.tux.org/lkml/#s15, "Programming Religion"}.

@section Why are the ffmpeg programs devoid of debugging symbols?

--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -523,9 +523,6 @@ The offset is added to the timestamps of the input files. Specifying
 a positive offset means that the corresponding streams are delayed by
 the time duration specified in @var{offset}.

-@item -itsscale @var{scale} (@emph{input,per-stream})
-Rescale input timestamps. @var{scale} should be a floating point number.
-
@item -timestamp @var{date} (@emph{output})
 Set the recording timestamp in the container.

@@ -617,13 +614,8 @@ they do not conflict with the standard, as in:
 ffmpeg -i myfile.avi -target vcd -bf 2 /tmp/vcd.mpg
@end example

-@item -dn (@emph{input/output})
-As an input option, blocks all data streams of a file from being filtered or
-being automatically selected or mapped for any output. See @code{-discard}
-option to disable streams individually.
-
-As an output option, disables data recording i.e. automatic selection or
-mapping of any data stream. For full manual control see the @code{-map}
+@item -dn (@emph{output})
+Disable data recording. For full manual control see the @code{-map}
 option.

@item -dframes @var{number} (@emph{output})
@@ -783,13 +775,8 @@ If used together with @option{-vcodec copy}, it will affect the aspect ratio
 stored at container level, but not the aspect ratio stored in encoded
 frames, if it exists.

-@item -vn (@emph{input/output})
-As an input option, blocks all video streams of a file from being filtered or
-being automatically selected or mapped for any output. See @code{-discard}
-option to disable streams individually.
-
-As an output option, disables video recording i.e. automatic selection or
-mapping of any video stream. For full manual control see the @code{-map}
+@item -vn (@emph{output})
+Disable video recording. For full manual control see the @code{-map}
 option.

@item -vcodec @var{codec} (@emph{output})
@@ -1102,13 +1089,8 @@ Set the number of audio channels. For output streams it is set by
 default to the number of input audio channels. For input streams
 this option only makes sense for audio grabbing devices and raw demuxers
 and is mapped to the corresponding demuxer options.
-@item -an (@emph{input/output})
-As an input option, blocks all audio streams of a file from being filtered or
-being automatically selected or mapped for any output. See @code{-discard}
-option to disable streams individually.
-
-As an output option, disables audio recording i.e. automatic selection or
-mapping of any audio stream. For full manual control see the @code{-map}
+@item -an (@emph{output})
+Disable audio recording. For full manual control see the @code{-map}
 option.
@item -acodec @var{codec} (@emph{input/output})
 Set the audio codec. This is an alias for @code{-codec:a}.
@@ -1143,13 +1125,8 @@ stereo but not 6 channels as 5.1. The default is to always try to guess. Use
@table @option
@item -scodec @var{codec} (@emph{input/output})
 Set the subtitle codec. This is an alias for @code{-codec:s}.
-@item -sn (@emph{input/output})
-As an input option, blocks all subtitle streams of a file from being filtered or
-being automatically selected or mapped for any output. See @code{-discard}
-option to disable streams individually.
-
-As an output option, disables subtitle recording i.e. automatic selection or
-mapping of any subtitle stream. For full manual control see the @code{-map}
+@item -sn (@emph{output})
+Disable subtitle recording. For full manual control see the @code{-map}
 option.
@item -sbsf @var{bitstream_filter}
 Deprecated, see -bsf
@@ -1396,6 +1373,10 @@ loss).
 By default @command{ffmpeg} attempts to read the input(s) as fast as possible.
 This option will slow down the reading of the input(s) to the native frame rate
 of the input(s). It is useful for real-time output (e.g. live streaming).
+@item -loop_output @var{number_of_times}
+Repeatedly loop output for formats that support looping such as animated GIF
+(0 will loop the output infinitely).
+This option is deprecated, use -loop.
@item -vsync @var{parameter}
 Video sync method.
 For compatibility reasons old values can be specified as numbers.
@@ -1515,9 +1496,9 @@ Enable bitexact mode for (de)muxer and (de/en)coder
 Finish encoding when the shortest input stream ends.
@item -dts_delta_threshold
 Timestamp discontinuity delta threshold.
-@item -muxdelay @var{seconds} (@emph{output})
+@item -muxdelay @var{seconds} (@emph{input})
 Set the maximum demux-decode delay.
-@item -muxpreload @var{seconds} (@emph{output})
+@item -muxpreload @var{seconds} (@emph{input})
 Set the initial demux-decode delay.
@item -streamid @var{output-stream-index}:@var{new-value} (@emph{output})
 Assign a new stream-id value to an output stream. This option should be
@@ -1639,10 +1620,8 @@ This allows dumping sdp information when at least one output isn't an
 rtp stream. (Requires at least one of the output formats to be rtp).

@item -discard (@emph{input})
-Allows discarding specific streams or frames from streams.
-Any input stream can be fully discarded, using value @code{all} whereas
-selective discarding of frames from a stream occurs at the demuxer
-and is not supported by all demuxers.
+Allows discarding specific streams or frames of streams at the demuxer.
+Not all demuxers support this.

@table @option
@item none
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -66,8 +66,6 @@ Set custom interval, in seconds, for seeking using left/right keys. Default is 1
 Disable graphical display.
@item -noborder
 Borderless window.
-@item -alwaysontop
-Window always on top. Available on: X11 with SDL >= 2.0.5, Windows SDL >= 2.0.6.
@item -volume
 Set the startup volume. 0 means silence, 100 means no volume reduction or
 amplification. Negative values are treated as 0, values above 100 are treated
@@ -197,12 +195,6 @@ input as soon as possible. Enabled by default for realtime streams, where data
 may be dropped if not read in time. Use this option to enable infinite buffers
 for all inputs, use @option{-noinfbuf} to disable it.

-@item -filter_threads @var{nb_threads}
-Defines how many threads are used to process a filter pipeline. Each pipeline
-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.
-
@end table

@section While playing
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -425,7 +425,7 @@ The @code{csv} writer is equivalent to @code{compact}, but supports
 different defaults.

 Each section is printed on a single line.
-If no option is specified, the output has the form:
+If no option is specifid, the output has the form:
@example
 section|key1=val1| ... |keyN=valN
@end example
@@ -591,7 +591,7 @@ This option automatically sets @option{fully_qualified} to 1.
@end table

 For more information about the XML format, see
-@url{https://www.w3.org/XML/}.
+@url{http://www.w3.org/XML/}.
@c man end WRITERS

@chapter Timecode
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -147,25 +147,11 @@
        </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" />
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -34,24 +34,27 @@ Possible forms of stream specifiers are:
@table @option
@item @var{stream_index}
 Matches the stream with this index. E.g. @code{-threads:1 4} would set the
-thread count for the second stream to 4. 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 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}]
+thread count for the second stream to 4.
+@item @var{stream_type}[:@var{stream_index}]
@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
 streams, 'V' only matches video streams which are not attached pictures, video
-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 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
-are part of the program and match the @var{additional_stream_specifier}.
+thumbnails or cover arts.  If @var{stream_index} is given, then it matches
+stream number @var{stream_index} of this type. Otherwise, it matches all
+streams of this type.
+@item p:@var{program_id}[:@var{stream_index}] or p:@var{program_id}[:@var{stream_type}[:@var{stream_index}]] or
+p:@var{program_id}:m:@var{key}[:@var{value}]
+In first version, if @var{stream_index} is given, then it matches the stream with number @var{stream_index}
+in the program with the id @var{program_id}. Otherwise, it matches all streams in the
+program. In the second version, @var{stream_type} is one of following: 'v' for video, 'a' for audio, 's'
+for subtitle, 'd' for data. If @var{stream_index} is also given, then it matches
+stream number @var{stream_index} of this type in the program with the id @var{program_id}.
+Otherwise, if only @var{stream_type} is given, it matches all
+streams of this type in the program with the id @var{program_id}.
+In the third version matches streams in the program with the id @var{program_id} with the metadata
+tag @var{key} having the specified value. If
+@var{value} is not given, matches streams that contain the given tag with any
+value.

@item #@var{stream_id} or i:@var{stream_id}
 Match the stream by stream id (e.g. PID in MPEG-TS container).
@@ -109,10 +112,6 @@ Print detailed information about the muxer named @var{muxer_name}. Use the
@item filter=@var{filter_name}
 Print detailed information about the filter name @var{filter_name}. Use the
@option{-filters} option to get a list of all filters.
-
-@item bsf=@var{bitstream_filter_name}
-Print detailed information about the bitstream filter name @var{bitstream_filter_name}.
-Use the @option{-bsfs} option to get a list of all bitstream filters.
@end table

@item -version
@@ -246,7 +245,7 @@ Dump full command line and console output to a file named
@code{@var{program}-@var{YYYYMMDD}-@var{HHMMSS}.log} in the current
 directory.
 This file can be useful for bug reports.
-It also implies @code{-loglevel debug}.
+It also implies @code{-loglevel verbose}.

 Setting the environment variable @env{FFREPORT} to any value has the
 same effect. If the value is a ':'-separated key=value sequence, these
@@ -372,15 +371,7 @@ ffmpeg -i input.flac -id3v2_version 3 out.mp3
@end example

 All codec AVOptions are per-stream, and thus a stream specifier
-should be attached to them:
-@example
-ffmpeg -i multichannel.mxf -map 0:v:0 -map 0:a:0 -map 0:a:0 -c:a:0 ac3 -b:a:0 640k -ac:a:1 2 -c:a:1 aac -b:2 128k out.mp4
-@end example
-
-In the above example, a multichannel audio stream is mapped twice for output.
-The first instance is encoded with codec ac3 and bitrate 640k.
-The second instance is downmixed to 2 channels and encoded with codec aac. A bitrate of 128k is specified for it using
-absolute index of the output stream.
+should be attached to them.

 Note: the @option{-nooption} syntax cannot be used for boolean
 AVOptions, use @option{-option 0}/@option{-option 1}.
--- a/doc/filters.texi
+++ b/doc/filters.texi
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -211,7 +211,7 @@ is @code{0} (meaning that no offset is applied).
@item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
 Stream parameters.
-For example, to separate the fields with newlines and indentation:
+For example to separate the fields with newlines and indention:
@example
 ffprobe -dump_separator "
                          "  -i ~/videos/matrixbench_mpeg2.mpg
@@ -224,28 +224,6 @@ would require too many resources due to a large number of streams.
@item skip_estimate_duration_from_pts @var{bool} (@emph{input})
 Skip estimation of input duration when calculated using PTS.
 At present, applicable for MPEG-PS and MPEG-TS.
-
-@item strict, f_strict @var{integer} (@emph{input/output})
-Specify how strictly to follow the standards. @code{f_strict} is deprecated and
-should be used only via the @command{ffmpeg} tool.
-
-Possible values:
-@table @samp
-@item very
-strictly conform to an older more strict version of the spec or reference software
-@item strict
-strictly conform to all the things in the spec no matter what consequences
-@item normal
-
-@item unofficial
-allow unofficial extensions
-@item experimental
-allow non standardized experimental things, experimental
-(unfinished/work in progress/not well tested) decoders and encoders.
-Note: experimental decoders can pose a security risk, do not use this for
-decoding untrusted input.
-@end table
-
@end table

@c man end FORMAT OPTIONS
@@ -256,10 +234,30 @@ decoding untrusted input.
 Format stream specifiers allow selection of one or more streams that
 match specific properties.

+Possible forms of stream specifiers are:
+@table @option
+@item @var{stream_index}
+Matches the stream with this index.
+
+@item @var{stream_type}[:@var{stream_index}]
+@var{stream_type} is one of following: 'v' for video, 'a' for audio,
+'s' for subtitle, 'd' for data, and 't' for attachments. If
+@var{stream_index} is given, then it matches the stream number
+@var{stream_index} of this type. Otherwise, it matches all streams of
+this type.
+
+@item p:@var{program_id}[:@var{stream_index}]
+If @var{stream_index} is given, then it matches the stream with number
+@var{stream_index} in the program with the id
+@var{program_id}. Otherwise, it matches all streams in the program.
+
+@item #@var{stream_id}
+Matches the stream by a format-specific ID.
+@end table
+
 The exact semantics of stream specifiers is defined by the
@code{avformat_match_stream_specifier()} function declared in the
-@file{libavformat/avformat.h} header and documented in the
-@ref{Stream specifiers,,Stream specifiers section in the ffmpeg(1) manual,ffmpeg}.
+@file{libavformat/avformat.h} header.

@ifclear config-writeonly
@include demuxers.texi
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -17,94 +17,21 @@ for more formats. None of them are used by default, their use has to be
 explicitly requested by passing the appropriate flags to
@command{./configure}.

-@section Alliance for Open Media (AOM)
+@section libxavs2

-FFmpeg can make use of the AOM library for AV1 decoding and encoding.
+FFmpeg can make use of the xavs2 library for AVS2-P2/IEEE1857.4 video encoding.

-Go to @url{http://aomedia.org/} and follow the instructions for
-installing the library. Then pass @code{--enable-libaom} to configure to
+Go to @url{https://github.com/pkuvcl/xavs2} and follow the instructions for
+installing the library. Then pass @code{--enable-libxavs2} to configure to
 enable it.

-@section AMD AMF/VCE
-
-FFmpeg can use the AMD Advanced Media Framework library under Windows
-for accelerated H.264 and HEVC encoding on hardware with Video Coding Engine (VCE).
-
-To enable support you must obtain the AMF framework header files from
-@url{https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git}.
-
-Create an @code{AMF/} directory in the system include path.
-Copy the contents of @code{AMF/amf/public/include/} into that directory.
-Then configure FFmpeg with @code{--enable-amf}.
-
-@section AviSynth
-
-FFmpeg can read AviSynth scripts as input. To enable support, pass
-@code{--enable-avisynth} to configure.  The correct headers are
-included in compat/avisynth/, which allows the user to enable support
-without needing to search for these headers themselves.
-
-For Windows, supported AviSynth variants are
-@url{http://avisynth.nl, AviSynth 2.6 RC1 or higher} for 32-bit builds and
-@url{http://avisynth.nl/index.php/AviSynth+, AviSynth+ r1718 or higher} for 32-bit and 64-bit builds.
-
-For Linux and OS X, the supported AviSynth variant is
-@url{https://github.com/avxsynth/avxsynth, AvxSynth}.
-
@float NOTE
-In 2016, AviSynth+ added support for building with GCC. However, due to
-the eccentricities of Windows' calling conventions, 32-bit GCC builds
-of AviSynth+ are not compatible with typical 32-bit builds of FFmpeg.
-
-By default, FFmpeg assumes compatibility with 32-bit MSVC builds of
-AviSynth+ since that is the most widely-used and entrenched build
-configuration.  Users can override this and enable support for 32-bit
-GCC builds of AviSynth+ by passing @code{-DAVSC_WIN32_GCC32} to
-@code{--extra-cflags} when configuring FFmpeg.
-
-64-bit builds of FFmpeg are not affected, and can use either MSVC or
-GCC builds of AviSynth+ without any special flags.
+libxavs2 is under the GNU Public License Version 2 or later
+(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for
+details), you must upgrade FFmpeg's license to GPL in order to use it.
@end float

-@float NOTE
-AviSynth and AvxSynth are loaded dynamically.  Distributors can build FFmpeg
-with @code{--enable-avisynth}, and the binaries will work regardless of the
-end user having AviSynth or AvxSynth installed - they'll only need to be
-installed to use AviSynth scripts (obviously).
-@end float
-
-@section Chromaprint
-
-FFmpeg can make use of the Chromaprint library for generating audio fingerprints.
-Pass @code{--enable-chromaprint} to configure to
-enable it. See @url{https://acoustid.org/chromaprint}.
-
-@section codec2
-
-FFmpeg can make use of the codec2 library for codec2 decoding and encoding.
-There is currently no native decoder, so libcodec2 must be used for decoding.
-
-Go to @url{http://freedv.org/}, download "Codec 2 source archive".
-Build and install using CMake. Debian users can install the libcodec2-dev package instead.
-Once libcodec2 is installed you can pass @code{--enable-libcodec2} to configure to enable it.
-
-The easiest way to use codec2 is with .c2 files, since they contain the mode information required for decoding.
-To encode such a file, use a .c2 file extension and give the libcodec2 encoder the -mode option:
-@code{ffmpeg -i input.wav -mode 700C output.c2}.
-Playback is as simple as @code{ffplay output.c2}.
-For a list of supported modes, run @code{ffmpeg -h encoder=libcodec2}.
-Raw codec2 files are also supported.
-To make sense of them the mode in use needs to be specified as a format option:
-@code{ffmpeg -f codec2raw -mode 1300 -i input.raw output.wav}.
-
-@section dav1d
-
-FFmpeg can make use of the dav1d library for AV1 video decoding.
-
-Go to @url{https://code.videolan.org/videolan/dav1d} and follow the instructions for
-installing the library. Then pass @code{--enable-libdav1d} to configure to enable it.
-
-@section davs2
+@section libdavs2

 FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding.

@@ -118,63 +45,21 @@ libdavs2 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 Game Music Emu
+@section Alliance for Open Media libaom

-FFmpeg can make use of the Game Music Emu library to read audio from supported video game
-music file formats. Pass @code{--enable-libgme} to configure to
-enable it. See @url{https://bitbucket.org/mpyne/game-music-emu/overview}.
+FFmpeg can make use of the libaom library for AV1 decoding.

-@section Intel QuickSync Video
-
-FFmpeg can use Intel QuickSync Video (QSV) for accelerated decoding and encoding
-of multiple codecs. To use QSV, FFmpeg must be linked against the @code{libmfx}
-dispatcher, which loads the actual decoding libraries.
-
-The dispatcher is open source and can be downloaded from
-@url{https://github.com/lu-zero/mfx_dispatch.git}. FFmpeg needs to be configured
-with the @code{--enable-libmfx} option and @code{pkg-config} needs to be able to
-locate the dispatcher's @code{.pc} files.
-
-@section Kvazaar
-
-FFmpeg can make use of the Kvazaar library for HEVC encoding.
-
-Go to @url{https://github.com/ultravideo/kvazaar} and follow the
-instructions for installing the library. Then pass
-@code{--enable-libkvazaar} to configure to enable it.
-
-@section LAME
-
-FFmpeg can make use of the LAME library for MP3 encoding.
-
-Go to @url{http://lame.sourceforge.net/} and follow the
-instructions for installing the library.
-Then pass @code{--enable-libmp3lame} to configure to enable it.
-
-@section libilbc
-
-iLBC is a narrowband speech codec that has been made freely available
-by Google as part of the WebRTC project. libilbc is a packaging friendly
-copy of the iLBC codec. FFmpeg can make use of the libilbc library for
-iLBC decoding and encoding.
-
-Go to @url{https://github.com/TimothyGu/libilbc} and follow the instructions for
-installing the library. Then pass @code{--enable-libilbc} to configure to
+Go to @url{http://aomedia.org/} and follow the instructions for
+installing the library. Then pass @code{--enable-libaom} to configure to
 enable it.

-@section libvpx
+@section OpenJPEG

-FFmpeg can make use of the libvpx library for VP8/VP9 decoding and encoding.
+FFmpeg can use the OpenJPEG libraries for encoding/decoding J2K videos.  Go to
+@url{http://www.openjpeg.org/} to get the libraries and follow the installation
+instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjpeg} to
+@file{./configure}.

-Go to @url{http://www.webmproject.org/} and follow the instructions for
-installing the library. Then pass @code{--enable-libvpx} to configure to
-enable it.
-
-@section ModPlug
-
-FFmpeg can make use of this library, originating in Modplug-XMMS, to read from MOD-like music files.
-See @url{https://github.com/Konstanty/libmodplug}. Pass @code{--enable-libmodplug} to configure to
-enable it.

@section OpenCORE, VisualOn, and Fraunhofer libraries

@@ -221,9 +106,67 @@ Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the
 instructions for installing the library.
 Then pass @code{--enable-libfdk-aac} to configure to enable it.

+@section LAME
+
+FFmpeg can make use of the LAME library for MP3 encoding.
+
+Go to @url{http://lame.sourceforge.net/} and follow the
+instructions for installing the library.
+Then pass @code{--enable-libmp3lame} to configure to enable it.
+
+@section TwoLAME
+
+FFmpeg can make use of the TwoLAME library for MP2 encoding.
+
+Go to @url{http://www.twolame.org/} and follow the
+instructions for installing the library.
+Then pass @code{--enable-libtwolame} to configure to enable it.
+
+@section libcodec2 / codec2 general
+
+FFmpeg can make use of libcodec2 for codec2 encoding and decoding.
+There is currently no native decoder, so libcodec2 must be used for decoding.
+
+Go to @url{http://freedv.org/}, download "Codec 2 source archive".
+Build and install using CMake. Debian users can install the libcodec2-dev package instead.
+Once libcodec2 is installed you can pass @code{--enable-libcodec2} to configure to enable it.
+
+The easiest way to use codec2 is with .c2 files, since they contain the mode information required for decoding.
+To encode such a file, use a .c2 file extension and give the libcodec2 encoder the -mode option:
+@code{ffmpeg -i input.wav -mode 700C output.c2}.
+Playback is as simple as @code{ffplay output.c2}.
+For a list of supported modes, run @code{ffmpeg -h encoder=libcodec2}.
+Raw codec2 files are also supported.
+To make sense of them the mode in use needs to be specified as a format option:
+@code{ffmpeg -f codec2raw -mode 1300 -i input.raw output.wav}.
+
+@section libvpx
+
+FFmpeg can make use of the libvpx library for VP8/VP9 encoding.
+
+Go to @url{http://www.webmproject.org/} and follow the instructions for
+installing the library. Then pass @code{--enable-libvpx} to configure to
+enable it.
+
+@section libwavpack
+
+FFmpeg can make use of the libwavpack library for WavPack encoding.
+
+Go to @url{http://www.wavpack.com/} and follow the instructions for
+installing the library. Then pass @code{--enable-libwavpack} to configure to
+enable it.
+
+@section libxavs
+
+FFmpeg can make use of the libxavs library for Xavs encoding.
+
+Go to @url{http://xavs.sf.net/} and follow the instructions for
+installing the library. Then pass @code{--enable-libxavs} to configure to
+enable it.
+
@section OpenH264

-FFmpeg can make use of the OpenH264 library for H.264 decoding and encoding.
+FFmpeg can make use of the OpenH264 library for H.264 encoding and decoding.

 Go to @url{http://www.openh264.org/} and follow the instructions for
 installing the library. Then pass @code{--enable-libopenh264} to configure to
@@ -236,40 +179,6 @@ constrained baseline profile and CABAC.) Using it is mostly useful for
 testing and for taking advantage of Cisco's patent portfolio license
 (@url{http://www.openh264.org/BINARY_LICENSE.txt}).

-@section OpenJPEG
-
-FFmpeg can use the OpenJPEG libraries for decoding/encoding J2K videos.  Go to
-@url{http://www.openjpeg.org/} to get the libraries and follow the installation
-instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjpeg} to
-@file{./configure}.
-
-@section TwoLAME
-
-FFmpeg can make use of the TwoLAME library for MP2 encoding.
-
-Go to @url{http://www.twolame.org/} and follow the
-instructions for installing the library.
-Then pass @code{--enable-libtwolame} to configure to enable it.
-
-@section VapourSynth
-
-FFmpeg can read VapourSynth scripts as input. To enable support, pass
-@code{--enable-vapoursynth} to configure. Vapoursynth is detected via
-@code{pkg-config}. Versions 42 or greater supported.
-See @url{http://www.vapoursynth.com/}.
-
-Due to security concerns, Vapoursynth scripts will not
-be autodetected so the input format has to be forced. For ff* CLI tools,
-add @code{-f vapoursynth} before the input @code{-i yourscript.vpy}.
-
-@section WavPack
-
-FFmpeg can make use of the libwavpack library for WavPack encoding.
-
-Go to @url{http://www.wavpack.com/} and follow the instructions for
-installing the library. Then pass @code{--enable-libwavpack} to configure to
-enable it.
-
@section x264

 FFmpeg can make use of the x264 library for H.264 encoding.
@@ -298,37 +207,92 @@ x265 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 xavs
+@section kvazaar

-FFmpeg can make use of the xavs library for AVS encoding.
+FFmpeg can make use of the kvazaar library for HEVC encoding.

-Go to @url{http://xavs.sf.net/} and follow the instructions for
-installing the library. Then pass @code{--enable-libxavs} to configure to
+Go to @url{https://github.com/ultravideo/kvazaar} and follow the
+instructions for installing the library. Then pass
+@code{--enable-libkvazaar} to configure to enable it.
+
+@section libilbc
+
+iLBC is a narrowband speech codec that has been made freely available
+by Google as part of the WebRTC project. libilbc is a packaging friendly
+copy of the iLBC codec. FFmpeg can make use of the libilbc library for
+iLBC encoding and decoding.
+
+Go to @url{https://github.com/TimothyGu/libilbc} and follow the instructions for
+installing the library. Then pass @code{--enable-libilbc} to configure to
 enable it.

-@section xavs2
+@section libzvbi

-FFmpeg can make use of the xavs2 library for AVS2-P2/IEEE1857.4 video encoding.
-
-Go to @url{https://github.com/pkuvcl/xavs2} and follow the instructions for
-installing the library. Then pass @code{--enable-libxavs2} to configure to
-enable it.
-
-@float NOTE
-libxavs2 is under the GNU Public License Version 2 or later
-(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for
-details), you must upgrade FFmpeg's license to GPL in order to use it.
-@end float
-
-@section ZVBI
-
-ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB
+libzvbi is a VBI decoding library which can be used by FFmpeg to decode DVB
 teletext pages and DVB teletext subtitles.

 Go to @url{http://sourceforge.net/projects/zapping/} and follow the instructions for
 installing the library. Then pass @code{--enable-libzvbi} to configure to
 enable it.

+@section AviSynth
+
+FFmpeg can read AviSynth scripts as input. To enable support, pass
+@code{--enable-avisynth} to configure.  The correct headers are
+included in compat/avisynth/, which allows the user to enable support
+without needing to search for these headers themselves.
+
+For Windows, supported AviSynth variants are
+@url{http://avisynth.nl, AviSynth 2.6 RC1 or higher} for 32-bit builds and
+@url{http://avs-plus.net, AviSynth+ r1718 or higher} for 32-bit and 64-bit builds.
+
+For Linux and OS X, the supported AviSynth variant is
+@url{https://github.com/avxsynth/avxsynth, AvxSynth}.
+
+@float NOTE
+There is currently a regression in AviSynth+'s @code{capi.h} header as of
+October 2016, which interferes with the ability for builds of FFmpeg to use
+MSVC-built binaries of AviSynth. Until this is resolved, you can make sure
+a known good version is installed by checking out a version from before
+the regression occurred:
+
+@code{git clone -b MT git://github.com/AviSynth/AviSynthPlus.git @*
+cd AviSynthPlus @*
+git checkout -b oldheader b4f292b4dbfad149697fb65c6a037bb3810813f9 @*
+make install PREFIX=/install/prefix}
+@end float
+
+@float NOTE
+AviSynth and AvxSynth are loaded dynamically.  Distributors can build FFmpeg
+with @code{--enable-avisynth}, and the binaries will work regardless of the
+end user having AviSynth or AvxSynth installed - they'll only need to be
+installed to use AviSynth scripts (obviously).
+@end float
+
+@section Intel QuickSync Video
+
+FFmpeg can use Intel QuickSync Video (QSV) for accelerated encoding and decoding
+of multiple codecs. To use QSV, FFmpeg must be linked against the @code{libmfx}
+dispatcher, which loads the actual decoding libraries.
+
+The dispatcher is open source and can be downloaded from
+@url{https://github.com/lu-zero/mfx_dispatch.git}. FFmpeg needs to be configured
+with the @code{--enable-libmfx} option and @code{pkg-config} needs to be able to
+locate the dispatcher's @code{.pc} files.
+
+@section AMD VCE
+
+FFmpeg can use the AMD Advanced Media Framework library for accelerated H.264
+and HEVC encoding on VCE enabled hardware under Windows.
+
+To enable support you must obtain the AMF framework header files from
+@url{https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git}.
+
+Create an @code{AMF/} directory in the system include path.
+Copy the contents of @code{AMF/amf/public/include/} into that directory.
+Then configure FFmpeg with @code{--enable-amf}.
+
+
@chapter Supported File Formats, Codecs or Features

 You can use the @code{-formats} and @code{-codecs} options to have an exhaustive list.
@@ -468,8 +432,6 @@ library:
@item IEC61937 encapsulation @tab X @tab X
@item IFF                       @tab   @tab X
    @tab Interchange File Format
-@item IFV                       @tab   @tab X
-    @tab A format used by some old CCTV DVRs.
@item iLBC                      @tab X @tab X
@item Interplay MVE             @tab   @tab X
    @tab Format used in various Interplay computer games.
@@ -688,7 +650,7 @@ library:
@item Psygnosis YOP             @tab   @tab X
@end multitable

-@code{X} means that the feature in that column (encoding / decoding) is supported.
+@code{X} means that encoding (resp. decoding) is supported.

@section Image Formats

@@ -758,7 +720,7 @@ following image formats are supported:
    @tab X Window Dump image format
@end multitable

-@code{X} means that the feature in that column (encoding / decoding) is supported.
+@code{X} means that encoding (resp. decoding) is supported.

@code{E} means that support is provided through an external library.

@@ -796,8 +758,8 @@ following image formats are supported:
@item Autodesk Animator Flic video  @tab     @tab  X
@item Autodesk RLE           @tab     @tab  X
    @tab fourcc: AASC
-@item AV1                    @tab  E  @tab  E
-    @tab Supported through external libraries libaom and libdav1d
+@item AV1                    @tab     @tab  E
+    @tab Supported through external library libaom
@item Avid 1:1 10-bit RGB Packer  @tab  X  @tab  X
    @tab fourcc: AVrp
@item AVS (Audio Video Standard) video  @tab     @tab  X
@@ -946,8 +908,6 @@ following image formats are supported:
    @tab Video encoding used in NuppelVideo files.
@item On2 VP3                @tab     @tab  X
    @tab still experimental
-@item On2 VP4                @tab     @tab  X
-    @tab fourcc: VP40
@item On2 VP5                @tab     @tab  X
    @tab fourcc: VP50
@item On2 VP6                @tab     @tab  X
@@ -1042,7 +1002,7 @@ following image formats are supported:
    @tab Encoder works only in PAL8.
@end multitable

-@code{X} means that the feature in that column (encoding / decoding) is supported.
+@code{X} means that encoding (resp. decoding) is supported.

@code{E} means that support is provided through an external library.

@@ -1148,10 +1108,10 @@ following image formats are supported:
@item DPCM Sol               @tab     @tab  X
@item DPCM Xan               @tab     @tab  X
    @tab Used in Origin's Wing Commander IV AVI files.
-@item DSD (Direct Stream Digital), least significant bit first  @tab  @tab  X
-@item DSD (Direct Stream Digital), most significant bit first   @tab  @tab  X
-@item DSD (Direct Stream Digital), least significant bit first, planar  @tab  @tab  X
-@item DSD (Direct Stream Digital), most significant bit first, planar   @tab  @tab  X
+@item DSD (Direct Stream Digitial), least significant bit first  @tab  @tab  X
+@item DSD (Direct Stream Digitial), most significant bit first   @tab  @tab  X
+@item DSD (Direct Stream Digitial), least significant bit first, planar  @tab  @tab  X
+@item DSD (Direct Stream Digitial), most significant bit first, planar   @tab  @tab  X
@item DSP Group TrueSpeech   @tab     @tab  X
@item DST (Direct Stream Transfer) @tab  @tab  X
@item DV audio               @tab     @tab  X
@@ -1261,7 +1221,7 @@ following image formats are supported:
@item Xbox Media Audio 2     @tab     @tab  X
@end multitable

-@code{X} means that the feature in that column (encoding / decoding) is supported.
+@code{X} means that encoding (resp. decoding) is supported.

@code{E} means that support is provided through an external library.

--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -178,9 +178,6 @@ Capture the mouse pointer. Default is 0.
@item -capture_mouse_clicks
 Capture the screen mouse clicks. Default is 0.

-@item -capture_raw_data
-Capture the raw device data. Default is 0.
-Using this option may result in receiving the underlying data delivered to the AVFoundation framework. E.g. for muxed devices that sends raw DV data to the framework (like tape-based camcorders), setting this option to false results in extracted video frames captured in the designated pixel format only. Setting this option to true results in receiving the raw DV stream untouched.
@end table

@subsection Examples
@@ -211,13 +208,6 @@ Record video from the system default video device using the pixel format bgr0 an
 $ ffmpeg -f avfoundation -pixel_format bgr0 -i "default:none" out.avi
@end example

-@item
-Record raw DV data from a suitable input device and write the output into out.dv:
-@example
-$ ffmpeg -f avfoundation -capture_raw_data true -i "zr100:none" out.dv
-@end example
-
-
@end itemize

@section bktr
@@ -384,7 +374,7 @@ Defaults to @option{false}.
@item timestamp_align
 Capture start time alignment in seconds. If set to nonzero, input frames are
 dropped till the system timestamp aligns with configured value.
-Alignment difference of up to one frame duration is tolerated.
+Alignment difference of upto one frame duration is tolerated.
 This is useful for maintaining input synchronization across N different
 hardware devices deployed for 'N-way' redundancy. The system time of different
 hardware devices should be synchronized with protocols such as NTP or PTP,
@@ -797,7 +787,7 @@ ffplay -f iec61883 -i auto
 Grab and record the input of a FireWire DV/HDV device,
 using a packet buffer of 100000 packets if the source is HDV.
@example
-ffmpeg -f iec61883 -i auto -dvbuffer 100000 out.mpg
+ffmpeg -f iec61883 -i auto -hdvbuffer 100000 out.mpg
@end example

@end itemize
@@ -920,14 +910,6 @@ Capture from CRTC ID 42 at 60fps, map the result to VAAPI, convert to NV12 and e
 ffmpeg -crtc_id 42 -framerate 60 -f kmsgrab -i - -vf 'hwmap=derive_device=vaapi,scale_vaapi=w=1920:h=1080:format=nv12' -c:v h264_vaapi output.mp4
@end example

-@item
-To capture only part of a plane the output can be cropped - this can be used to capture
-a single window, as long as it has a known absolute position and size.  For example, to
-capture and encode the middle quarter of a 1920x1080 plane:
-@example
-ffmpeg -f kmsgrab -i - -vf 'hwmap=derive_device=vaapi,crop=960:540:480:270,scale_vaapi=960:540:nv12' -c:v h264_vaapi output.mp4
-@end example
-
@end itemize

@section lavfi
@@ -1068,21 +1050,71 @@ IIDC1394 input device, based on libdc1394 and libraw1394.

 Requires the configure option @code{--enable-libdc1394}.

+@section libndi_newtek
+
+The libndi_newtek input device provides capture capabilities for using NDI (Network
+Device Interface, standard created by NewTek).
+
+Input filename is a NDI source name that could be found by sending -find_sources 1
+to command line - it has no specific syntax but human-readable formatted.
+
+To enable this input device, you need the NDI SDK and you
+need to configure with the appropriate @code{--extra-cflags}
+and @code{--extra-ldflags}.
+
@subsection Options
+
@table @option

-@item framerate
-Set the frame rate. Default is @code{ntsc}, corresponding to a frame
-rate of @code{30000/1001}.
+@item find_sources
+If set to @option{true}, print a list of found/available NDI sources and exit.
+Defaults to @option{false}.

-@item pixel_format
-Select the pixel format. Default is @code{uyvy422}.
+@item wait_sources
+Override time to wait until the number of online sources have changed.
+Defaults to @option{0.5}.
+
+@item allow_video_fields
+When this flag is @option{false}, all video that you receive will be progressive.
+Defaults to @option{true}.
+
+@item extra_ips
+If is set to list of comma separated ip addresses, scan for sources not only
+using mDNS but also use unicast ip addresses specified by this list.

-@item video_size
-Set the video size given as a string such as @code{640x480} or @code{hd720}.
-Default is @code{qvga}.
@end table

+@subsection Examples
+
+@itemize
+
+@item
+List input devices:
+@example
+ffmpeg -f libndi_newtek -find_sources 1 -i dummy
+@end example
+
+@item
+List local and remote input devices:
+@example
+ffmpeg -f libndi_newtek -extra_ips "192.168.10.10" -find_sources 1 -i dummy
+@end example
+
+@item
+Restream to NDI:
+@example
+ffmpeg -f libndi_newtek -i "DEV-5.INTERNAL.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
+@end example
+
+@item
+Restream remote NDI to local NDI:
+@example
+ffmpeg -f libndi_newtek -extra_ips "192.168.10.10" -i "DEV-5.REMOTE.M1STEREO.TV (NDI_SOURCE_NAME_1)" -f libndi_newtek -y NDI_SOURCE_NAME_2
+@end example
+
+
+@end itemize
+
@section openal

 The OpenAL input device provides audio capture on all systems with a
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -100,7 +100,6 @@ Stuff that didn't reach the codebase:
  - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
 - Support recovery from an already present HLS playlist (see 16cb06bb30)
 - Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d46cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html)
- avcodec/libaomenc: export the Sequence Header OBU as extradata (See a024c3ce9a)

 Collateral damage that needs work locally:
 ------------------------------------------
--- a/doc/mailing-list-faq.texi
+++ b/doc/mailing-list-faq.texi
@@ -64,6 +64,10 @@ Email @email{ffmpeg-devel@@ffmpeg.org} to send a message to the
 ffmpeg-devel mailing list.
@end itemize

+Note that the ffmpeg-devel mailing list does not require you to subscribe
+to send a message or patch, but ffmpeg-user and libav-user do require
+subscription.
+
@chapter Subscribing / Unsubscribing

@anchor{How do I subscribe?}
@@ -90,9 +94,6 @@ The process is the same for the other mailing lists.
 Please avoid asking a mailing list admin to unsubscribe you unless you
 are absolutely unable to do so by yourself. See @ref{Who do I contact if I have a problem with the mailing list?}

-Note that it is possible to temporarily halt message delivery (vacation mode).
-See @ref{How do I disable mail delivery without unsubscribing?}
-
@chapter Moderation Queue
@anchor{Why is my message awaiting moderator approval?}
@section Why is my message awaiting moderator approval?
@@ -115,8 +116,7 @@ or is abusive towards others).

@section How long does it take for my message in the moderation queue to be approved?

-The queue is not checked on a regular basis. You can ask on the
-@t{#ffmpeg-devel} IRC channel on Freenode for someone to approve your message.
+The queue is usually checked daily to several times a week.

@anchor{How do I delete my message in the moderation queue?}
@section How do I delete my message in the moderation queue?
@@ -157,12 +157,11 @@ Perform a site search using your favorite search engine. Example:

 You can ask for help in the official @t{#ffmpeg} IRC channel on Freenode.

-Some users prefer the third-party @url{http://www.ffmpeg-archive.org/, Nabble}
-interface which presents the mailing lists in a typical forum layout.
+Some users prefer the third-party Nabble interface which presents the
+mailing lists in a typical forum layout.

-There are also numerous third-party help sites such as
-@url{https://superuser.com/tags/ffmpeg, Super User} and
-@url{https://www.reddit.com/r/ffmpeg/, r/ffmpeg on reddit}.
+There are also numerous third-party help sites such as Super User and
+r/ffmpeg on reddit.

@anchor{What is top-posting?}
@section What is top-posting?
@@ -182,7 +181,7 @@ instead of attaching them.
 Anywhere that is not too annoying for us to use.

 Google Drive and Dropbox are acceptable if you need a file host, and
-@url{https://0x0.st/, 0x0.st} is good for files under 256 MiB.
+0x0.st is good for files under 256 MiB.

 Small, short samples are preferred if possible.

@@ -229,54 +228,6 @@ or headers.

 You can then filter the mailing list messages to their own folder.

-@anchor{How do I disable mail delivery without unsubscribing?}
-@section How do I disable mail delivery without unsubscribing?
-
-Sometimes you may want to temporarily stop receiving all mailing list
-messages. This "vacation mode" is simple to do:
-
-@enumerate
-@item
-Go to the @url{https://lists.ffmpeg.org/mailman/listinfo/ffmpeg-user/, ffmpeg-user mailing list info page}
-
-@item
-Enter your email address in the box at very bottom of the page and click the
-@emph{Unsubscribe or edit options} box.
-
-@item
-Enter your password and click the @emph{Log in} button.
-
-@item
-Look for the @emph{Mail delivery} option. Here you can disable/enable mail
-delivery. If you check @emph{Set globally} it will apply your choice to all
-other FFmpeg mailing lists you are subscribed to.
-@end enumerate
-
-Alternatively, from your subscribed address, send a message to @email{ffmpeg-user-request@@ffmpeg.org}
-with the subject @emph{set delivery off}. To re-enable mail delivery send a
-message to @email{ffmpeg-user-request@@ffmpeg.org} with the subject
-@emph{set delivery on}.
-
-@anchor{Why is the mailing list munging my address?}
-@section Why is the mailing list munging my address?
-
-This is due to subscribers that use an email service with a DMARC reject policy
-which adds difficulties to mailing list operators.
-
-The mailing list must re-write (munge) the @emph{From:} header for such users;
-otherwise their email service will reject and bounce the message resulting in
-automatic unsubscribing from the mailing list.
-
-When sending a message these users will see @emph{via <mailing list name>}
-added to their name and the @emph{From:} address munged to the address of
-the particular mailing list.
-
-If you want to avoid this then please use a different email service.
-
-Note that ffmpeg-devel does not apply any munging as it causes issues with
-patch authorship. As a result users with an email service with a DMARC reject
-policy may be automatically unsubscribed due to rejected and bounced messages.
-
@chapter Rules and Etiquette

@section What are the rules and the proper etiquette?
@@ -375,15 +326,6 @@ form a multi-part message is recommended by email standards.
 Check your spam folder.
@end itemize

-@anchor{Why do I keep getting unsubscribed from ffmpeg-devel?}
-@section Why do I keep getting unsubscribed from ffmpeg-devel?
-
-Users with an email service that has a DMARC reject or quarantine policy may be
-automatically unsubscribed from the ffmpeg-devel mailing list due to the mailing
-list messages being continuously rejected and bounced back.
-
-Consider using a different email service.
-
@anchor{Who do I contact if I have a problem with the mailing list?}
@section Who do I contact if I have a problem with the mailing list?

--- a/doc/metadata.texi
+++ b/doc/metadata.texi
@@ -33,7 +33,7 @@ At the beginning of a chapter section there may be an optional timebase to be
 used for start/end values. It must be in form
@samp{TIMEBASE=@var{num}/@var{den}}, where @var{num} and @var{den} are
 integers. If the timebase is missing then start/end times are assumed to
-be in nanoseconds.
+be in milliseconds.

 Next a chapter section must contain chapter start and end times in form
@samp{START=@var{num}}, @samp{END=@var{num}}, where @var{num} is a positive
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -94,23 +94,21 @@ compatibility with software that only supports a single audio stream in AVI
@anchor{chromaprint}
@section chromaprint

-Chromaprint fingerprinter.
+Chromaprint fingerprinter

-This muxer feeds audio data to the Chromaprint library,
-which generates a fingerprint for the provided audio data. See @url{https://acoustid.org/chromaprint}
-
-It takes a single signed native-endian 16-bit raw audio stream of at most 2 channels.
+This muxer feeds audio data to the Chromaprint library, which generates
+a fingerprint for the provided audio data. It takes a single signed
+native-endian 16-bit raw audio stream.

@subsection Options

@table @option
@item silence_threshold
-Threshold for detecting silence, ranges from -1 to 32767. -1 disables silence detection and
-is required for use with the AcoustID service. Default is -1.
+Threshold for detecting silence, ranges from 0 to 32767. -1 for default
+(required for use with the AcoustID service).

@item algorithm
-Version of algorithm to fingerprint with. Range is 0 to 4. Version 2 requires that silence
-detection be enabled. Default is 1.
+Algorithm index to fingerprint with.

@item fp_format
 Format to output the fingerprint as. Accepts the following options:
@@ -122,7 +120,7 @@ Binary raw fingerprint
 Binary compressed fingerprint

@item base64
-Base64 compressed fingerprint @emph{(default)}
+Base64 compressed fingerprint

@end table

@@ -216,68 +214,66 @@ It creates a MPD manifest file and segment files for each stream.
 The segment filename might contain pre-defined identifiers used with SegmentTemplate
 as defined in section 5.3.9.4.4 of the standard. Available identifiers are "$RepresentationID$",
 "$Number$", "$Bandwidth$" and "$Time$".
-In addition to the standard identifiers, an ffmpeg-specific "$ext$" identifier is also supported.
-When specified ffmpeg will replace $ext$ in the file name with muxing format's extensions such as mp4, webm etc.,

@example
-ffmpeg -re -i <input> -map 0 -map 0 -c:a libfdk_aac -c:v libx264 \
-b:v:0 800k -b:v:1 300k -s:v:1 320x170 -profile:v:1 baseline \
-profile:v:0 main -bf 1 -keyint_min 120 -g 120 -sc_threshold 0 \
-b_strategy 0 -ar:a:1 22050 -use_timeline 1 -use_template 1 \
-window_size 5 -adaptation_sets "id=0,streams=v id=1,streams=a" \
+ffmpeg -re -i <input> -map 0 -map 0 -c:a libfdk_aac -c:v libx264
+-b:v:0 800k -b:v:1 300k -s:v:1 320x170 -profile:v:1 baseline
+-profile:v:0 main -bf 1 -keyint_min 120 -g 120 -sc_threshold 0
+-b_strategy 0 -ar:a:1 22050 -use_timeline 1 -use_template 1
+-window_size 5 -adaptation_sets "id=0,streams=v id=1,streams=a"
 -f dash /path/to/out.mpd
@end example

@table @option
-@item min_seg_duration @var{microseconds}
+@item -min_seg_duration @var{microseconds}
 This is a deprecated option to set the segment length in microseconds, use @var{seg_duration} instead.
-@item seg_duration @var{duration}
+@item -seg_duration @var{duration}
 Set the segment length in seconds (fractional value can be set). The value is
 treated as average segment duration when @var{use_template} is enabled and
@var{use_timeline} is disabled and as minimum segment duration for all the other
 use cases.
-@item window_size @var{size}
+@item -window_size @var{size}
 Set the maximum number of segments kept in the manifest.
-@item extra_window_size @var{size}
+@item -extra_window_size @var{size}
 Set the maximum number of segments kept outside of the manifest before removing from disk.
-@item remove_at_exit @var{remove}
+@item -remove_at_exit @var{remove}
 Enable (1) or disable (0) removal of all segments when finished.
-@item use_template @var{template}
+@item -use_template @var{template}
 Enable (1) or disable (0) use of SegmentTemplate instead of SegmentList.
-@item use_timeline @var{timeline}
+@item -use_timeline @var{timeline}
 Enable (1) or disable (0) use of SegmentTimeline in SegmentTemplate.
-@item single_file @var{single_file}
+@item -single_file @var{single_file}
 Enable (1) or disable (0) storing all segments in one file, accessed using byte ranges.
-@item single_file_name @var{file_name}
-DASH-templated name to be used for baseURL. Implies @var{single_file} set to "1". In the template, "$ext$" is replaced with the file name extension specific for the segment format.
-@item init_seg_name @var{init_name}
-DASH-templated name to used for the initialization segment. Default is "init-stream$RepresentationID$.$ext$". "$ext$" is replaced with the file name extension specific for the segment format.
-@item media_seg_name @var{segment_name}
-DASH-templated name to used for the media segments. Default is "chunk-stream$RepresentationID$-$Number%05d$.$ext$". "$ext$" is replaced with the file name extension specific for the segment format.
-@item utc_timing_url @var{utc_url}
+@item -single_file_name @var{file_name}
+DASH-templated name to be used for baseURL. Implies @var{single_file} set to "1".
+@item -init_seg_name @var{init_name}
+DASH-templated name to used for the initialization segment. Default is "init-stream$RepresentationID$.m4s"
+@item -media_seg_name @var{segment_name}
+DASH-templated name to used for the media segments. Default is "chunk-stream$RepresentationID$-$Number%05d$.m4s"
+@item -utc_timing_url @var{utc_url}
 URL of the page that will return the UTC timestamp in ISO format. Example: "https://time.akamai.com/?iso"
@item method @var{method}
 Use the given HTTP method to create output files. Generally set to PUT or POST.
-@item http_user_agent @var{user_agent}
+@item -http_user_agent @var{user_agent}
 Override User-Agent field in HTTP header. Applicable only for HTTP output.
-@item http_persistent @var{http_persistent}
+@item -http_persistent @var{http_persistent}
 Use persistent HTTP connections. Applicable only for HTTP output.
-@item hls_playlist @var{hls_playlist}
+@item -hls_playlist @var{hls_playlist}
 Generate HLS playlist files as well. The master playlist is generated with the filename master.m3u8.
 One media playlist file is generated for each stream with filenames media_0.m3u8, media_1.m3u8, etc.
-@item streaming @var{streaming}
+@item -streaming @var{streaming}
 Enable (1) or disable (0) chunk streaming mode of output. In chunk streaming
 mode, each frame will be a moof fragment which forms a chunk.
-@item adaptation_sets @var{adaptation_sets}
+@item -adaptation_sets @var{adaptation_sets}
 Assign streams to AdaptationSets. Syntax is "id=x,streams=a,b,c id=y,streams=d,e" with x and y being the IDs
 of the adaptation sets and a,b,c,d and e are the indices of the mapped streams.

 To map all video (or audio) streams to an AdaptationSet, "v" (or "a") can be used as stream identifier instead of IDs.

 When no assignment is defined, this defaults to an AdaptationSet for each stream.
-@item timeout @var{timeout}
+@item -timeout @var{timeout}
 Set timeout for socket I/O operations. Applicable only for HTTP output.
-@item index_correction @var{index_correction}
+@item -index_correction @var{index_correction}
 Enable (1) or Disable (0) segment index correction logic. Applicable only when
@var{use_template} is enabled and @var{use_timeline} is disabled.

@@ -288,40 +284,18 @@ corrects that index value.
 Typically this logic is needed in live streaming use cases. The network bandwidth
 fluctuations are common during long run streaming. Each fluctuation can cause
 the segment indexes fall behind the expected real time position.
-@item format_options @var{options_list}
+@item -format_options @var{options_list}
 Set container format (mp4/webm) options using a @code{:} separated list of
 key=value parameters. Values containing @code{:} special characters must be
 escaped.

-@item global_sidx @var{global_sidx}
-Write global SIDX atom. Applicable only for single file, mp4 output, non-streaming mode.
-
@item dash_segment_type @var{dash_segment_type}
 Possible values:
-@table @option
-@item auto
-If this flag is set, the dash segment files format will be selected based on the stream codec. This is the default mode.
-
@item mp4
-If this flag is set, the dash segment files will be in in ISOBMFF format.
+If this flag is set, the dash segment files will be in in ISOBMFF format. This is the default format.

@item webm
 If this flag is set, the dash segment files will be in in WebM format.
-@end table
-
-@item ignore_io_errors @var{ignore_io_errors}
-Ignore IO errors during open and write. Useful for long-duration runs with network output.
-
-@item lhls @var{lhls}
-Enable Low-latency HLS(LHLS). Adds #EXT-X-PREFETCH tag with current segment's URI.
-Apple doesn't have an official spec for LHLS. Meanwhile hls.js player folks are
-trying to standardize a open LHLS spec. The draft spec is available in https://github.com/video-dev/hlsjs-rfcs/blob/lhls-spec/proposals/0001-lhls.md
-This option will also try to comply with the above open spec, till Apple's spec officially supports it.
-Applicable only when @var{streaming} and @var{hls_playlist} options are enabled.
-This is an experimental feature.
-
-@item master_m3u8_publish_rate @var{master_m3u8_publish_rate}
-Publish master playlist repeatedly every after specified number of segment intervals.

@end table

@@ -658,8 +632,7 @@ This example will produce the playlists segment file sets:
@file{file_1_000.ts}, @file{file_1_001.ts}, @file{file_1_002.ts}, etc.

 The string "%v" may be present in the filename or in the last directory name
-containing the file, but only in one of them. (Additionally, %v may appear multiple times in the last
-sub-directory or filename.) If the string %v is present in the directory name, then
+containing the file. If the string is present in the directory name, then
 sub-directories are created after expanding the directory name pattern. This
 enables creation of segments corresponding to different variant streams in
 subdirectories.
@@ -855,10 +828,6 @@ including the file containing the AES encryption key.
 Add the @code{#EXT-X-INDEPENDENT-SEGMENTS} to playlists that has video segments
 and when all the segments of that playlist are guaranteed to start with a Key frame.

-@item iframes_only
-Add the @code{#EXT-X-I-FRAMES-ONLY} to playlists that has video segments
-and can play only I-frames in the @code{#EXT-X-BYTERANGE} mode.
-
@item split_by_time
 Allow segments to start on frames other than keyframes. This improves
 behavior on some players when the time between keyframes is inconsistent,
@@ -895,11 +864,7 @@ This will produce segments like this:
@item temp_file
 Write segment data to filename.tmp and rename to filename only once the segment is complete. A webserver
 serving up segments can be configured to reject requests to *.tmp to prevent access to in-progress segments
-before they have been added to the m3u8 playlist. This flag also affects how m3u8 playlist files are created.
-If this flag is set, all playlist files will written into temporary file and renamed after they are complete, similarly as segments are handled.
-But playlists with @code{file} protocol and with type (@code{hls_playlist_type}) other than @code{vod}
-are always written into temporary file regardles of this flag. Master playlist files (@code{master_pl_name}), if any, with @code{file} protocol,
-are always written into temporary file regardles of this flag if @code{master_pl_publish_rate} value is other than zero.
+before they have been added to the m3u8 playlist.

@end table

@@ -950,21 +915,7 @@ This example creates two hls variant streams. The first variant stream will
 contain video stream of bitrate 1000k and audio stream of bitrate 64k and the
 second variant stream will contain video stream of bitrate 256k and audio
 stream of bitrate 32k. Here, two media playlist with file names out_0.m3u8 and
-out_1.m3u8 will be created. If you want something meaningful text instead of indexes
-in result names, you may specify names for each or some of the variants
-as in the following example.
-
-
-@example
-ffmpeg -re -i in.ts -b:v:0 1000k -b:v:1 256k -b:a:0 64k -b:a:1 32k \
-  -map 0:v -map 0:a -map 0:v -map 0:a -f hls -var_stream_map "v:0,a:0,name:my_hd v:1,a:1,name:my_sd" \
-  http://example.com/live/out_%v.m3u8
-@end example
-
-This example creates two hls variant streams as in the previous one.
-But here, the two media playlist with file names out_my_hd.m3u8 and
-out_my_sd.m3u8 will be created.
-
+out_1.m3u8 will be created.
@example
 ffmpeg -re -i in.ts -b:v:0 1000k -b:v:1 256k -b:a:0 64k \
  -map 0:v -map 0:a -map 0:v -f hls -var_stream_map "v:0 a:0 v:1" \
@@ -998,37 +949,6 @@ and they are mapped to the two video only variant streams with audio group names

 By default, a single hls variant containing all the encoded streams is created.

-@example
-ffmpeg -re -i in.ts -b:a:0 32k -b:a:1 64k -b:v:0 1000k \
-  -map 0:a -map 0:a -map 0:v -f hls \
-  -var_stream_map "a:0,agroup:aud_low,default:yes a:1,agroup:aud_low v:0,agroup:aud_low" \
-  -master_pl_name master.m3u8 \
-  http://example.com/live/out_%v.m3u8
-@end example
-This example creates two audio only and one video only variant streams. In
-addition to the #EXT-X-STREAM-INF tag for each variant stream in the master
-playlist, #EXT-X-MEDIA tag is also added for the two audio only variant streams
-and they are mapped to the one video only variant streams with audio group name
-'aud_low', and the audio group have default stat is NO or YES.
-
-By default, a single hls variant containing all the encoded streams is created.
-
-@example
-ffmpeg -re -i in.ts -b:a:0 32k -b:a:1 64k -b:v:0 1000k \
-  -map 0:a -map 0:a -map 0:v -f hls \
-  -var_stream_map "a:0,agroup:aud_low,default:yes,language:ENG a:1,agroup:aud_low,language:CHN v:0,agroup:aud_low" \
-  -master_pl_name master.m3u8 \
-  http://example.com/live/out_%v.m3u8
-@end example
-This example creates two audio only and one video only variant streams. In
-addition to the #EXT-X-STREAM-INF tag for each variant stream in the master
-playlist, #EXT-X-MEDIA tag is also added for the two audio only variant streams
-and they are mapped to the one video only variant streams with audio group name
-'aud_low', and the audio group have default stat is NO or YES, and one audio
-have and language is named ENG, the other audio language is named CHN.
-
-By default, a single hls variant containing all the encoded streams is created.
-
@item cc_stream_map
 Map string which specifies different closed captions groups and their
 attributes. The closed captions stream groups are separated by space.
@@ -1049,7 +969,7 @@ ffmpeg -re -i in.ts -b:v 1000k -b:a 64k -a53cc 1 -f hls \
  http://example.com/live/out.m3u8
@end example
 This example adds @code{#EXT-X-MEDIA} tag with @code{TYPE=CLOSED-CAPTIONS} in
-the master playlist with group name 'cc', language 'en' (english) and
+the master playlist with group name 'cc', langauge 'en' (english) and
 INSTREAM-ID 'CC1'. Also, it adds @code{CLOSED-CAPTIONS} attribute with group
 name 'cc' for the output variant stream.
@example
@@ -1092,12 +1012,6 @@ Use persistent HTTP connections. Applicable only for HTTP output.
@item timeout
 Set timeout for socket I/O operations. Applicable only for HTTP output.

-@item -ignore_io_errors
-Ignore IO errors during open, write and delete. Useful for long-duration runs with network output.
-
-@item headers
-Set custom HTTP headers, can override built in default headers. Applicable only for HTTP output.
-
@end table

@anchor{ico}
@@ -1405,10 +1319,6 @@ more efficient), but with this option set, the muxer writes one moof/mdat
 pair for each track, making it easier to separate tracks.

 This option is implicitly set when writing ismv (Smooth Streaming) files.
-@item -movflags skip_sidx
-Skip writing of sidx atom. When bitrate overhead due to sidx atom is high,
-this option could be used for cases where sidx atom is not mandatory.
-When global_sidx flag is enabled, this option will be ignored.
@item -movflags faststart
 Run a second pass moving the index (moov atom) to the beginning of the file.
 This operation can take a while, and will not work in various situations such
@@ -1557,7 +1467,7 @@ Set the program @samp{service_type}. Default is @code{digital_tv}.
 Accepts the following options:
@table @samp
@item hex_value
-Any hexadecimal value between @code{0x01} and @code{0xff} as defined in
+Any hexdecimal value between @code{0x01} to @code{0xff} as defined in
 ETSI 300 468.
@item digital_tv
 Digital TV service.
@@ -1660,7 +1570,7 @@ ffmpeg -i file.mpg -c copy \
     out.ts
@end example

-@section mxf, mxf_d10, mxf_opatom
+@section mxf, mxf_d10

 MXF muxer.

@@ -1672,7 +1582,7 @@ The muxer options are:
@item store_user_comments @var{bool}
 Set if user comments should be stored if available or never.
 IRT D-10 does not allow user comments. The default is thus to write them for
-mxf and mxf_opatom but not for mxf_d10
+mxf but not for mxf_d10
@end table

@section null
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -155,10 +155,6 @@ Defaults to @option{0.5}.
 Sets the decklink device duplex mode. Must be @samp{unset}, @samp{half} or @samp{full}.
 Defaults to @samp{unset}.

-@item timing_offset
-Sets the genlock timing pixel offset on the used output.
-Defaults to @samp{unset}.
-
@end table

@subsection Examples
@@ -220,6 +216,51 @@ 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 libndi_newtek
+
+The libndi_newtek output device provides playback capabilities for using NDI (Network
+Device Interface, standard created by NewTek).
+
+Output filename is a NDI name.
+
+To enable this output device, you need the NDI SDK and you
+need to configure with the appropriate @code{--extra-cflags}
+and @code{--extra-ldflags}.
+
+NDI uses uyvy422 pixel format natively, but also supports bgra, bgr0, rgba and
+rgb0.
+
+@subsection Options
+
+@table @option
+
+@item reference_level
+The audio reference level in dB. This specifies how many dB above the
+reference level (+4dBU) is the full range of 16 bit audio.
+Defaults to @option{0}.
+
+@item clock_video
+These specify whether video "clock" themselves.
+Defaults to @option{false}.
+
+@item clock_audio
+These specify whether audio "clock" themselves.
+Defaults to @option{false}.
+
+@end table
+
+@subsection Examples
+
+@itemize
+
+@item
+Play video clip:
+@example
+ffmpeg -i "udp://@@239.1.1.1:10480?fifo_size=1000000&overrun_nonfatal=1" -vf "scale=720:576,fps=fps=25,setdar=dar=16/9,format=pix_fmts=uyvy422" -f libndi_newtek NEW_NDI1
+@end example
+
+@end itemize
+
@section opengl
 OpenGL output device.

--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -193,20 +193,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 for files on slow medium.
-
-@item follow
-If set to 1, the protocol will retry reading at the end of the file, allowing
-reading files that still are being written. In order for this to terminate,
-you either need to use the rw_timeout option, or use the interrupt callback
-(for API users).
-
-@item seekable
-Controls if seekability is advertised on the file. 0 means non-seekable, -1
-means auto (seekable for normal files, non-seekable for named pipes).
-
-Many demuxers handle seekable and non-seekable resources differently,
-overriding this might speed up opening certain files at the cost of losing some
-features (e.g. accurate seeking).
@end table

@section ftp
@@ -243,6 +229,17 @@ it, unless special care is taken (tests, customized server configuration
 etc.). Different FTP servers behave in different way during seek
 operation. ff* tools may produce incomplete content due to server limitations.

+This protocol accepts the following options:
+
+@table @option
+@item follow
+If set to 1, the protocol will retry reading at the end of the file, allowing
+reading files that still are being written. In order for this to terminate,
+you either need to use the rw_timeout option, or use the interrupt callback
+(for API users).
+
+@end table
+
@section gopher

 Gopher protocol.
@@ -393,11 +390,6 @@ ffmpeg -i somefile.ogg -chunked_post 0 -c copy -f ogg http://@var{server}:@var{p
 wget --post-file=somefile.ogg http://@var{server}:@var{port}
@end example

-@item send_expect_100
-Send an Expect: 100-continue header for POST. If set to 1 it will send, if set
-to 0 it won't, if set to -1 it will try to send if it is applicable. Default
-value is -1.
-
@end table

@subsection HTTP Cookies
--- a/doc/scaler.texi
+++ b/doc/scaler.texi
@@ -5,8 +5,7 @@
 The video scaler supports the following named options.

 Options may be set by specifying -@var{option} @var{value} in the
-FFmpeg tools, with a few API-only exceptions noted below.
-For programmatic use, they can be set explicitly in the
+FFmpeg tools. For programmatic use, they can be set explicitly in the
@code{SwsContext} options or through the @file{libavutil/opt.h} API.

@table @option
@@ -48,8 +47,7 @@ Select Gaussian rescaling algorithm.
 Select sinc rescaling algorithm.

@item lanczos
-Select Lanczos rescaling algorithm. The default width (alpha) is 3 and can be
-changed by setting @code{param0}.
+Select Lanczos rescaling algorithm.

@item spline
 Select natural bicubic spline rescaling algorithm.
@@ -70,31 +68,29 @@ Select full chroma input.
 Enable bitexact output.
@end table

-@item srcw @var{(API only)}
+@item srcw
 Set source width.

-@item srch @var{(API only)}
+@item srch
 Set source height.

-@item dstw @var{(API only)}
+@item dstw
 Set destination width.

-@item dsth @var{(API only)}
+@item dsth
 Set destination height.

-@item src_format @var{(API only)}
+@item src_format
 Set source pixel format (must be expressed as an integer).

-@item dst_format @var{(API only)}
+@item dst_format
 Set destination pixel format (must be expressed as an integer).

-@item src_range @var{(boolean)}
-If value is set to @code{1}, indicates source is full range. Default value is
-@code{0}, which indicates source is limited range.
+@item src_range
+Select source range.

-@item dst_range @var{(boolean)}
-If value is set to @code{1}, enable full range for destination. Default value
-is @code{0}, which enables limited range.
+@item dst_range
+Select destination range.

@anchor{sws_params}
@item param0, param1
--- a/doc/snow.txt
+++ b/doc/snow.txt
@@ -172,7 +172,7 @@ spatial_decomposition_count
    FIXME

 colorspace_type
-    0   unspecified YCbCr
+    0   unspecified YcbCr
    1   Gray
    2   Gray + Alpha
    3   GBR
@@ -235,7 +235,7 @@ spatial_decomposition_type
    stored as delta from last, last is reset to 0 if always_reset || keyframe

 qlog
-    quality (logarithmic quantizer scale)
+    quality (logarthmic quantizer scale)
    stored as delta from last, last is reset to 0 if always_reset || keyframe

 mv_scale
@@ -251,11 +251,11 @@ block_max_depth
    stored as delta from last, last is reset to 0 if always_reset || keyframe

 quant_table
-    quantization table
+    quantiztation table


 Highlevel bitstream structure:
-==============================
+=============================
 --------------------------------------------
 |                   Header                   |
 --------------------------------------------
@@ -303,7 +303,7 @@ Decoding process:
                  |  Intra DC  |               |
                  |            |    LL0 subband prediction
                   ------------                |
-                                \        Dequantization
+                                \        Dequantizaton
 -------------------             \             |
 |  Reference frames |             \           IDWT
 | -------   ------- |    Motion    \           |
@@ -390,8 +390,8 @@ motion vector prediction
   (mvx_diff, mvy_diff)*mv_scale


-Intra DC Prediction:
-====================
+Intra DC Predicton:
+======================
 the luma and chroma values of the left block are used as predictors

 the used luma and chroma is the sum of the predictor and y_diff, cb_diff, cr_diff
@@ -407,7 +407,7 @@ Motion Compensation:

 Halfpel interpolation:
 ----------------------
-Halfpel interpolation is done by convolution with the halfpel filter stored
+halfpel interpolation is done by convolution with the halfpel filter stored
 in the header:

 horizontal halfpel samples are found by
@@ -463,8 +463,8 @@ to the closest available fullpel sample
 Smaller pel interpolation:
 --------------------------
 if diag_mc is set then points which lie on a line between 2 vertically,
-horizontally or diagonally adjacent halfpel points shall be interpolated
-linearly with rounding to nearest and halfway values rounded up.
+horiziontally or diagonally adjacent halfpel points shall be interpolated
+linearls with rounding to nearest and halfway values rounded up.
 points which lie on 2 diagonals at the same time should only use the one
 diagonal not containing the fullpel point

@@ -519,8 +519,8 @@ width,height here are the width and height of the LL0 subband not of the final
 video


-Dequantization:
-===============
+Dequantizaton:
+==============
 FIXME

 Wavelet Transform:
--- a/doc/writing_filters.txt
+++ b/doc/writing_filters.txt
@@ -389,7 +389,7 @@ distributor with something like this:

    td.in  = in;
    td.out = out;
-    ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx)));
+    ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads));

    // ...

--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -161,7 +161,7 @@ $(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))
 $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
 $(TOOLOBJS): | tools

-OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))

 CLEANSUFFIXES     = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~
 LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
--- a/fftools/Makefile
+++ b/fftools/Makefile
@@ -32,7 +32,7 @@ $(foreach P,$(AVPROGS-yes),$(eval $(call DOFFTOOL,$(P))))
 all: $(AVPROGS)

 fftools/ffprobe.o fftools/cmdutils.o: libavutil/ffversion.h | fftools
-OUTDIRS += fftools
+OBJDIRS += fftools

 ifdef AVPROGS
 install: install-progs install-data
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1079,7 +1079,6 @@ static void do_video_out(OutputFile *of,

    if (!ost->filters_script &&
        !ost->filters &&
-        (nb_filtergraphs == 0 || !filtergraphs[0]->graph_desc) &&
        next_picture &&
        ist &&
        lrintf(next_picture->pkt_duration * av_q2d(ist->st->time_base) / av_q2d(enc->time_base)) > 0) {
@@ -1194,27 +1193,33 @@ static void do_video_out(OutputFile *of,
    }
    ost->last_dropped = nb_frames == nb0_frames && next_picture;

-    /* duplicates frame if needed */
-    for (i = 0; i < nb_frames; i++) {
-        AVFrame *in_picture;
+  /* duplicates frame if needed */
+  for (i = 0; i < nb_frames; i++) {
+    AVFrame *in_picture;
+    av_init_packet(&pkt);
+    pkt.data = NULL;
+    pkt.size = 0;
+
+    if (i < nb0_frames && ost->last_frame) {
+        in_picture = ost->last_frame;
+    } else
+        in_picture = next_picture;
+
+    if (!in_picture)
+        return;
+
+    in_picture->pts = ost->sync_opts;
+
+#if 1
+    if (!check_recording_time(ost))
+#else
+    if (ost->frame_number >= ost->max_frames)
+#endif
+        return;
+
+    {
        int forced_keyframe = 0;
        double pts_time;
-        av_init_packet(&pkt);
-        pkt.data = NULL;
-        pkt.size = 0;
-
-        if (i < nb0_frames && ost->last_frame) {
-            in_picture = ost->last_frame;
-        } else
-            in_picture = next_picture;
-
-        if (!in_picture)
-            return;
-
-        in_picture->pts = ost->sync_opts;
-
-        if (!check_recording_time(ost))
-            return;

        if (enc->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
            ost->top_field_first >= 0)
@@ -1287,8 +1292,6 @@ static void do_video_out(OutputFile *of,
        ret = avcodec_send_frame(enc, in_picture);
        if (ret < 0)
            goto error;
-        // Make sure Closed Captions will not be duplicated
-        av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC);

        while (1) {
            ret = avcodec_receive_packet(enc, &pkt);
@@ -1325,17 +1328,18 @@ static void do_video_out(OutputFile *of,
                fprintf(ost->logfile, "%s", enc->stats_out);
            }
        }
-        ost->sync_opts++;
-        /*
-         * For video, number of frames in == number of packets out.
-         * But there may be reordering, so we can't throw away frames on encoder
-         * flush, we need to limit them here, before they go into encoder.
-         */
-        ost->frame_number++;
-
-        if (vstats_filename && frame_size)
-            do_video_stats(ost, frame_size);
    }
+    ost->sync_opts++;
+    /*
+     * For video, number of frames in == number of packets out.
+     * But there may be reordering, so we can't throw away frames on encoder
+     * flush, we need to limit them here, before they go into encoder.
+     */
+    ost->frame_number++;
+
+    if (vstats_filename && frame_size)
+        do_video_stats(ost, frame_size);
+  }

    if (!ost->last_frame)
        ost->last_frame = av_frame_alloc();
@@ -1488,6 +1492,8 @@ static int reap_filters(int flush)
                    av_rescale_q(filtered_frame->pts, filter_tb, enc->time_base) -
                    av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
            }
+            //if (ost->source_index >= 0)
+            //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold

            switch (av_buffersink_get_type(filter)) {
            case AVMEDIA_TYPE_VIDEO:
@@ -1818,7 +1824,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
        } else
            av_log(NULL, AV_LOG_INFO, "%s    %c", buf.str, end);

-        fflush(stderr);
+    fflush(stderr);
    }
    av_bprint_finalize(&buf, NULL);

@@ -1925,46 +1931,46 @@ static void flush_encoders(void)
                av_assert0(0);
            }

-            av_init_packet(&pkt);
-            pkt.data = NULL;
-            pkt.size = 0;
+                av_init_packet(&pkt);
+                pkt.data = NULL;
+                pkt.size = 0;

-            update_benchmark(NULL);
+                update_benchmark(NULL);

-            while ((ret = avcodec_receive_packet(enc, &pkt)) == AVERROR(EAGAIN)) {
-                ret = avcodec_send_frame(enc, NULL);
-                if (ret < 0) {
+                while ((ret = avcodec_receive_packet(enc, &pkt)) == AVERROR(EAGAIN)) {
+                    ret = avcodec_send_frame(enc, NULL);
+                    if (ret < 0) {
+                        av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n",
+                               desc,
+                               av_err2str(ret));
+                        exit_program(1);
+                    }
+                }
+
+                update_benchmark("flush_%s %d.%d", desc, ost->file_index, ost->index);
+                if (ret < 0 && ret != AVERROR_EOF) {
                    av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n",
                           desc,
                           av_err2str(ret));
                    exit_program(1);
                }
-            }
-
-            update_benchmark("flush_%s %d.%d", desc, ost->file_index, ost->index);
-            if (ret < 0 && ret != AVERROR_EOF) {
-                av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n",
-                       desc,
-                       av_err2str(ret));
-                exit_program(1);
-            }
-            if (ost->logfile && enc->stats_out) {
-                fprintf(ost->logfile, "%s", enc->stats_out);
-            }
-            if (ret == AVERROR_EOF) {
-                output_packet(of, &pkt, ost, 1);
-                break;
-            }
-            if (ost->finished & MUXER_FINISHED) {
-                av_packet_unref(&pkt);
-                continue;
-            }
-            av_packet_rescale_ts(&pkt, enc->time_base, ost->mux_timebase);
-            pkt_size = pkt.size;
-            output_packet(of, &pkt, ost, 0);
-            if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) {
-                do_video_stats(ost, pkt_size);
-            }
+                if (ost->logfile && enc->stats_out) {
+                    fprintf(ost->logfile, "%s", enc->stats_out);
+                }
+                if (ret == AVERROR_EOF) {
+                    output_packet(of, &pkt, ost, 1);
+                    break;
+                }
+                if (ost->finished & MUXER_FINISHED) {
+                    av_packet_unref(&pkt);
+                    continue;
+                }
+                av_packet_rescale_ts(&pkt, enc->time_base, ost->mux_timebase);
+                pkt_size = pkt.size;
+                output_packet(of, &pkt, ost, 0);
+                if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) {
+                    do_video_stats(ost, pkt_size);
+                }
        }
    }
 }
@@ -2133,6 +2139,9 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)

    /* determine if the parameters for this input changed */
    need_reinit = ifilter->format != frame->format;
+    if (!!ifilter->hw_frames_ctx != !!frame->hw_frames_ctx ||
+        (ifilter->hw_frames_ctx && ifilter->hw_frames_ctx->data != frame->hw_frames_ctx->data))
+        need_reinit = 1;

    switch (ifilter->ist->st->codecpar->codec_type) {
    case AVMEDIA_TYPE_AUDIO:
@@ -2146,13 +2155,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
        break;
    }

-    if (!ifilter->ist->reinit_filters && fg->graph)
-        need_reinit = 0;
-
-    if (!!ifilter->hw_frames_ctx != !!frame->hw_frames_ctx ||
-        (ifilter->hw_frames_ctx && ifilter->hw_frames_ctx->data != frame->hw_frames_ctx->data))
-        need_reinit = 1;
-
    if (need_reinit) {
        ret = ifilter_parameters_from_frame(ifilter, frame);
        if (ret < 0)
@@ -2313,12 +2315,14 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
    ist->samples_decoded += decoded_frame->nb_samples;
    ist->frames_decoded++;

+#if 1
    /* increment next_dts to use for the case where the input stream does not
       have timestamps or there are multiple frames in the packet */
    ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                     avctx->sample_rate;
    ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                     avctx->sample_rate;
+#endif

    if (decoded_frame->pts != AV_NOPTS_VALUE) {
        decoded_frame_tb   = ist->st->time_base;
@@ -3341,7 +3345,7 @@ static int init_output_stream_encode(OutputStream *ost)
                   "if you want a different framerate.\n",
                   ost->file_index, ost->index);
        }
-
+//      ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
        if (ost->enc->supported_framerates && !ost->force_fps) {
            int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
            ost->frame_rate = ost->enc->supported_framerates[idx];
@@ -3424,8 +3428,8 @@ static int init_output_stream_encode(OutputStream *ost)
                ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N] = NAN;
                ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_T] = NAN;

-                // Don't parse the 'forced_keyframes' in case of 'keep-source-keyframes',
-                // parse it only for static kf timings
+            // Don't parse the 'forced_keyframes' in case of 'keep-source-keyframes',
+            // parse it only for static kf timings
            } else if(strncmp(ost->forced_keyframes, "source", 6)) {
                parse_forced_key_frames(ost->forced_keyframes, ost, ost->enc_ctx);
            }
@@ -3875,9 +3879,7 @@ static OutputStream *choose_output(void)
                       av_rescale_q(ost->st->cur_dts, ost->st->time_base,
                                    AV_TIME_BASE_Q);
        if (ost->st->cur_dts == AV_NOPTS_VALUE)
-            av_log(NULL, AV_LOG_DEBUG,
-                "cur_dts is invalid st:%d (%d) [init:%d i_done:%d finish:%d] (this is harmless if it occurs once at the start per stream)\n",
-                ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished);
+            av_log(NULL, AV_LOG_DEBUG, "cur_dts is invalid (this is harmless if it occurs once at the start per stream)\n");

        if (!ost->initialized && !ost->inputs_done)
            return ost;
@@ -4170,7 +4172,7 @@ static void reset_eagain(void)

 // set duration to max(tmp, duration) in a proper time base and return duration's time_base
 static AVRational duration_max(int64_t tmp, int64_t *duration, AVRational tmp_time_base,
-                               AVRational time_base)
+                                AVRational time_base)
 {
    int ret;

@@ -4474,10 +4476,7 @@ static int process_input(int file_index)
                pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) {
                ifile->ts_offset -= delta;
                av_log(NULL, AV_LOG_DEBUG,
-                       "timestamp discontinuity for stream #%d:%d "
-                       "(id=%d, type=%s): %"PRId64", new offset= %"PRId64"\n",
-                       ist->file_index, ist->st->index, ist->st->id,
-                       av_get_media_type_string(ist->dec_ctx->codec_type),
+                       "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
                       delta, ifile->ts_offset);
                pkt.dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
                if (pkt.pts != AV_NOPTS_VALUE)
@@ -4885,6 +4884,11 @@ int main(int argc, char **argv)
        exit_program(1);
    }

+//     if (nb_input_files == 0) {
+//         av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
+//         exit_program(1);
+//     }
+
    for (i = 0; i < nb_output_files; i++) {
        if (strcmp(output_files[i]->ctx->oformat->name, "rtp"))
            want_sdp = 0;
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -72,7 +72,7 @@ typedef struct HWAccel {
 } HWAccel;

 typedef struct HWDevice {
-    const char *name;
+    char *name;
    enum AVHWDeviceType type;
    AVBufferRef *device_ref;
 } HWDevice;
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -293,17 +293,10 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
            exit_program(1);
        }
        ist = input_streams[input_files[file_idx]->ist_index + st->index];
-        if (ist->user_set_discard == AVDISCARD_ALL) {
-            av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s "
-                   "matches a disabled input stream.\n", p, fg->graph_desc);
-            exit_program(1);
-        }
    } else {
        /* find the first unused stream of corresponding type */
        for (i = 0; i < nb_input_streams; i++) {
            ist = input_streams[i];
-            if (ist->user_set_discard == AVDISCARD_ALL)
-                continue;
            if (ist->dec_ctx->codec_type == type && ist->discard)
                break;
        }
@@ -739,7 +732,6 @@ static int sub2video_prepare(InputStream *ist, InputFilter *ifilter)
    if (!ist->sub2video.frame)
        return AVERROR(ENOMEM);
    ist->sub2video.last_pts = INT64_MIN;
-    ist->sub2video.end_pts  = INT64_MIN;
    return 0;
 }

--- a/fftools/ffmpeg_hw.c
+++ b/fftools/ffmpeg_hw.c
@@ -99,7 +99,7 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
    // -> av_hwdevice_ctx_create_derived()

    AVDictionary *options = NULL;
-    const char *type_name = NULL, *name = NULL, *device = NULL;
+    char *type_name = NULL, *name = NULL, *device = NULL;
    enum AVHWDeviceType type;
    HWDevice *dev, *src;
    AVBufferRef *device_ref = NULL;
@@ -155,12 +155,10 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
        ++p;
        q = strchr(p, ',');
        if (q) {
-            if (q - p > 0) {
-                device = av_strndup(p, q - p);
-                if (!device) {
-                    err = AVERROR(ENOMEM);
-                    goto fail;
-                }
+            device = av_strndup(p, q - p);
+            if (!device) {
+                err = AVERROR(ENOMEM);
+                goto fail;
            }
            err = av_dict_parse_string(&options, q + 1, "=", ",", 0);
            if (err < 0) {
@@ -170,8 +168,7 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
        }

        err = av_hwdevice_ctx_create(&device_ref, type,
-                                     q ? device : p[0] ? p : NULL,
-                                     options, 0);
+                                     device ? device : p, options, 0);
        if (err < 0)
            goto fail;

--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -268,7 +268,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
 {
    OptionsContext *o = optctx;
    StreamMap *m = NULL;
-    int i, negative = 0, file_idx, disabled = 0;
+    int i, negative = 0, file_idx;
    int sync_file_idx = -1, sync_stream_idx = 0;
    char *p, *sync;
    char *map;
@@ -303,11 +303,6 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
                                       "match any streams.\n", arg);
            exit_program(1);
        }
-        if (input_streams[input_files[sync_file_idx]->ist_index + sync_stream_idx]->user_set_discard == AVDISCARD_ALL) {
-            av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s matches a disabled input "
-                                       "stream.\n", arg);
-            exit_program(1);
-        }
    }


@@ -344,10 +339,6 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
                if (check_stream_specifier(input_files[file_idx]->ctx, input_files[file_idx]->ctx->streams[i],
                            *p == ':' ? p + 1 : p) <= 0)
                    continue;
-                if (input_streams[input_files[file_idx]->ist_index + i]->user_set_discard == AVDISCARD_ALL) {
-                    disabled = 1;
-                    continue;
-                }
                GROW_ARRAY(o->stream_maps, o->nb_stream_maps);
                m = &o->stream_maps[o->nb_stream_maps - 1];

@@ -367,10 +358,6 @@ static int opt_map(void *optctx, const char *opt, const char *arg)
    if (!m) {
        if (allow_unused) {
            av_log(NULL, AV_LOG_VERBOSE, "Stream map '%s' matches no streams; ignoring.\n", arg);
-        } else if (disabled) {
-            av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches disabled streams.\n"
-                                       "To ignore this, add a trailing '?' to the map.\n", arg);
-            exit_program(1);
        } else {
            av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n"
                                       "To ignore this, add a trailing '?' to the map.\n", arg);
@@ -450,8 +437,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg)
    /* allow trailing ? to map_channel */
    if (allow_unused = strchr(mapchan, '?'))
        *allow_unused = 0;
-    if (m->channel_idx < 0 || m->channel_idx >= st->codecpar->channels ||
-        input_streams[input_files[m->file_idx]->ist_index + m->stream_idx]->user_set_discard == AVDISCARD_ALL) {
+    if (m->channel_idx < 0 || m->channel_idx >= st->codecpar->channels) {
        if (allow_unused) {
            av_log(NULL, AV_LOG_VERBOSE, "mapchan: invalid audio channel #%d.%d.%d\n",
                    m->file_idx, m->stream_idx, m->channel_idx);
@@ -760,13 +746,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)

        MATCH_PER_STREAM_OPT(discard, str, discard_str, ic, st);
        ist->user_set_discard = AVDISCARD_NONE;
-
-        if ((o->video_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) ||
-            (o->audio_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) ||
-            (o->subtitle_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) ||
-            (o->data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA))
-                ist->user_set_discard = AVDISCARD_ALL;
-
        if (discard_str && av_opt_eval_int(&cc, discard_opt, discard_str, &ist->user_set_discard) < 0) {
            av_log(NULL, AV_LOG_ERROR, "Error parsing discard %s.\n",
                    discard_str);
@@ -1681,8 +1660,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in

    MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
    MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
-    if (o->nb_filters > 1)
-        av_log(NULL, AV_LOG_ERROR, "Only '-vf %s' read, ignoring remaining -vf options: Use ',' to separate filters\n", ost->filters);

    if (!ost->stream_copy) {
        const char *p = NULL;
@@ -1864,8 +1841,6 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in

    MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
    MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
-    if (o->nb_filters > 1)
-        av_log(NULL, AV_LOG_ERROR, "Only '-af %s' read, ignoring remaining -af options: Use ',' to separate filters\n", ost->filters);

    if (!ost->stream_copy) {
        char *sample_fmt = NULL;
@@ -2198,10 +2173,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
            for (i = 0; i < nb_input_streams; i++) {
                int new_area;
                ist = input_streams[i];
-                new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames
-                           + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT);
-                if (ist->user_set_discard == AVDISCARD_ALL)
-                    continue;
+                new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames;
                if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
                    new_area = 1;
                if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
@@ -2222,10 +2194,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
            for (i = 0; i < nb_input_streams; i++) {
                int score;
                ist = input_streams[i];
-                score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames
-                        + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT);
-                if (ist->user_set_discard == AVDISCARD_ALL)
-                    continue;
+                score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames;
                if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
                    score > best_score) {
                    best_score = score;
@@ -2247,8 +2216,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
                    AVCodec const *output_codec =
                        avcodec_find_encoder(oc->oformat->subtitle_codec);
                    int input_props = 0, output_props = 0;
-                    if (input_streams[i]->user_set_discard == AVDISCARD_ALL)
-                        continue;
                    if (output_codec)
                        output_descriptor = avcodec_descriptor_get(output_codec->id);
                    if (input_descriptor)
@@ -2270,8 +2237,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
        if (!o->data_disable ) {
            enum AVCodecID codec_id = av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_DATA);
            for (i = 0; codec_id != AV_CODEC_ID_NONE && i < nb_input_streams; i++) {
-                if (input_streams[i]->user_set_discard == AVDISCARD_ALL)
-                    continue;
                if (input_streams[i]->st->codecpar->codec_type == AVMEDIA_TYPE_DATA
                    && input_streams[i]->st->codecpar->codec_id == codec_id )
                    new_data_stream(o, oc, i);
@@ -2310,11 +2275,6 @@ loop_end:
                int src_idx = input_files[map->file_index]->ist_index + map->stream_index;

                ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index];
-                if (ist->user_set_discard == AVDISCARD_ALL) {
-                    av_log(NULL, AV_LOG_FATAL, "Stream #%d:%d is disabled and cannot be mapped.\n",
-                           map->file_index, map->stream_index);
-                    exit_program(1);
-                }
                if(o->subtitle_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE)
                    continue;
                if(o->   audio_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
--- a/fftools/ffmpeg_videotoolbox.c
+++ b/fftools/ffmpeg_videotoolbox.c
@@ -52,9 +52,6 @@ static int videotoolbox_retrieve_data(AVCodecContext *s, AVFrame *frame)
    case kCVPixelFormatType_32BGRA:           vt->tmp_frame->format = AV_PIX_FMT_BGRA; break;
 #ifdef kCFCoreFoundationVersionNumber10_7
    case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange: vt->tmp_frame->format = AV_PIX_FMT_NV12; break;
-#endif
-#if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE
-    case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange: vt->tmp_frame->format = AV_PIX_FMT_P010; break;
 #endif
    default:
        av_log(NULL, AV_LOG_ERROR,
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -324,7 +324,6 @@ static int seek_by_bytes = -1;
 static float seek_interval = 10;
 static int display_disable;
 static int borderless;
-static int alwaysontop;
 static int startup_volume = 100;
 static int show_status = 1;
 static int av_sync_type = AV_SYNC_AUDIO_MASTER;
@@ -354,7 +353,6 @@ static char *afilters = NULL;
 #endif
 static int autorotate = 1;
 static int find_stream_info = 1;
-static int filter_nbthreads = 0;

 /* current context */
 static int is_full_screen;
@@ -863,27 +861,31 @@ static void calculate_display_rect(SDL_Rect *rect,
                                   int scr_xleft, int scr_ytop, int scr_width, int scr_height,
                                   int pic_width, int pic_height, AVRational pic_sar)
 {
-    AVRational aspect_ratio = pic_sar;
-    int64_t width, height, x, y;
+    float aspect_ratio;
+    int width, height, x, y;

-    if (av_cmp_q(aspect_ratio, av_make_q(0, 1)) <= 0)
-        aspect_ratio = av_make_q(1, 1);
+    if (pic_sar.num == 0)
+        aspect_ratio = 0;
+    else
+        aspect_ratio = av_q2d(pic_sar);

-    aspect_ratio = av_mul_q(aspect_ratio, av_make_q(pic_width, pic_height));
+    if (aspect_ratio <= 0.0)
+        aspect_ratio = 1.0;
+    aspect_ratio *= (float)pic_width / (float)pic_height;

    /* XXX: we suppose the screen has a 1.0 pixel ratio */
    height = scr_height;
-    width = av_rescale(height, aspect_ratio.num, aspect_ratio.den) & ~1;
+    width = lrint(height * aspect_ratio) & ~1;
    if (width > scr_width) {
        width = scr_width;
-        height = av_rescale(width, aspect_ratio.den, aspect_ratio.num) & ~1;
+        height = lrint(width / aspect_ratio) & ~1;
    }
    x = (scr_width - width) / 2;
    y = (scr_height - height) / 2;
    rect->x = scr_xleft + x;
    rect->y = scr_ytop  + y;
-    rect->w = FFMAX((int)width,  1);
-    rect->h = FFMAX((int)height, 1);
+    rect->w = FFMAX(width,  1);
+    rect->h = FFMAX(height, 1);
 }

 static void get_sdl_pix_fmt_and_blendmode(int format, Uint32 *sdl_pix_fmt, SDL_BlendMode *sdl_blendmode)
@@ -1324,11 +1326,7 @@ static void sigterm_handler(int sig)
 static void set_default_window_size(int width, int height, AVRational sar)
 {
    SDL_Rect rect;
-    int max_width  = screen_width  ? screen_width  : INT_MAX;
-    int max_height = screen_height ? screen_height : INT_MAX;
-    if (max_width == INT_MAX && max_height == INT_MAX)
-        max_height = height;
-    calculate_display_rect(&rect, 0, 0, max_width, max_height, width, height, sar);
+    calculate_display_rect(&rect, 0, 0, INT_MAX, height, width, height, sar);
    default_width  = rect.w;
    default_height = rect.h;
 }
@@ -1337,8 +1335,13 @@ static int video_open(VideoState *is)
 {
    int w,h;

-    w = screen_width ? screen_width : default_width;
-    h = screen_height ? screen_height : default_height;
+    if (screen_width) {
+        w = screen_width;
+        h = screen_height;
+    } else {
+        w = default_width;
+        h = default_height;
+    }

    if (!window_title)
        window_title = input_filename;
@@ -1956,7 +1959,6 @@ static int configure_audio_filters(VideoState *is, const char *afilters, int for
    avfilter_graph_free(&is->agraph);
    if (!(is->agraph = avfilter_graph_alloc()))
        return AVERROR(ENOMEM);
-    is->agraph->nb_threads = filter_nbthreads;

    while ((e = av_dict_get(swr_opts, "", e, AV_DICT_IGNORE_SUFFIX)))
        av_strlcatf(aresample_swr_opts, sizeof(aresample_swr_opts), "%s=%s:", e->key, e->value);
@@ -2106,10 +2108,10 @@ static int audio_thread(void *arg)
    return ret;
 }

-static int decoder_start(Decoder *d, int (*fn)(void *), const char *thread_name, void* arg)
+static int decoder_start(Decoder *d, int (*fn)(void *), void *arg)
 {
    packet_queue_start(d->queue);
-    d->decoder_tid = SDL_CreateThread(fn, thread_name, arg);
+    d->decoder_tid = SDL_CreateThread(fn, "decoder", arg);
    if (!d->decoder_tid) {
        av_log(NULL, AV_LOG_ERROR, "SDL_CreateThread(): %s\n", SDL_GetError());
        return AVERROR(ENOMEM);
@@ -2128,17 +2130,26 @@ static int video_thread(void *arg)
    AVRational frame_rate = av_guess_frame_rate(is->ic, is->video_st, NULL);

 #if CONFIG_AVFILTER
-    AVFilterGraph *graph = NULL;
+    AVFilterGraph *graph = avfilter_graph_alloc();
    AVFilterContext *filt_out = NULL, *filt_in = NULL;
    int last_w = 0;
    int last_h = 0;
    enum AVPixelFormat last_format = -2;
    int last_serial = -1;
    int last_vfilter_idx = 0;
+    if (!graph) {
+        av_frame_free(&frame);
+        return AVERROR(ENOMEM);
+    }
+
 #endif

-    if (!frame)
+    if (!frame) {
+#if CONFIG_AVFILTER
+        avfilter_graph_free(&graph);
+#endif
        return AVERROR(ENOMEM);
+    }

    for (;;) {
        ret = get_video_frame(is, frame);
@@ -2161,11 +2172,6 @@ static int video_thread(void *arg)
                   (const char *)av_x_if_null(av_get_pix_fmt_name(frame->format), "none"), is->viddec.pkt_serial);
            avfilter_graph_free(&graph);
            graph = avfilter_graph_alloc();
-            if (!graph) {
-                ret = AVERROR(ENOMEM);
-                goto the_end;
-            }
-            graph->nb_threads = filter_nbthreads;
            if ((ret = configure_video_filters(graph, is, vfilters_list ? vfilters_list[is->vfilter_idx] : NULL, frame)) < 0) {
                SDL_Event event;
                event.type = FF_QUIT_EVENT;
@@ -2675,7 +2681,7 @@ static int stream_component_open(VideoState *is, int stream_index)
            is->auddec.start_pts = is->audio_st->start_time;
            is->auddec.start_pts_tb = is->audio_st->time_base;
        }
-        if ((ret = decoder_start(&is->auddec, audio_thread, "audio_decoder", is)) < 0)
+        if ((ret = decoder_start(&is->auddec, audio_thread, is)) < 0)
            goto out;
        SDL_PauseAudioDevice(audio_dev, 0);
        break;
@@ -2684,7 +2690,7 @@ static int stream_component_open(VideoState *is, int stream_index)
        is->video_st = ic->streams[stream_index];

        decoder_init(&is->viddec, avctx, &is->videoq, is->continue_read_thread);
-        if ((ret = decoder_start(&is->viddec, video_thread, "video_decoder", is)) < 0)
+        if ((ret = decoder_start(&is->viddec, video_thread, is)) < 0)
            goto out;
        is->queue_attachments_req = 1;
        break;
@@ -2693,7 +2699,7 @@ static int stream_component_open(VideoState *is, int stream_index)
        is->subtitle_st = ic->streams[stream_index];

        decoder_init(&is->subdec, avctx, &is->subtitleq, is->continue_read_thread);
-        if ((ret = decoder_start(&is->subdec, subtitle_thread, "subtitle_decoder", is)) < 0)
+        if ((ret = decoder_start(&is->subdec, subtitle_thread, is)) < 0)
            goto out;
        break;
    default:
@@ -3582,7 +3588,6 @@ static const OptionDef options[] = {
    { "seek_interval", OPT_FLOAT | HAS_ARG, { &seek_interval }, "set seek interval for left/right keys, in seconds", "seconds" },
    { "nodisp", OPT_BOOL, { &display_disable }, "disable graphical display" },
    { "noborder", OPT_BOOL, { &borderless }, "borderless window" },
-    { "alwaysontop", OPT_BOOL, { &alwaysontop }, "window always on top" },
    { "volume", OPT_INT | HAS_ARG, { &startup_volume}, "set startup volume 0=min 100=max", "volume" },
    { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" },
    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" },
@@ -3616,7 +3621,6 @@ static const OptionDef options[] = {
    { "autorotate", OPT_BOOL, { &autorotate }, "automatically rotate video", "" },
    { "find_stream_info", OPT_BOOL | OPT_INPUT | OPT_EXPERT, { &find_stream_info },
        "read and decode the streams to fill missing information with heuristics" },
-    { "filter_threads", HAS_ARG | OPT_INT | OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" },
    { NULL, },
 };

@@ -3724,12 +3728,6 @@ int main(int argc, char **argv)

    if (!display_disable) {
        int flags = SDL_WINDOW_HIDDEN;
-        if (alwaysontop)
-#if SDL_VERSION_ATLEAST(2,0,5)
-            flags |= SDL_WINDOW_ALWAYS_ON_TOP;
-#else
-            av_log(NULL, AV_LOG_WARNING, "Your SDL version doesn't support SDL_WINDOW_ALWAYS_ON_TOP. Feature will be inactive.\n");
-#endif
        if (borderless)
            flags |= SDL_WINDOW_BORDERLESS;
        else
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -165,8 +165,6 @@ typedef enum {
    SECTION_ID_FRAME_TAGS,
    SECTION_ID_FRAME_SIDE_DATA_LIST,
    SECTION_ID_FRAME_SIDE_DATA,
-    SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST,
-    SECTION_ID_FRAME_SIDE_DATA_TIMECODE,
    SECTION_ID_FRAME_LOG,
    SECTION_ID_FRAME_LOGS,
    SECTION_ID_LIBRARY_VERSION,
@@ -211,9 +209,7 @@ static struct section sections[] = {
    [SECTION_ID_FRAME] =              { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_LOGS, -1 } },
    [SECTION_ID_FRAME_TAGS] =         { SECTION_ID_FRAME_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "frame_tags" },
    [SECTION_ID_FRAME_SIDE_DATA_LIST] ={ SECTION_ID_FRAME_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA, -1 }, .element_name = "side_data", .unique_name = "frame_side_data_list" },
-    [SECTION_ID_FRAME_SIDE_DATA] =     { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, -1 } },
-    [SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST] =     { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, "timecodes", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, -1 } },
-    [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] =     { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } },
+    [SECTION_ID_FRAME_SIDE_DATA] =     { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { -1 } },
    [SECTION_ID_FRAME_LOGS] =         { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } },
    [SECTION_ID_FRAME_LOG] =          { SECTION_ID_FRAME_LOG, "log", 0, { -1 },  },
    [SECTION_ID_LIBRARY_VERSIONS] =   { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } },
@@ -2203,18 +2199,6 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
                char tcbuf[AV_TIMECODE_STR_SIZE];
                av_timecode_make_mpeg_tc_string(tcbuf, *(int64_t *)(sd->data));
                print_str("timecode", tcbuf);
-            } else if (sd->type == AV_FRAME_DATA_S12M_TIMECODE && sd->size == 16) {
-                uint32_t *tc = (uint32_t*)sd->data;
-                int m = FFMIN(tc[0],3);
-                writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST);
-                for (int j = 1; j <= m ; j++) {
-                    char tcbuf[AV_TIMECODE_STR_SIZE];
-                    av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0);
-                    writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_TIMECODE);
-                    print_str("value", tcbuf);
-                    writer_print_section_footer(w);
-                }
-                writer_print_section_footer(w);
            } else if (sd->type == AV_FRAME_DATA_MASTERING_DISPLAY_METADATA) {
                AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data;

@@ -2429,7 +2413,9 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile,
        }
        av_packet_unref(&pkt);
    }
-    av_packet_unref(&pkt);
+    av_init_packet(&pkt);
+    pkt.data = NULL;
+    pkt.size = 0;
    //Flush remaining frames that are cached in the decoder
    for (i = 0; i < fmt_ctx->nb_streams; i++) {
        pkt.stream_index = i;
@@ -2660,20 +2646,20 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
    } while (0)

    if (do_show_stream_disposition) {
-        writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION);
-        PRINT_DISPOSITION(DEFAULT,          "default");
-        PRINT_DISPOSITION(DUB,              "dub");
-        PRINT_DISPOSITION(ORIGINAL,         "original");
-        PRINT_DISPOSITION(COMMENT,          "comment");
-        PRINT_DISPOSITION(LYRICS,           "lyrics");
-        PRINT_DISPOSITION(KARAOKE,          "karaoke");
-        PRINT_DISPOSITION(FORCED,           "forced");
-        PRINT_DISPOSITION(HEARING_IMPAIRED, "hearing_impaired");
-        PRINT_DISPOSITION(VISUAL_IMPAIRED,  "visual_impaired");
-        PRINT_DISPOSITION(CLEAN_EFFECTS,    "clean_effects");
-        PRINT_DISPOSITION(ATTACHED_PIC,     "attached_pic");
-        PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails");
-        writer_print_section_footer(w);
+    writer_print_section_header(w, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION);
+    PRINT_DISPOSITION(DEFAULT,          "default");
+    PRINT_DISPOSITION(DUB,              "dub");
+    PRINT_DISPOSITION(ORIGINAL,         "original");
+    PRINT_DISPOSITION(COMMENT,          "comment");
+    PRINT_DISPOSITION(LYRICS,           "lyrics");
+    PRINT_DISPOSITION(KARAOKE,          "karaoke");
+    PRINT_DISPOSITION(FORCED,           "forced");
+    PRINT_DISPOSITION(HEARING_IMPAIRED, "hearing_impaired");
+    PRINT_DISPOSITION(VISUAL_IMPAIRED,  "visual_impaired");
+    PRINT_DISPOSITION(CLEAN_EFFECTS,    "clean_effects");
+    PRINT_DISPOSITION(ATTACHED_PIC,     "attached_pic");
+    PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails");
+    writer_print_section_footer(w);
    }

    if (do_show_stream_tags)
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -145,7 +145,7 @@ typedef struct FourXContext {
    int mv[256];
    VLC pre_vlc;
    int last_dc;
-    DECLARE_ALIGNED(32, int16_t, block)[6][64];
+    DECLARE_ALIGNED(16, int16_t, block)[6][64];
    void *bitstream_buffer;
    unsigned int bitstream_buffer_size;
    int version;
@@ -158,7 +158,7 @@ typedef struct FourXContext {
 #define FIX_1_847759065 121095
 #define FIX_2_613125930 171254

-#define MULTIPLY(var, const) ((int)((var) * (unsigned)(const)) >> 16)
+#define MULTIPLY(var, const) (((var) * (const)) >> 16)

 static void idct(int16_t block[64])
 {
@@ -498,7 +498,7 @@ static int decode_i_block(FourXContext *f, int16_t *block)

    if (get_bits_left(&f->gb) < 2){
        av_log(f->avctx, AV_LOG_ERROR, "%d bits left before decode_i_block()\n", get_bits_left(&f->gb));
-        return AVERROR_INVALIDDATA;
+        return -1;
    }

    /* DC coef */
@@ -697,7 +697,6 @@ static const uint8_t *read_huffman_tables(FourXContext *f,
        len_tab[j]  = len;
    }

-    ff_free_vlc(&f->pre_vlc);
    if (init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, len_tab, 1, 1,
                 bits_tab, 4, 4, 0))
        return NULL;
@@ -733,7 +732,7 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
        for (x = 0; x < width; x += 16) {
            unsigned int color[4] = { 0 }, bits;
            if (buf_end - buf < 8)
-                return AVERROR_INVALIDDATA;
+                return -1;
            // warning following is purely guessed ...
            color[0] = bytestream2_get_le16u(&g3);
            color[1] = bytestream2_get_le16u(&g3);
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -173,7 +173,6 @@ OBJS-$(CONFIG_AC3_FIXED_DECODER)       += ac3dec_fixed.o ac3dec_data.o ac3.o kbd
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc_float.o ac3enc.o ac3tab.o \
                                          ac3.o kbdwin.o
 OBJS-$(CONFIG_AC3_FIXED_ENCODER)       += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o
-OBJS-$(CONFIG_AGM_DECODER)             += agm.o
 OBJS-$(CONFIG_AIC_DECODER)             += aic.o
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o alac_data.o alacdsp.o
 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o alac_data.o
@@ -199,7 +198,6 @@ OBJS-$(CONFIG_APTX_HD_DECODER)         += aptx.o
 OBJS-$(CONFIG_APTX_HD_ENCODER)         += aptx.o
 OBJS-$(CONFIG_APNG_DECODER)            += png.o pngdec.o pngdsp.o
 OBJS-$(CONFIG_APNG_ENCODER)            += png.o pngenc.o
-OBJS-$(CONFIG_ARBC_DECODER)            += arbc.o
 OBJS-$(CONFIG_SSA_DECODER)             += assdec.o ass.o
 OBJS-$(CONFIG_SSA_ENCODER)             += assenc.o ass.o
 OBJS-$(CONFIG_ASS_DECODER)             += assdec.o ass.o
@@ -364,7 +362,6 @@ OBJS-$(CONFIG_H264_V4L2M2M_DECODER)    += v4l2_m2m_dec.o
 OBJS-$(CONFIG_H264_V4L2M2M_ENCODER)    += v4l2_m2m_enc.o
 OBJS-$(CONFIG_HAP_DECODER)             += hapdec.o hap.o
 OBJS-$(CONFIG_HAP_ENCODER)             += hapenc.o hap.o
-OBJS-$(CONFIG_HCOM_DECODER)            += hcom.o
 OBJS-$(CONFIG_HEVC_DECODER)            += hevcdec.o hevc_mvs.o \
                                          hevc_cabac.o hevc_refs.o hevcpred.o    \
                                          hevcdsp.o hevc_filter.o hevc_data.o
@@ -386,7 +383,6 @@ OBJS-$(CONFIG_HQ_HQA_DECODER)          += hq_hqa.o hq_hqadata.o hq_hqadsp.o \
 OBJS-$(CONFIG_HQX_DECODER)             += hqx.o hqxvlc.o hqxdsp.o canopus.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
-OBJS-$(CONFIG_HYMT_DECODER)            += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
 OBJS-$(CONFIG_IDF_DECODER)             += bintext.o cga_data.o
 OBJS-$(CONFIG_IFF_ILBM_DECODER)        += iff.o
@@ -413,7 +409,6 @@ OBJS-$(CONFIG_KMVC_DECODER)            += kmvc.o
 OBJS-$(CONFIG_LAGARITH_DECODER)        += lagarith.o lagarithrac.o
 OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc_common.o
 OBJS-$(CONFIG_LOCO_DECODER)            += loco.o
-OBJS-$(CONFIG_LSCR_DECODER)            += png.o pngdec.o pngdsp.o
 OBJS-$(CONFIG_M101_DECODER)            += m101.o
 OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
 OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
@@ -497,8 +492,7 @@ OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
 OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o
 OBJS-$(CONFIG_ON2AVC_DECODER)          += on2avc.o on2avcdata.o
 OBJS-$(CONFIG_OPUS_DECODER)            += opusdec.o opus.o opus_celt.o opus_rc.o \
-                                          opus_pvq.o opus_silk.o opustab.o vorbis_data.o \
-                                          opusdsp.o
+                                          opus_pvq.o opus_silk.o opustab.o vorbis_data.o
 OBJS-$(CONFIG_OPUS_ENCODER)            += opusenc.o opus.o opus_rc.o opustab.o opus_pvq.o \
                                          opusenc_psy.o
 OBJS-$(CONFIG_PAF_AUDIO_DECODER)       += pafaudio.o
@@ -743,7 +737,6 @@ OBJS-$(CONFIG_PCM_ALAW_DECODER)           += pcm.o
 OBJS-$(CONFIG_PCM_ALAW_ENCODER)           += pcm.o
 OBJS-$(CONFIG_PCM_BLURAY_DECODER)         += pcm-bluray.o
 OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm-dvd.o
-OBJS-$(CONFIG_PCM_DVD_ENCODER)            += pcm-dvdenc.o
 OBJS-$(CONFIG_PCM_F16LE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_F24LE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_F32BE_DECODER)          += pcm.o
@@ -809,7 +802,6 @@ OBJS-$(CONFIG_ADPCM_4XM_DECODER)          += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_ADX_DECODER)          += adxdec.o adx.o
 OBJS-$(CONFIG_ADPCM_ADX_ENCODER)          += adxenc.o adx.o
 OBJS-$(CONFIG_ADPCM_AFC_DECODER)          += adpcm.o adpcm_data.o
-OBJS-$(CONFIG_ADPCM_AGM_DECODER)          += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_AICA_DECODER)         += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_CT_DECODER)           += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_DTK_DECODER)          += adpcm.o adpcm_data.o
@@ -961,11 +953,9 @@ OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER)        += audiotoolboxenc.o
 OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER)       += audiotoolboxenc.o
 OBJS-$(CONFIG_LIBAOM_AV1_DECODER)         += libaomdec.o
 OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)         += libaomenc.o
-OBJS-$(CONFIG_LIBARIBB24_DECODER)         += libaribb24.o ass.o
 OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
 OBJS-$(CONFIG_LIBCODEC2_DECODER)          += libcodec2.o codec2utils.o
 OBJS-$(CONFIG_LIBCODEC2_ENCODER)          += libcodec2.o codec2utils.o
-OBJS-$(CONFIG_LIBDAV1D_DECODER)           += libdav1d.o
 OBJS-$(CONFIG_LIBDAVS2_DECODER)           += libdavs2.o
 OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
 OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
@@ -1033,16 +1023,14 @@ OBJS-$(CONFIG_DVD_NAV_PARSER)          += dvd_nav_parser.o
 OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_parser.o
 OBJS-$(CONFIG_FLAC_PARSER)             += flac_parser.o flacdata.o flac.o \
                                          vorbis_data.o
-OBJS-$(CONFIG_G723_1_PARSER)           += g723_1_parser.o
 OBJS-$(CONFIG_G729_PARSER)             += g729_parser.o
-OBJS-$(CONFIG_GIF_PARSER)              += gif_parser.o
 OBJS-$(CONFIG_GSM_PARSER)              += gsm_parser.o
 OBJS-$(CONFIG_H261_PARSER)             += h261_parser.o
 OBJS-$(CONFIG_H263_PARSER)             += h263_parser.o
 OBJS-$(CONFIG_H264_PARSER)             += h264_parser.o h264_sei.o h264data.o
 OBJS-$(CONFIG_HEVC_PARSER)             += hevc_parser.o hevc_data.o
 OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.o
-OBJS-$(CONFIG_MLP_PARSER)              += mlp_parse.o mlp_parser.o mlp.o
+OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.o mlp.o
 OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \
                                          mpeg4videodec.o mpeg4video.o \
                                          ituh263dec.o h263dec.o h263data.o
@@ -1069,7 +1057,6 @@ OBJS-$(CONFIG_XMA_PARSER)              += xma_parser.o
 # bitstream filters
 OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o mpeg4audio.o
 OBJS-$(CONFIG_AV1_METADATA_BSF)           += av1_metadata_bsf.o
-OBJS-$(CONFIG_AV1_FRAME_SPLIT_BSF)        += av1_frame_split_bsf.o
 OBJS-$(CONFIG_CHOMP_BSF)                  += chomp_bsf.o
 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.o
 OBJS-$(CONFIG_DCA_CORE_BSF)               += dca_core_bsf.o
@@ -1081,7 +1068,7 @@ OBJS-$(CONFIG_H264_METADATA_BSF)          += h264_metadata_bsf.o h264_levels.o
 OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.o
 OBJS-$(CONFIG_H264_REDUNDANT_PPS_BSF)     += h264_redundant_pps_bsf.o
 OBJS-$(CONFIG_HAPQA_EXTRACT_BSF)          += hapqa_extract_bsf.o hap.o
-OBJS-$(CONFIG_HEVC_METADATA_BSF)          += h265_metadata_bsf.o h265_profile_level.o
+OBJS-$(CONFIG_HEVC_METADATA_BSF)          += h265_metadata_bsf.o
 OBJS-$(CONFIG_HEVC_MP4TOANNEXB_BSF)       += hevc_mp4toannexb_bsf.o
 OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.o
 OBJS-$(CONFIG_MJPEG2JPEG_BSF)             += mjpeg2jpeg_bsf.o
@@ -1093,11 +1080,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)  += mp3_header_decompress_bsf.o \
 OBJS-$(CONFIG_MPEG2_METADATA_BSF)         += mpeg2_metadata_bsf.o
 OBJS-$(CONFIG_NOISE_BSF)                  += noise_bsf.o
 OBJS-$(CONFIG_NULL_BSF)                   += null_bsf.o
-OBJS-$(CONFIG_PRORES_METADATA_BSF)        += prores_metadata_bsf.o
 OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o
 OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
 OBJS-$(CONFIG_TRACE_HEADERS_BSF)          += trace_headers_bsf.o
-OBJS-$(CONFIG_TRUEHD_CORE_BSF)            += truehd_core_bsf.o mlp_parse.o mlp.o
 OBJS-$(CONFIG_VP9_METADATA_BSF)           += vp9_metadata_bsf.o
 OBJS-$(CONFIG_VP9_RAW_REORDER_BSF)        += vp9_raw_reorder_bsf.o
 OBJS-$(CONFIG_VP9_SUPERFRAME_BSF)         += vp9_superframe_bsf.o
@@ -1161,7 +1146,6 @@ TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
 TESTPROGS-$(HAVE_MMX)                     += motion
 TESTPROGS-$(CONFIG_MPEGVIDEO)             += mpeg12framerate
 TESTPROGS-$(CONFIG_H264_METADATA_BSF)     += h264_levels
-TESTPROGS-$(CONFIG_HEVC_METADATA_BSF)     += h265_levels
 TESTPROGS-$(CONFIG_RANGECODER)            += rangecoder
 TESTPROGS-$(CONFIG_SNOW_ENCODER)          += snowenc

--- a/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@ -60,11 +60,11 @@ typedef struct A64Context {
 } A64Context;

 /* gray gradient */
-static const uint8_t mc_colors[5]={0x0,0xb,0xc,0xf,0x1};
+static const int mc_colors[5]={0x0,0xb,0xc,0xf,0x1};

 /* other possible gradients - to be tested */
-//static const uint8_t mc_colors[5]={0x0,0x8,0xa,0xf,0x7};
-//static const uint8_t mc_colors[5]={0x0,0x9,0x8,0xa,0x3};
+//static const int mc_colors[5]={0x0,0x8,0xa,0xf,0x7};
+//static const int mc_colors[5]={0x0,0x9,0x8,0xa,0x3};

 static void to_meta_with_crop(AVCodecContext *avctx,
                              const AVFrame *p, int *dest)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -368,7 +368,7 @@ struct AACContext {
                                   INTFLOAT *in, IndividualChannelStream *ics);
    void (*update_ltp)(AACContext *ac, SingleChannelElement *sce);
    void (*vector_pow43)(int *coefs, int len);
-    void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
+    void (*subband_scale)(int *dst, int *src, int scale, int offset, int len);

 };

--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -247,12 +247,14 @@ static void apply_independent_coupling(AACContext *ac,
                                       SingleChannelElement *target,
                                       ChannelElement *cce, int index)
 {
+    int i;
    const float gain = cce->coup.gain[index][0];
    const float *src = cce->ch[0].ret;
    float *dest = target->ret;
    const int len = 1024 << (ac->oc[1].m4ac.sbr == 1);

-    ac->fdsp->vector_fmac_scalar(dest, src, gain, len);
+    for (i = 0; i < len; i++)
+        dest[i] += gain * src[i];
 }

 #include "aacdec_template.c"
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -162,7 +162,7 @@ static void vector_pow43(int *coefs, int len)
    }
 }

-static void subband_scale(int *dst, int *src, int scale, int offset, int len, void *log_context)
+static void subband_scale(int *dst, int *src, int scale, int offset, int len)
 {
    int ssign = scale < 0 ? -1 : 1;
    int s = FFABS(scale);
@@ -189,18 +189,18 @@ static void subband_scale(int *dst, int *src, int scale, int offset, int len, vo
            dst[i] = out * (unsigned)ssign;
        }
    } else {
-        av_log(log_context, AV_LOG_ERROR, "Overflow in subband_scale()\n");
+        av_log(NULL, AV_LOG_ERROR, "Overflow in subband_scale()\n");
    }
 }

 static void noise_scale(int *coefs, int scale, int band_energy, int len)
 {
-    int s = -scale;
+    int ssign = scale < 0 ? -1 : 1;
+    int s = FFABS(scale);
    unsigned int round;
    int i, out, c = exp2tab[s & 3];
    int nlz = 0;

-    av_assert0(s >= 0);
    while (band_energy > 0x7fff) {
        band_energy >>= 1;
        nlz++;
@@ -216,20 +216,15 @@ static void noise_scale(int *coefs, int scale, int band_energy, int len)
        round = s ? 1 << (s-1) : 0;
        for (i=0; i<len; i++) {
            out = (int)(((int64_t)coefs[i] * c) >> 32);
-            coefs[i] = -((int)(out+round) >> s);
+            coefs[i] = ((int)(out+round) >> s) * ssign;
        }
    }
    else {
        s = s + 32;
-        if (s > 0) {
-            round = 1 << (s-1);
-            for (i=0; i<len; i++) {
-                out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s);
-                coefs[i] = -out;
-            }
-        } else {
-            for (i=0; i<len; i++)
-                coefs[i] = -(int64_t)coefs[i] * c * (1 << -s);
+        round = 1 << (s-1);
+        for (i=0; i<len; i++) {
+            out = (int)((int64_t)((int64_t)coefs[i] * c + round) >> s);
+            coefs[i] = out * ssign;
        }
    }
 }
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -1673,24 +1673,25 @@ static int decode_spectrum_and_dequant(AACContext *ac, INTFLOAT coef[1024],
                }
            } else if (cbt_m1 == NOISE_BT - 1) {
                for (group = 0; group < (AAC_SIGNE)g_len; group++, cfo+=128) {
+#if !USE_FIXED
+                    float scale;
+#endif /* !USE_FIXED */
                    INTFLOAT band_energy;
-#if USE_FIXED
+
                    for (k = 0; k < off_len; k++) {
                        ac->random_state  = lcg_random(ac->random_state);
+#if USE_FIXED
                        cfo[k] = ac->random_state >> 3;
+#else
+                        cfo[k] = ac->random_state;
+#endif /* USE_FIXED */
                    }

+#if USE_FIXED
                    band_energy = ac->fdsp->scalarproduct_fixed(cfo, cfo, off_len);
                    band_energy = fixed_sqrt(band_energy, 31);
                    noise_scale(cfo, sf[idx], band_energy, off_len);
 #else
-                    float scale;
-
-                    for (k = 0; k < off_len; k++) {
-                        ac->random_state  = lcg_random(ac->random_state);
-                        cfo[k] = ac->random_state;
-                    }
-
                    band_energy = ac->fdsp->scalarproduct_float(cfo, cfo, off_len);
                    scale = sf[idx] / sqrtf(band_energy);
                    ac->fdsp->vector_fmul_scalar(cfo, cfo, scale, off_len);
@@ -1926,7 +1927,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, INTFLOAT coef[1024],
            if (cbt_m1 < NOISE_BT - 1) {
                for (group = 0; group < (int)g_len; group++, cfo+=128) {
                    ac->vector_pow43(cfo, off_len);
-                    ac->subband_scale(cfo, cfo, sf[idx], 34, off_len, ac->avctx);
+                    ac->subband_scale(cfo, cfo, sf[idx], 34, off_len);
                }
            }
        }
@@ -2157,7 +2158,7 @@ static void apply_intensity_stereo(AACContext *ac,
                                      coef0 + group * 128 + offsets[i],
                                      scale,
                                      23,
-                                      offsets[i + 1] - offsets[i] ,ac->avctx);
+                                      offsets[i + 1] - offsets[i]);
 #else
                        ac->fdsp->vector_fmul_scalar(coef1 + group * 128 + offsets[i],
                                                    coef0 + group * 128 + offsets[i],
@@ -2492,9 +2493,6 @@ static void apply_tns(INTFLOAT coef_param[1024], TemporalNoiseShaping *tns,
    INTFLOAT tmp[TNS_MAX_ORDER+1];
    UINTFLOAT *coef = coef_param;

-    if(!mmm)
-        return;
-
    for (w = 0; w < ics->num_windows; w++) {
        bottom = ics->num_swb;
        for (filt = 0; filt < tns->n_filt[w]; filt++) {
--- a/libavcodec/aacenc_ltp.c
+++ b/libavcodec/aacenc_ltp.c
@@ -144,7 +144,7 @@ void ff_aac_adjust_common_ltp(AACEncContext *s, ChannelElement *cpe)
        int sum = sce0->ics.ltp.used[sfb] + sce1->ics.ltp.used[sfb];
        if (sum != 2) {
            sce0->ics.ltp.used[sfb] = 0;
-        } else {
+        } else if (sum == 2) {
            count++;
        }
    }
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -118,7 +118,7 @@ static int read_ ## PAR ## _data(AVCodecContext *avctx, GetBitContext *gb, PSCon
    return 0; \
 err: \
    av_log(avctx, AV_LOG_ERROR, "illegal "#PAR"\n"); \
-    return AVERROR_INVALIDDATA; \
+    return -1; \
 }

 READ_PAR_DATA(iid,    huff_offset[table_idx],    0, FFABS(ps->iid_par[e][b]) > 7 + 8 * ps->iid_quant)
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -54,10 +54,10 @@ static void ps_hybrid_analysis_c(INTFLOAT (*out)[2], INTFLOAT (*in)[2],
        INT64FLOAT sum_im = (INT64FLOAT)filter[i][6][0] * in[6][1];

        for (j = 0; j < 6; j++) {
-            INT64FLOAT in0_re = in[j][0];
-            INT64FLOAT in0_im = in[j][1];
-            INT64FLOAT in1_re = in[12-j][0];
-            INT64FLOAT in1_im = in[12-j][1];
+            INTFLOAT in0_re = in[j][0];
+            INTFLOAT in0_im = in[j][1];
+            INTFLOAT in1_re = in[12-j][0];
+            INTFLOAT in1_im = in[12-j][1];
            sum_re += (INT64FLOAT)filter[i][j][0] * (in0_re + in1_re) -
                      (INT64FLOAT)filter[i][j][1] * (in0_im - in1_im);
            sum_im += (INT64FLOAT)filter[i][j][0] * (in0_im + in1_im) +
--- a/libavcodec/aarch64/Makefile
+++ b/libavcodec/aarch64/Makefile
@@ -9,13 +9,11 @@ OBJS-$(CONFIG_HPELDSP)                  += aarch64/hpeldsp_init_aarch64.o
 OBJS-$(CONFIG_MPEGAUDIODSP)             += aarch64/mpegaudiodsp_init.o
 OBJS-$(CONFIG_NEON_CLOBBER_TEST)        += aarch64/neontest.o
 OBJS-$(CONFIG_VIDEODSP)                 += aarch64/videodsp_init.o
-OBJS-$(CONFIG_VP8DSP)                   += aarch64/vp8dsp_init_aarch64.o

 # decoders/encoders
 OBJS-$(CONFIG_AAC_DECODER)              += aarch64/aacpsdsp_init_aarch64.o \
                                           aarch64/sbrdsp_init_aarch64.o
 OBJS-$(CONFIG_DCA_DECODER)              += aarch64/synth_filter_init.o
-OBJS-$(CONFIG_OPUS_DECODER)             += aarch64/opusdsp_init.o
 OBJS-$(CONFIG_RV40_DECODER)             += aarch64/rv40dsp_init_aarch64.o
 OBJS-$(CONFIG_VC1DSP)                   += aarch64/vc1dsp_init_aarch64.o
 OBJS-$(CONFIG_VORBIS_DECODER)           += aarch64/vorbisdsp_init.o
@@ -45,12 +43,10 @@ NEON-OBJS-$(CONFIG_IDCTDSP)             += aarch64/idctdsp_init_aarch64.o      \
                                           aarch64/simple_idct_neon.o
 NEON-OBJS-$(CONFIG_MDCT)                += aarch64/mdct_neon.o
 NEON-OBJS-$(CONFIG_MPEGAUDIODSP)        += aarch64/mpegaudiodsp_neon.o
-NEON-OBJS-$(CONFIG_VP8DSP)              += aarch64/vp8dsp_neon.o

 # decoders/encoders
 NEON-OBJS-$(CONFIG_AAC_DECODER)         += aarch64/aacpsdsp_neon.o
 NEON-OBJS-$(CONFIG_DCA_DECODER)         += aarch64/synth_filter_neon.o
-NEON-OBJS-$(CONFIG_OPUS_DECODER)        += aarch64/opusdsp_neon.o
 NEON-OBJS-$(CONFIG_VORBIS_DECODER)      += aarch64/vorbisdsp_neon.o
 NEON-OBJS-$(CONFIG_VP9_DECODER)         += aarch64/vp9itxfm_16bpp_neon.o       \
                                           aarch64/vp9itxfm_neon.o             \
--- a/libavcodec/aarch64/asm-offsets.h
+++ b/libavcodec/aarch64/asm-offsets.h
@@ -19,6 +19,14 @@
 #ifndef AVCODEC_AARCH64_ASM_OFFSETS_H
 #define AVCODEC_AARCH64_ASM_OFFSETS_H

+/* CeltIMDCTContext */
+#define CELT_EXPTAB                     0x20
+#define CELT_FFT_N                      0x00
+#define CELT_LEN2                       0x04
+#define CELT_LEN4                       (CELT_LEN2 + 0x4)   // loaded as pair
+#define CELT_TMP                        0x10
+#define CELT_TWIDDLE                    (CELT_TMP + 0x8)    // loaded as pair
+
 /* FFTContext */
 #define IMDCT_HALF                      0x48

--- a/libavcodec/aarch64/h264dsp_init_aarch64.c
+++ b/libavcodec/aarch64/h264dsp_init_aarch64.c
@@ -25,28 +25,14 @@
 #include "libavutil/aarch64/cpu.h"
 #include "libavcodec/h264dsp.h"

-void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
                                     int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
                                     int beta, int8_t *tc0);
-void ff_h264_v_loop_filter_luma_intra_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
-                                           int beta);
-void ff_h264_h_loop_filter_luma_intra_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
-                                           int beta);
-void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
                                       int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
                                       int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_chroma422_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
-                                          int beta, int8_t *tc0);
-void ff_h264_v_loop_filter_chroma_intra_neon(uint8_t *pix, ptrdiff_t stride,
-                                             int alpha, int beta);
-void ff_h264_h_loop_filter_chroma_intra_neon(uint8_t *pix, ptrdiff_t stride,
-                                             int alpha, int beta);
-void ff_h264_h_loop_filter_chroma422_intra_neon(uint8_t *pix, ptrdiff_t stride,
-                                                int alpha, int beta);
-void ff_h264_h_loop_filter_chroma_mbaff_intra_neon(uint8_t *pix, ptrdiff_t stride,
-                                                   int alpha, int beta);

 void ff_weight_h264_pixels_16_neon(uint8_t *dst, ptrdiff_t stride, int height,
                                   int log2_den, int weight, int offset);
@@ -91,22 +77,9 @@ av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth,
    if (have_neon(cpu_flags) && bit_depth == 8) {
        c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
        c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
-        c->h264_v_loop_filter_luma_intra= ff_h264_v_loop_filter_luma_intra_neon;
-        c->h264_h_loop_filter_luma_intra= ff_h264_h_loop_filter_luma_intra_neon;
-
        c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
-        c->h264_v_loop_filter_chroma_intra = ff_h264_v_loop_filter_chroma_intra_neon;
-
-        if (chroma_format_idc <= 1) {
-            c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
-            c->h264_h_loop_filter_chroma_intra = ff_h264_h_loop_filter_chroma_intra_neon;
-            c->h264_h_loop_filter_chroma_mbaff_intra = ff_h264_h_loop_filter_chroma_mbaff_intra_neon;
-        } else {
-            c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma422_neon;
-            c->h264_h_loop_filter_chroma_mbaff = ff_h264_h_loop_filter_chroma_neon;
-            c->h264_h_loop_filter_chroma_intra = ff_h264_h_loop_filter_chroma422_intra_neon;
-            c->h264_h_loop_filter_chroma_mbaff_intra = ff_h264_h_loop_filter_chroma_intra_neon;
-        }
+        if (chroma_format_idc <= 1)
+        c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;

        c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
        c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;
--- a/libavcodec/aarch64/h264dsp_neon.S
+++ b/libavcodec/aarch64/h264dsp_neon.S
@@ -1,7 +1,6 @@
 /*
 * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
 * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
- * Copyright (c) 2014 Janne Grunau <janne-libav@jannau.net>
 *
 * This file is part of FFmpeg.
 *
@@ -28,9 +27,9 @@
        ldr             w6,  [x4]
        ccmp            w3,  #0, #0, ne
        mov             v24.S[0], w6
-        and             w8,  w6,  w6,  lsl #16
+        and             w6,  w6,  w6,  lsl #16
        b.eq            1f
-        ands            w8,  w8,  w8,  lsl #8
+        ands            w6,  w6,  w6,  lsl #8
        b.ge            2f
 1:
        ret
@@ -55,12 +54,9 @@
        uabd            v17.16B, v20.16B, v16.16B       // abs(p2 - p0)
        and             v21.16B, v21.16B, v28.16B
        uabd            v19.16B,  v4.16B,  v0.16B       // abs(q2 - q0)
-        and             v21.16B, v21.16B, v30.16B      // < beta
-        shrn            v30.8b,  v21.8h,  #4
-        mov             x7, v30.d[0]
        cmhi            v17.16B, v22.16B, v17.16B       // < beta
+        and             v21.16B, v21.16B, v30.16B
        cmhi            v19.16B, v22.16B, v19.16B       // < beta
-        cbz             x7,  9f
        and             v17.16B, v17.16B, v21.16B
        and             v19.16B, v19.16B, v21.16B
        and             v24.16B, v24.16B, v21.16B
@@ -128,13 +124,12 @@ function ff_h264_v_loop_filter_luma_neon, export=1
        st1             {v16.16B}, [x0], x1
        st1             {v0.16B},  [x0], x1
        st1             {v19.16B}, [x0]
-9:
+
        ret
 endfunc

 function ff_h264_h_loop_filter_luma_neon, export=1
        h264_loop_filter_start
-        sxtw            x1,  w1

        sub             x0,  x0,  #4
        ld1             {v6.8B},  [x0], x1
@@ -178,231 +173,32 @@ function ff_h264_h_loop_filter_luma_neon, export=1
        st1             {v16.S}[3], [x0], x1
        st1             {v0.S}[3],  [x0], x1
        st1             {v19.S}[3], [x0], x1
-9:
+
        ret
 endfunc

-
-.macro h264_loop_filter_start_intra
-    orr             w4,  w2,  w3
-    cbnz            w4,  1f
-    ret
-1:
-    sxtw            x1,  w1
-    dup             v30.16b, w2                // alpha
-    dup             v31.16b, w3                // beta
-.endm
-
-.macro h264_loop_filter_luma_intra
-    uabd            v16.16b, v7.16b,  v0.16b        // abs(p0 - q0)
-    uabd            v17.16b, v6.16b,  v7.16b        // abs(p1 - p0)
-    uabd            v18.16b, v1.16b,  v0.16b        // abs(q1 - q0)
-    cmhi            v19.16b, v30.16b, v16.16b       // < alpha
-    cmhi            v17.16b, v31.16b, v17.16b       // < beta
-    cmhi            v18.16b, v31.16b, v18.16b       // < beta
-
-    movi            v29.16b, #2
-    ushr            v30.16b, v30.16b, #2            // alpha >> 2
-    add             v30.16b, v30.16b, v29.16b       // (alpha >> 2) + 2
-    cmhi            v16.16b, v30.16b, v16.16b       // < (alpha >> 2) + 2
-
-    and             v19.16b, v19.16b, v17.16b
-    and             v19.16b, v19.16b, v18.16b
-    shrn            v20.8b,  v19.8h,  #4
-    mov             x4, v20.d[0]
-    cbz             x4, 9f
-
-    ushll           v20.8h,  v6.8b,   #1
-    ushll           v22.8h,  v1.8b,   #1
-    ushll2          v21.8h,  v6.16b,  #1
-    ushll2          v23.8h,  v1.16b,  #1
-    uaddw           v20.8h,  v20.8h,  v7.8b
-    uaddw           v22.8h,  v22.8h,  v0.8b
-    uaddw2          v21.8h,  v21.8h,  v7.16b
-    uaddw2          v23.8h,  v23.8h,  v0.16b
-    uaddw           v20.8h,  v20.8h,  v1.8b
-    uaddw           v22.8h,  v22.8h,  v6.8b
-    uaddw2          v21.8h,  v21.8h,  v1.16b
-    uaddw2          v23.8h,  v23.8h,  v6.16b
-
-    rshrn           v24.8b,  v20.8h,  #2 // p0'_1
-    rshrn           v25.8b,  v22.8h,  #2 // q0'_1
-    rshrn2          v24.16b, v21.8h,  #2 // p0'_1
-    rshrn2          v25.16b, v23.8h,  #2 // q0'_1
-
-    uabd            v17.16b, v5.16b,  v7.16b        // abs(p2 - p0)
-    uabd            v18.16b, v2.16b,  v0.16b        // abs(q2 - q0)
-    cmhi            v17.16b, v31.16b, v17.16b       // < beta
-    cmhi            v18.16b, v31.16b, v18.16b       // < beta
-
-    and             v17.16b, v16.16b, v17.16b  // if_2 && if_3
-    and             v18.16b, v16.16b, v18.16b  // if_2 && if_4
-
-    not             v30.16b, v17.16b
-    not             v31.16b, v18.16b
-
-    and             v30.16b, v30.16b, v19.16b  // if_1 && !(if_2 && if_3)
-    and             v31.16b, v31.16b, v19.16b  // if_1 && !(if_2 && if_4)
-
-    and             v17.16b, v19.16b, v17.16b  // if_1 && if_2 && if_3
-    and             v18.16b, v19.16b, v18.16b  // if_1 && if_2 && if_4
-
-    //calc            p, v7, v6, v5, v4, v17, v7, v6, v5, v4
-    uaddl           v26.8h,  v5.8b,   v7.8b
-    uaddl2          v27.8h,  v5.16b,  v7.16b
-    uaddw           v26.8h,  v26.8h,  v0.8b
-    uaddw2          v27.8h,  v27.8h,  v0.16b
-    add             v20.8h,  v20.8h,  v26.8h
-    add             v21.8h,  v21.8h,  v27.8h
-    uaddw           v20.8h,  v20.8h,  v0.8b
-    uaddw2          v21.8h,  v21.8h,  v0.16b
-    rshrn           v20.8b,  v20.8h,  #3 // p0'_2
-    rshrn2          v20.16b, v21.8h,  #3 // p0'_2
-    uaddw           v26.8h,  v26.8h,  v6.8b
-    uaddw2          v27.8h,  v27.8h,  v6.16b
-    rshrn           v21.8b,  v26.8h,  #2 // p1'_2
-    rshrn2          v21.16b, v27.8h,  #2 // p1'_2
-    uaddl           v28.8h,  v4.8b,   v5.8b
-    uaddl2          v29.8h,  v4.16b,  v5.16b
-    shl             v28.8h,  v28.8h,  #1
-    shl             v29.8h,  v29.8h,  #1
-    add             v28.8h,  v28.8h,  v26.8h
-    add             v29.8h,  v29.8h,  v27.8h
-    rshrn           v19.8b,  v28.8h,  #3 // p2'_2
-    rshrn2          v19.16b, v29.8h,  #3 // p2'_2
-
-    //calc            q, v0, v1, v2, v3, v18, v0, v1, v2, v3
-    uaddl           v26.8h,  v2.8b,   v0.8b
-    uaddl2          v27.8h,  v2.16b,  v0.16b
-    uaddw           v26.8h,  v26.8h,  v7.8b
-    uaddw2          v27.8h,  v27.8h,  v7.16b
-    add             v22.8h,  v22.8h,  v26.8h
-    add             v23.8h,  v23.8h,  v27.8h
-    uaddw           v22.8h,  v22.8h,  v7.8b
-    uaddw2          v23.8h,  v23.8h,  v7.16b
-    rshrn           v22.8b,  v22.8h,  #3 // q0'_2
-    rshrn2          v22.16b, v23.8h,  #3 // q0'_2
-    uaddw           v26.8h,  v26.8h,  v1.8b
-    uaddw2          v27.8h,  v27.8h,  v1.16b
-    rshrn           v23.8b,  v26.8h,  #2 // q1'_2
-    rshrn2          v23.16b, v27.8h,  #2 // q1'_2
-    uaddl           v28.8h,  v2.8b,   v3.8b
-    uaddl2          v29.8h,  v2.16b,  v3.16b
-    shl             v28.8h,  v28.8h,  #1
-    shl             v29.8h,  v29.8h,  #1
-    add             v28.8h,  v28.8h,  v26.8h
-    add             v29.8h,  v29.8h,  v27.8h
-    rshrn           v26.8b,  v28.8h,  #3 // q2'_2
-    rshrn2          v26.16b, v29.8h,  #3 // q2'_2
-
-    bit             v7.16b,  v24.16b, v30.16b  // p0'_1
-    bit             v0.16b,  v25.16b, v31.16b  // q0'_1
-    bit             v7.16b, v20.16b,  v17.16b  // p0'_2
-    bit             v6.16b, v21.16b,  v17.16b  // p1'_2
-    bit             v5.16b, v19.16b,  v17.16b  // p2'_2
-    bit             v0.16b, v22.16b,  v18.16b  // q0'_2
-    bit             v1.16b, v23.16b,  v18.16b  // q1'_2
-    bit             v2.16b, v26.16b,  v18.16b  // q2'_2
-.endm
-
-function ff_h264_v_loop_filter_luma_intra_neon, export=1
-    h264_loop_filter_start_intra
-
-    ld1             {v0.16b},  [x0], x1 // q0
-    ld1             {v1.16b},  [x0], x1 // q1
-    ld1             {v2.16b},  [x0], x1 // q2
-    ld1             {v3.16b},  [x0], x1 // q3
-    sub             x0,  x0,  x1, lsl #3
-    ld1             {v4.16b},  [x0], x1 // p3
-    ld1             {v5.16b},  [x0], x1 // p2
-    ld1             {v6.16b},  [x0], x1 // p1
-    ld1             {v7.16b},  [x0]     // p0
-
-    h264_loop_filter_luma_intra
-
-    sub             x0,  x0,  x1, lsl #1
-    st1             {v5.16b}, [x0], x1  // p2
-    st1             {v6.16b}, [x0], x1  // p1
-    st1             {v7.16b}, [x0], x1  // p0
-    st1             {v0.16b}, [x0], x1  // q0
-    st1             {v1.16b}, [x0], x1  // q1
-    st1             {v2.16b}, [x0]      // q2
-9:
-    ret
-endfunc
-
-function ff_h264_h_loop_filter_luma_intra_neon, export=1
-    h264_loop_filter_start_intra
-
-    sub             x0,  x0,  #4
-    ld1             {v4.8b},  [x0], x1
-    ld1             {v5.8b},  [x0], x1
-    ld1             {v6.8b},  [x0], x1
-    ld1             {v7.8b},  [x0], x1
-    ld1             {v0.8b},  [x0], x1
-    ld1             {v1.8b},  [x0], x1
-    ld1             {v2.8b},  [x0], x1
-    ld1             {v3.8b},  [x0], x1
-    ld1             {v4.d}[1],  [x0], x1
-    ld1             {v5.d}[1],  [x0], x1
-    ld1             {v6.d}[1],  [x0], x1
-    ld1             {v7.d}[1],  [x0], x1
-    ld1             {v0.d}[1],  [x0], x1
-    ld1             {v1.d}[1],  [x0], x1
-    ld1             {v2.d}[1],  [x0], x1
-    ld1             {v3.d}[1],  [x0], x1
-
-    transpose_8x16B v4, v5, v6, v7, v0, v1, v2, v3, v21, v23
-
-    h264_loop_filter_luma_intra
-
-    transpose_8x16B v4, v5, v6, v7, v0, v1, v2, v3, v21, v23
-
-    sub             x0,  x0,  x1, lsl #4
-    st1             {v4.8b},  [x0], x1
-    st1             {v5.8b},  [x0], x1
-    st1             {v6.8b},  [x0], x1
-    st1             {v7.8b},  [x0], x1
-    st1             {v0.8b},  [x0], x1
-    st1             {v1.8b},  [x0], x1
-    st1             {v2.8b},  [x0], x1
-    st1             {v3.8b},  [x0], x1
-    st1             {v4.d}[1],  [x0], x1
-    st1             {v5.d}[1],  [x0], x1
-    st1             {v6.d}[1],  [x0], x1
-    st1             {v7.d}[1],  [x0], x1
-    st1             {v0.d}[1],  [x0], x1
-    st1             {v1.d}[1],  [x0], x1
-    st1             {v2.d}[1],  [x0], x1
-    st1             {v3.d}[1],  [x0], x1
-9:
-    ret
-endfunc
-
 .macro  h264_loop_filter_chroma
        dup             v22.8B, w2              // alpha
-        dup             v23.8B, w3              // beta
        uxtl            v24.8H, v24.8B
        uabd            v26.8B, v16.8B, v0.8B   // abs(p0 - q0)
-        uabd            v28.8B, v18.8B, v16.8B  // abs(p1 - p0)
-        uabd            v30.8B, v2.8B,  v0.8B   // abs(q1 - q0)
-        cmhi            v26.8B, v22.8B, v26.8B  // < alpha
-        cmhi            v28.8B, v23.8B, v28.8B  // < beta
-        cmhi            v30.8B, v23.8B, v30.8B  // < beta
        uxtl            v4.8H,  v0.8B
-        and             v26.8B, v26.8B, v28.8B
+        uabd            v28.8B, v18.8B, v16.8B  // abs(p1 - p0)
        usubw           v4.8H,  v4.8H,  v16.8B
-        and             v26.8B, v26.8B, v30.8B
-        shl             v4.8H,  v4.8H,  #2
-        mov             x8,  v26.d[0]
        sli             v24.8H, v24.8H, #8
+        shl             v4.8H,  v4.8H,  #2
+        uabd            v30.8B, v2.8B,  v0.8B   // abs(q1 - q0)
        uaddw           v4.8H,  v4.8H,  v18.8B
-        cbz             x8,  9f
+        cmhi            v26.8B, v22.8B, v26.8B  // < alpha
        usubw           v4.8H,  v4.8H,  v2.8B
+        dup             v22.8B, w3              // beta
        rshrn           v4.8B,  v4.8H,  #3
+        cmhi            v28.8B, v22.8B, v28.8B  // < beta
+        cmhi            v30.8B, v22.8B, v30.8B  // < beta
        smin            v4.8B,  v4.8B,  v24.8B
        neg             v25.8B, v24.8B
+        and             v26.8B, v26.8B, v28.8B
        smax            v4.8B,  v4.8B,  v25.8B
+        and             v26.8B, v26.8B, v30.8B
        uxtl            v22.8H, v0.8B
        and             v4.8B,  v4.8B,  v26.8B
        uxtl            v28.8H, v16.8B
@@ -414,7 +210,6 @@ endfunc

 function ff_h264_v_loop_filter_chroma_neon, export=1
        h264_loop_filter_start
-        sxtw            x1,  w1

        sub             x0,  x0,  x1, lsl #1
        ld1             {v18.8B}, [x0], x1
@@ -427,16 +222,14 @@ function ff_h264_v_loop_filter_chroma_neon, export=1
        sub             x0,  x0,  x1, lsl #1
        st1             {v16.8B}, [x0], x1
        st1             {v0.8B},  [x0], x1
-9:
+
        ret
 endfunc

 function ff_h264_h_loop_filter_chroma_neon, export=1
        h264_loop_filter_start
-        sxtw            x1,  w1

        sub             x0,  x0,  #2
-h_loop_filter_chroma420:
        ld1             {v18.S}[0], [x0], x1
        ld1             {v16.S}[0], [x0], x1
        ld1             {v0.S}[0],  [x0], x1
@@ -461,134 +254,10 @@ h_loop_filter_chroma420:
        st1             {v16.S}[1], [x0], x1
        st1             {v0.S}[1],  [x0], x1
        st1             {v2.S}[1],  [x0], x1
-9:
+
        ret
 endfunc

-function ff_h264_h_loop_filter_chroma422_neon, export=1
-        sxtw            x1,  w1
-        h264_loop_filter_start
-        add             x5,  x0,  x1
-        sub             x0,  x0,  #2
-        add             x1,  x1,  x1
-        mov             x7,  x30
-        bl              h_loop_filter_chroma420
-        mov             x30, x7
-        sub             x0,  x5,  #2
-        mov             v24.s[0], w6
-        b               h_loop_filter_chroma420
-endfunc
-
-.macro h264_loop_filter_chroma_intra
-    uabd            v26.8b, v16.8b, v17.8b  // abs(p0 - q0)
-    uabd            v27.8b, v18.8b, v16.8b  // abs(p1 - p0)
-    uabd            v28.8b, v19.8b, v17.8b  // abs(q1 - q0)
-    cmhi            v26.8b, v30.8b, v26.8b  // < alpha
-    cmhi            v27.8b, v31.8b, v27.8b  // < beta
-    cmhi            v28.8b, v31.8b, v28.8b  // < beta
-    and             v26.8b, v26.8b, v27.8b
-    and             v26.8b, v26.8b, v28.8b
-    mov             x2, v26.d[0]
-
-    ushll           v4.8h,   v18.8b,  #1
-    ushll           v6.8h,   v19.8b,  #1
-    cbz             x2, 9f
-    uaddl           v20.8h,  v16.8b,  v19.8b
-    uaddl           v22.8h,  v17.8b,  v18.8b
-    add             v20.8h,  v20.8h,  v4.8h
-    add             v22.8h,  v22.8h,  v6.8h
-    uqrshrn         v24.8b,  v20.8h,  #2
-    uqrshrn         v25.8b,  v22.8h,  #2
-    bit             v16.8b, v24.8b, v26.8b
-    bit             v17.8b, v25.8b, v26.8b
-.endm
-
-function ff_h264_v_loop_filter_chroma_intra_neon, export=1
-    h264_loop_filter_start_intra
-
-    sub             x0,  x0,  x1, lsl #1
-    ld1             {v18.8b}, [x0], x1
-    ld1             {v16.8b}, [x0], x1
-    ld1             {v17.8b}, [x0], x1
-    ld1             {v19.8b}, [x0]
-
-    h264_loop_filter_chroma_intra
-
-    sub             x0,  x0,  x1, lsl #1
-    st1             {v16.8b}, [x0], x1
-    st1             {v17.8b}, [x0], x1
-
-9:
-    ret
-endfunc
-
-function ff_h264_h_loop_filter_chroma_mbaff_intra_neon, export=1
-    h264_loop_filter_start_intra
-
-    sub             x4,  x0,  #2
-    sub             x0,  x0,  #1
-    ld1             {v18.8b}, [x4], x1
-    ld1             {v16.8b}, [x4], x1
-    ld1             {v17.8b}, [x4], x1
-    ld1             {v19.8b}, [x4], x1
-
-    transpose_4x8B v18, v16, v17, v19, v26, v27, v28, v29
-
-    h264_loop_filter_chroma_intra
-
-    st2             {v16.b,v17.b}[0], [x0], x1
-    st2             {v16.b,v17.b}[1], [x0], x1
-    st2             {v16.b,v17.b}[2], [x0], x1
-    st2             {v16.b,v17.b}[3], [x0], x1
-
-9:
-    ret
-endfunc
-
-function ff_h264_h_loop_filter_chroma_intra_neon, export=1
-    h264_loop_filter_start_intra
-
-    sub             x4,  x0,  #2
-    sub             x0,  x0,  #1
-h_loop_filter_chroma420_intra:
-    ld1             {v18.8b}, [x4], x1
-    ld1             {v16.8b}, [x4], x1
-    ld1             {v17.8b}, [x4], x1
-    ld1             {v19.8b}, [x4], x1
-    ld1             {v18.s}[1], [x4], x1
-    ld1             {v16.s}[1], [x4], x1
-    ld1             {v17.s}[1], [x4], x1
-    ld1             {v19.s}[1], [x4], x1
-
-    transpose_4x8B v18, v16, v17, v19, v26, v27, v28, v29
-
-    h264_loop_filter_chroma_intra
-
-    st2             {v16.b,v17.b}[0], [x0], x1
-    st2             {v16.b,v17.b}[1], [x0], x1
-    st2             {v16.b,v17.b}[2], [x0], x1
-    st2             {v16.b,v17.b}[3], [x0], x1
-    st2             {v16.b,v17.b}[4], [x0], x1
-    st2             {v16.b,v17.b}[5], [x0], x1
-    st2             {v16.b,v17.b}[6], [x0], x1
-    st2             {v16.b,v17.b}[7], [x0], x1
-
-9:
-    ret
-endfunc
-
-function ff_h264_h_loop_filter_chroma422_intra_neon, export=1
-    h264_loop_filter_start_intra
-    sub             x4,  x0,  #2
-    add             x5,  x0,  x1, lsl #3
-    sub             x0,  x0,  #1
-    mov             x7,  x30
-    bl              h_loop_filter_chroma420_intra
-    sub             x0,  x5,  #1
-    mov             x30, x7
-    b               h_loop_filter_chroma420_intra
-endfunc
-
 .macro  biweight_16     macs, macd
        dup             v0.16B,  w5
        dup             v1.16B,  w6
--- a/libavcodec/aarch64/h264idct_neon.S
+++ b/libavcodec/aarch64/h264idct_neon.S
@@ -23,7 +23,6 @@
 #include "neon.S"

 function ff_h264_idct_add_neon, export=1
-.L_ff_h264_idct_add_neon:
        ld1             {v0.4H, v1.4H, v2.4H, v3.4H},  [x1]
        sxtw            x2,     w2
        movi            v30.8H, #0
@@ -78,7 +77,6 @@ function ff_h264_idct_add_neon, export=1
 endfunc

 function ff_h264_idct_dc_add_neon, export=1
-.L_ff_h264_idct_dc_add_neon:
        sxtw            x2,  w2
        mov             w3,       #0
        ld1r            {v2.8H},  [x1]
@@ -108,8 +106,8 @@ function ff_h264_idct_add16_neon, export=1
        mov             w9,  w3         // stride
        movrel          x7,  scan8
        mov             x10, #16
-        movrel          x13, .L_ff_h264_idct_dc_add_neon
-        movrel          x14, .L_ff_h264_idct_add_neon
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
 1:      mov             w2,  w9
        ldrb            w3,  [x7], #1
        ldrsw           x0,  [x5], #4
@@ -135,8 +133,8 @@ function ff_h264_idct_add16intra_neon, export=1
        mov             w9,  w3         // stride
        movrel          x7,  scan8
        mov             x10, #16
-        movrel          x13, .L_ff_h264_idct_dc_add_neon
-        movrel          x14, .L_ff_h264_idct_add_neon
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
 1:      mov             w2,  w9
        ldrb            w3,  [x7], #1
        ldrsw           x0,  [x5], #4
@@ -162,8 +160,8 @@ function ff_h264_idct_add8_neon, export=1
        add             x5,  x1,  #16*4         // block_offset
        add             x9,  x2,  #16*32        // block
        mov             w19, w3                 // stride
-        movrel          x13, .L_ff_h264_idct_dc_add_neon
-        movrel          x14, .L_ff_h264_idct_add_neon
+        movrel          x13, X(ff_h264_idct_dc_add_neon)
+        movrel          x14, X(ff_h264_idct_add_neon)
        movrel          x7,  scan8, 16
        mov             x10, #0
        mov             x11, #16
@@ -265,7 +263,6 @@ endfunc
 .endm

 function ff_h264_idct8_add_neon, export=1
-.L_ff_h264_idct8_add_neon:
        movi            v19.8H,   #0
        sxtw            x2,       w2
        ld1             {v24.8H, v25.8H}, [x1]
@@ -329,7 +326,6 @@ function ff_h264_idct8_add_neon, export=1
 endfunc

 function ff_h264_idct8_dc_add_neon, export=1
-.L_ff_h264_idct8_dc_add_neon:
        mov             w3,       #0
        sxtw            x2,       w2
        ld1r            {v31.8H}, [x1]
@@ -379,8 +375,8 @@ function ff_h264_idct8_add4_neon, export=1
        mov             w2,  w3
        movrel          x7,  scan8
        mov             w10, #16
-        movrel          x13, .L_ff_h264_idct8_dc_add_neon
-        movrel          x14, .L_ff_h264_idct8_add_neon
+        movrel          x13, X(ff_h264_idct8_dc_add_neon)
+        movrel          x14, X(ff_h264_idct8_add_neon)
 1:      ldrb            w9,  [x7], #4
        ldrsw           x0,  [x5], #16
        ldrb            w9,  [x4, w9, UXTW]
--- a/libavcodec/aarch64/opusdsp_init.c
+++ b/libavcodec/aarch64/opusdsp_init.c
@@ -1,35 +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 "config.h"
-
-#include "libavutil/aarch64/cpu.h"
-#include "libavcodec/opusdsp.h"
-
-void ff_opus_postfilter_neon(float *data, int period, float *gains, int len);
-float ff_opus_deemphasis_neon(float *out, float *in, float coeff, int len);
-
-av_cold void ff_opus_dsp_init_aarch64(OpusDSP *ctx)
-{
-    int cpu_flags = av_get_cpu_flags();
-
-    if (have_neon(cpu_flags)) {
-        ctx->postfilter = ff_opus_postfilter_neon;
-        ctx->deemphasis = ff_opus_deemphasis_neon;
-    }
-}
--- a/libavcodec/aarch64/opusdsp_neon.S
+++ b/libavcodec/aarch64/opusdsp_neon.S
@@ -1,113 +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 "libavutil/aarch64/asm.S"
-
-           // 0.85..^1    0.85..^2    0.85..^3    0.85..^4
-const tab_st, align=4
-        .word 0x3f599a00, 0x3f38f671, 0x3f1d382a, 0x3f05a32f
-endconst
-const tab_x0, align=4
-        .word 0x0,        0x3f599a00, 0x3f38f671, 0x3f1d382a
-endconst
-const tab_x1, align=4
-        .word 0x0,        0x0,        0x3f599a00, 0x3f38f671
-endconst
-const tab_x2, align=4
-        .word 0x0,        0x0,        0x0,        0x3f599a00
-endconst
-
-function ff_opus_deemphasis_neon, export=1
-        movrel  x4, tab_st
-        ld1    {v4.4s}, [x4]
-        movrel  x4, tab_x0
-        ld1    {v5.4s}, [x4]
-        movrel  x4, tab_x1
-        ld1    {v6.4s}, [x4]
-        movrel  x4, tab_x2
-        ld1    {v7.4s}, [x4]
-
-        fmul v0.4s, v4.4s, v0.s[0]
-
-1:      ld1  {v1.4s, v2.4s}, [x1], #32
-
-        fmla v0.4s, v5.4s, v1.s[0]
-        fmul v3.4s, v7.4s, v2.s[2]
-
-        fmla v0.4s, v6.4s, v1.s[1]
-        fmla v3.4s, v6.4s, v2.s[1]
-
-        fmla v0.4s, v7.4s, v1.s[2]
-        fmla v3.4s, v5.4s, v2.s[0]
-
-        fadd v1.4s, v1.4s, v0.4s
-        fadd v2.4s, v2.4s, v3.4s
-
-        fmla v2.4s, v4.4s, v1.s[3]
-
-        st1  {v1.4s, v2.4s}, [x0], #32
-        fmul v0.4s, v4.4s, v2.s[3]
-
-        subs w2, w2, #8
-        b.gt 1b
-
-        mov s0, v2.s[3]
-
-        ret
-endfunc
-
-function ff_opus_postfilter_neon, export=1
-        ld1 {v0.4s}, [x2]
-        dup v1.4s, v0.s[1]
-        dup v2.4s, v0.s[2]
-        dup v0.4s, v0.s[0]
-
-        add w1, w1, #2
-        sub x1, x0, x1, lsl #2
-
-        ld1 {v3.4s}, [x1]
-        fmul v3.4s, v3.4s, v2.4s
-
-1:      add x1, x1, #4
-        ld1 {v4.4s}, [x1]
-        add x1, x1, #4
-        ld1 {v5.4s}, [x1]
-        add x1, x1, #4
-        ld1 {v6.4s}, [x1]
-        add x1, x1, #4
-        ld1 {v7.4s}, [x1]
-
-        fmla v3.4s, v7.4s, v2.4s
-        fadd v6.4s, v6.4s, v4.4s
-
-        ld1 {v8.4s}, [x0]
-        fmla v8.4s, v5.4s, v0.4s
-
-        fmul v6.4s, v6.4s, v1.4s
-        fadd v6.4s, v6.4s, v3.4s
-
-        fadd v8.4s, v8.4s, v6.4s
-        fmul v3.4s, v7.4s, v2.4s
-
-        st1  {v8.4s}, [x0], #16
-
-        subs w3, w3, #4
-        b.gt 1b
-
-        ret
-endfunc
--- a/libavcodec/aarch64/vp8dsp.h
+++ b/libavcodec/aarch64/vp8dsp.h
@@ -1,75 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AARCH64_VP8DSP_H
-#define AVCODEC_AARCH64_VP8DSP_H
-
-#include "libavcodec/vp8dsp.h"
-
-#define VP8_LF_Y(hv, inner, opt)                                             \
-    void ff_vp8_##hv##_loop_filter16##inner##_##opt(uint8_t *dst,            \
-                                                    ptrdiff_t stride,        \
-                                                    int flim_E, int flim_I,  \
-                                                    int hev_thresh)
-
-#define VP8_LF_UV(hv, inner, opt)                                            \
-    void ff_vp8_##hv##_loop_filter8uv##inner##_##opt(uint8_t *dstU,          \
-                                                     uint8_t *dstV,          \
-                                                     ptrdiff_t stride,       \
-                                                     int flim_E, int flim_I, \
-                                                     int hev_thresh)
-
-#define VP8_LF_SIMPLE(hv, opt)                                          \
-    void ff_vp8_##hv##_loop_filter16_simple_##opt(uint8_t *dst,         \
-                                                  ptrdiff_t stride,     \
-                                                  int flim)
-
-#define VP8_LF_HV(inner, opt)                   \
-    VP8_LF_Y(h,  inner, opt);                   \
-    VP8_LF_Y(v,  inner, opt);                   \
-    VP8_LF_UV(h, inner, opt);                   \
-    VP8_LF_UV(v, inner, opt)
-
-#define VP8_LF(opt)                             \
-    VP8_LF_HV(,       opt);                     \
-    VP8_LF_HV(_inner, opt);                     \
-    VP8_LF_SIMPLE(h, opt);                      \
-    VP8_LF_SIMPLE(v, opt)
-
-#define VP8_MC(n, opt)                                                  \
-    void ff_put_vp8_##n##_##opt(uint8_t *dst, ptrdiff_t dststride,      \
-                                uint8_t *src, ptrdiff_t srcstride,      \
-                                int h, int x, int y)
-
-#define VP8_EPEL(w, opt)                        \
-    VP8_MC(pixels ## w, opt);                   \
-    VP8_MC(epel ## w ## _h4, opt);              \
-    VP8_MC(epel ## w ## _h6, opt);              \
-    VP8_MC(epel ## w ## _v4, opt);              \
-    VP8_MC(epel ## w ## _h4v4, opt);            \
-    VP8_MC(epel ## w ## _h6v4, opt);            \
-    VP8_MC(epel ## w ## _v6, opt);              \
-    VP8_MC(epel ## w ## _h4v6, opt);            \
-    VP8_MC(epel ## w ## _h6v6, opt)
-
-#define VP8_BILIN(w, opt)                       \
-    VP8_MC(bilin ## w ## _h, opt);              \
-    VP8_MC(bilin ## w ## _v, opt);              \
-    VP8_MC(bilin ## w ## _hv, opt)
-
-#endif /* AVCODEC_AARCH64_VP8DSP_H */
--- a/libavcodec/aarch64/vp8dsp_init_aarch64.c
+++ b/libavcodec/aarch64/vp8dsp_init_aarch64.c
@@ -1,124 +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 <stdint.h>
-
-#include "libavutil/attributes.h"
-#include "libavutil/aarch64/cpu.h"
-#include "libavcodec/vp8dsp.h"
-#include "vp8dsp.h"
-
-void ff_vp8_luma_dc_wht_neon(int16_t block[4][4][16], int16_t dc[16]);
-
-void ff_vp8_idct_add_neon(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add_neon(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add4y_neon(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add4uv_neon(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
-
-VP8_LF(neon);
-
-VP8_EPEL(16, neon);
-VP8_EPEL(8,  neon);
-VP8_EPEL(4,  neon);
-
-VP8_BILIN(16, neon);
-VP8_BILIN(8,  neon);
-VP8_BILIN(4,  neon);
-
-av_cold void ff_vp78dsp_init_aarch64(VP8DSPContext *dsp)
-{
-    if (!have_neon(av_get_cpu_flags()))
-        return;
-    dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
-    dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_neon;
-    dsp->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_neon;
-    dsp->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_neon;
-
-    dsp->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
-    dsp->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_neon;
-    dsp->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_neon;
-    dsp->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_neon;
-    dsp->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_neon;
-    dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_neon;
-    dsp->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_neon;
-    dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_neon;
-    dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_neon;
-
-    dsp->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_neon;
-    dsp->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_neon;
-    dsp->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_neon;
-    dsp->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_neon;
-    dsp->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_neon;
-    dsp->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_neon;
-    dsp->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_neon;
-    dsp->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_neon;
-
-    dsp->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][1][0] = ff_put_vp8_bilin16_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][1][1] = ff_put_vp8_bilin16_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][1][2] = ff_put_vp8_bilin16_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][2][1] = ff_put_vp8_bilin16_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_neon;
-
-    dsp->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_neon;
-
-    dsp->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_neon;
-    dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_neon;
-}
-
-av_cold void ff_vp8dsp_init_aarch64(VP8DSPContext *dsp)
-{
-    if (!have_neon(av_get_cpu_flags()))
-        return;
-    dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_neon;
-
-    dsp->vp8_idct_add       = ff_vp8_idct_add_neon;
-    dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_neon;
-    dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_neon;
-    dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_neon;
-
-    dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon;
-    dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon;
-    dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon;
-    dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon;
-
-    dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_neon;
-    dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_neon;
-    dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_neon;
-    dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_neon;
-
-    dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_neon;
-    dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_neon;
-}
--- a/libavcodec/aarch64/vp8dsp_neon.S
+++ b/libavcodec/aarch64/vp8dsp_neon.S
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -452,7 +452,7 @@ static int decode_exponents(AC3DecodeContext *s,
        prevexp += dexp[i] - 2;
        if (prevexp > 24U) {
            av_log(s->avctx, AV_LOG_ERROR, "exponent %d is out-of-range\n", prevexp);
-            return AVERROR_INVALIDDATA;
+            return -1;
        }
        switch (group_size) {
        case 4: dexps[j++] = prevexp;
@@ -1467,8 +1467,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
    int buf_size, full_buf_size = avpkt->size;
    AC3DecodeContext *s = avctx->priv_data;
    int blk, ch, err, offset, ret;
-    int i;
-    int skip = 0, got_independent_frame = 0;
+    int got_independent_frame = 0;
    const uint8_t *channel_map;
    uint8_t extended_channel_map[EAC3_MAX_CHANNELS];
    const SHORTFLOAT *output[AC3_MAX_CHANNELS];
@@ -1478,23 +1477,6 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
    s->superframe_size = 0;

    buf_size = full_buf_size;
-    for (i = 1; i < buf_size; i += 2) {
-        if (buf[i] == 0x77 || buf[i] == 0x0B) {
-            if ((buf[i] ^ buf[i-1]) == (0x77 ^ 0x0B)) {
-                i--;
-                break;
-            } else if ((buf[i] ^ buf[i+1]) == (0x77 ^ 0x0B)) {
-                break;
-            }
-        }
-    }
-    if (i >= buf_size)
-        return AVERROR_INVALIDDATA;
-    if (i > 10)
-        return i;
-    buf += i;
-    buf_size -= i;
-
    /* copy input buffer to decoder context to avoid reading past the end
       of the buffer, which can be caused by a damaged input stream. */
    if (buf_size >= 2 && AV_RB16(buf) == 0x770B) {
@@ -1655,11 +1637,6 @@ dependent_frame:
        AC3HeaderInfo hdr;
        int err;

-        if (buf_size - s->frame_size <= 16) {
-            skip = buf_size - s->frame_size;
-            goto skip;
-        }
-
        if ((ret = init_get_bits8(&s->gbc, buf + s->frame_size, buf_size - s->frame_size)) < 0)
            return ret;

@@ -1680,7 +1657,6 @@ dependent_frame:
            }
        }
    }
-skip:

    frame->decode_error_flags = err ? FF_DECODE_ERROR_INVALID_BITSTREAM : 0;

@@ -1820,9 +1796,9 @@ skip:
    *got_frame_ptr = 1;

    if (!s->superframe_size)
-        return FFMIN(full_buf_size, s->frame_size + skip);
+        return FFMIN(full_buf_size, s->frame_size);

-    return FFMIN(full_buf_size, s->superframe_size + skip);
+    return FFMIN(full_buf_size, s->superframe_size);
 }

 /**
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -652,7 +652,7 @@ void ff_ac3_process_exponents(AC3EncodeContext *s)
 */
 static void count_frame_bits_fixed(AC3EncodeContext *s)
 {
-    static const uint8_t frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
+    static const int frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
    int blk;
    int frame_bits;

@@ -1800,7 +1800,7 @@ static int validate_float_option(float v, const float *v_list, int v_list_size)
            break;
    }
    if (i == v_list_size)
-        return AVERROR(EINVAL);
+        return -1;

    return i;
 }
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -118,7 +118,7 @@ int16_t ff_acelp_decode_gain_code(
               (mr_energy >> 15) - 25
           );
 #else
-    mr_energy = gain_corr_factor * ff_exp10((double)mr_energy / (20 << 23)) /
+    mr_energy = gain_corr_factor * exp(M_LN10 / (20 << 23) * mr_energy) /
                sqrt(adsp->scalarproduct_int16(fc_v, fc_v, subframe_size));
    return mr_energy >> 12;
 #endif
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -57,7 +57,7 @@
 */

 /* These are for CD-ROM XA ADPCM */
-static const int8_t xa_adpcm_table[5][2] = {
+static const int xa_adpcm_table[5][2] = {
    {   0,   0 },
    {  60,   0 },
    { 115, -52 },
@@ -65,7 +65,7 @@ static const int8_t xa_adpcm_table[5][2] = {
    { 122, -60 }
 };

-static const int16_t ea_adpcm_table[] = {
+static const int ea_adpcm_table[] = {
    0,  240,  460,  392,
    0,    0, -208, -220,
    0,    1,    3,    4,
@@ -74,7 +74,7 @@ static const int16_t ea_adpcm_table[] = {
 };

 // padded to zero where table size is less then 16
-static const int8_t swf_index_tables[4][16] = {
+static const int swf_index_tables[4][16] = {
    /*2*/ { -1, 2 },
    /*3*/ { -1, -1, 2, 4 },
    /*4*/ { -1, -1, -1, -1, 2, 4, 6, 8 },
@@ -177,50 +177,6 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
    return 0;
 }

-static inline int16_t adpcm_agm_expand_nibble(ADPCMChannelStatus *c, int8_t nibble)
-{
-    int delta, pred, step, add;
-
-    pred = c->predictor;
-    delta = nibble & 7;
-    step = c->step;
-    add = (delta * 2 + 1) * step;
-    if (add < 0)
-        add = add + 7;
-
-    if ((nibble & 8) == 0)
-        pred = av_clip(pred + (add >> 3), -32767, 32767);
-    else
-        pred = av_clip(pred - (add >> 3), -32767, 32767);
-
-    switch (delta) {
-    case 7:
-        step *= 0x99;
-        break;
-    case 6:
-        c->step = av_clip(c->step * 2, 127, 24576);
-        c->predictor = pred;
-        return pred;
-    case 5:
-        step *= 0x66;
-        break;
-    case 4:
-        step *= 0x4d;
-        break;
-    default:
-        step *= 0x39;
-        break;
-    }
-
-    if (step < 0)
-        step += 0x3f;
-
-    c->step = step >> 6;
-    c->step = av_clip(c->step, 127, 24576);
-    c->predictor = pred;
-    return pred;
-}
-
 static inline int16_t adpcm_ima_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int shift)
 {
    int step_index;
@@ -484,7 +440,7 @@ static void adpcm_swf_decode(AVCodecContext *avctx, const uint8_t *buf, int buf_
 {
    ADPCMDecodeContext *c = avctx->priv_data;
    GetBitContext gb;
-    const int8_t *table;
+    const int *table;
    int k0, signmask, nb_bits, count;
    int size = buf_size*8;
    int i;
@@ -593,7 +549,6 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
    header_size = 0;
    switch (avctx->codec->id) {
        case AV_CODEC_ID_ADPCM_4XM:
-        case AV_CODEC_ID_ADPCM_AGM:
        case AV_CODEC_ID_ADPCM_IMA_DAT4:
        case AV_CODEC_ID_ADPCM_IMA_ISS:     header_size = 4 * ch;      break;
        case AV_CODEC_ID_ADPCM_IMA_AMV:     header_size = 8;           break;
@@ -908,18 +863,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
            }
        }
        break;
-    case AV_CODEC_ID_ADPCM_AGM:
-        for (i = 0; i < avctx->channels; i++)
-            c->status[i].predictor = sign_extend(bytestream2_get_le16u(&gb), 16);
-        for (i = 0; i < avctx->channels; i++)
-            c->status[i].step = sign_extend(bytestream2_get_le16u(&gb), 16);
-
-        for (n = 0; n < nb_samples >> (1 - st); n++) {
-            int v = bytestream2_get_byteu(&gb);
-            *samples++ = adpcm_agm_expand_nibble(&c->status[0], v & 0xF);
-            *samples++ = adpcm_agm_expand_nibble(&c->status[st], v >> 4 );
-        }
-        break;
    case AV_CODEC_ID_ADPCM_MS:
    {
        int block_predictor;
@@ -1736,7 +1679,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
        break;

    default:
-        av_assert0(0); // unsupported codec_id should not happen
+        return -1;
    }

    if (avpkt->size && bytestream2_tell(&gb) == 0) {
@@ -1786,7 +1729,6 @@ AVCodec ff_ ## name_ ## _decoder = {                        \
 /* Note: Do not forget to add new entries to the Makefile as well. */
 ADPCM_DECODER(AV_CODEC_ID_ADPCM_4XM,         sample_fmts_s16p, adpcm_4xm,         "ADPCM 4X Movie");
 ADPCM_DECODER(AV_CODEC_ID_ADPCM_AFC,         sample_fmts_s16p, adpcm_afc,         "ADPCM Nintendo Gamecube AFC");
-ADPCM_DECODER(AV_CODEC_ID_ADPCM_AGM,         sample_fmts_s16,  adpcm_agm,         "ADPCM AmuseGraphics Movie");
 ADPCM_DECODER(AV_CODEC_ID_ADPCM_AICA,        sample_fmts_s16p, adpcm_aica,        "ADPCM Yamaha AICA");
 ADPCM_DECODER(AV_CODEC_ID_ADPCM_CT,          sample_fmts_s16,  adpcm_ct,          "ADPCM Creative Technology");
 ADPCM_DECODER(AV_CODEC_ID_ADPCM_DTK,         sample_fmts_s16p, adpcm_dtk,         "ADPCM Nintendo Gamecube DTK");
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -42,9 +42,9 @@ enum AICBands {
    NUM_BANDS
 };

-static const uint8_t aic_num_band_coeffs[NUM_BANDS] = { 64, 32, 192, 96 };
+static const int aic_num_band_coeffs[NUM_BANDS] = { 64, 32, 192, 96 };

-static const uint16_t aic_band_off[NUM_BANDS] = { 0, 64, 96, 288 };
+static const int aic_band_off[NUM_BANDS] = { 0, 64, 96, 288 };

 static const uint8_t aic_quant_matrix[64] = {
     8, 16, 19, 22, 22, 26, 26, 27,
@@ -208,9 +208,6 @@ static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
    int mb, idx;
    unsigned val;

-    if (get_bits_left(gb) < 5)
-        return AVERROR_INVALIDDATA;
-
    has_skips  = get_bits1(gb);
    coeff_type = get_bits1(gb);
    coeff_bits = get_bits(gb, 3);
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -121,7 +121,7 @@ static int rice_decompress(ALACContext *alac, int32_t *output_buffer,
        unsigned int x;

        if(get_bits_left(&alac->gb) <= 0)
-            return AVERROR_INVALIDDATA;
+            return -1;

        /* calculate rice param and decode next value */
        k = av_log2((history >> 9) + 3);
@@ -306,7 +306,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
            rice_history_mult[ch] = get_bits(&alac->gb, 3);
            lpc_order[ch]         = get_bits(&alac->gb, 5);

-            if (lpc_order[ch] >= alac->max_samples_per_frame || !lpc_quant[ch])
+            if (lpc_order[ch] >= alac->max_samples_per_frame)
                return AVERROR_INVALIDDATA;

            /* read the predictor table */
@@ -317,7 +317,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
        if (alac->extra_bits) {
            for (i = 0; i < alac->nb_samples; i++) {
                if(get_bits_left(&alac->gb) <= 0)
-                    return AVERROR_INVALIDDATA;
+                    return -1;
                for (ch = 0; ch < channels; ch++)
                    alac->extra_bits_buffer[ch][i] = get_bits(&alac->gb, alac->extra_bits);
            }
@@ -353,7 +353,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
        /* not compressed, easy case */
        for (i = 0; i < alac->nb_samples; i++) {
            if(get_bits_left(&alac->gb) <= 0)
-                return AVERROR_INVALIDDATA;
+                return -1;
            for (ch = 0; ch < channels; ch++) {
                alac->output_samples_buffer[ch][i] =
                         get_sbits_long(&alac->gb, alac->sample_size);
@@ -486,7 +486,7 @@ static av_cold int alac_decode_close(AVCodecContext *avctx)
 static int allocate_buffers(ALACContext *alac)
 {
    int ch;
-    unsigned buf_size = alac->max_samples_per_frame * sizeof(int32_t);
+    int buf_size = alac->max_samples_per_frame * sizeof(int32_t);

    for (ch = 0; ch < 2; ch++) {
        alac->predict_error_buffer[ch]  = NULL;
@@ -555,9 +555,9 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
        av_log(avctx, AV_LOG_ERROR, "extradata is too small\n");
        return AVERROR_INVALIDDATA;
    }
-    if ((ret = alac_set_info(alac)) < 0) {
+    if (alac_set_info(alac)) {
        av_log(avctx, AV_LOG_ERROR, "set_info failed\n");
-        return ret;
+        return -1;
    }

    switch (alac->sample_size) {
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -35,14 +35,12 @@ extern AVCodec ff_aasc_decoder;
 extern AVCodec ff_aic_decoder;
 extern AVCodec ff_alias_pix_encoder;
 extern AVCodec ff_alias_pix_decoder;
-extern AVCodec ff_agm_decoder;
 extern AVCodec ff_amv_encoder;
 extern AVCodec ff_amv_decoder;
 extern AVCodec ff_anm_decoder;
 extern AVCodec ff_ansi_decoder;
 extern AVCodec ff_apng_encoder;
 extern AVCodec ff_apng_decoder;
-extern AVCodec ff_arbc_decoder;
 extern AVCodec ff_asv1_encoder;
 extern AVCodec ff_asv1_decoder;
 extern AVCodec ff_asv2_encoder;
@@ -154,7 +152,6 @@ extern AVCodec ff_hq_hqa_decoder;
 extern AVCodec ff_hqx_decoder;
 extern AVCodec ff_huffyuv_encoder;
 extern AVCodec ff_huffyuv_decoder;
-extern AVCodec ff_hymt_decoder;
 extern AVCodec ff_idcin_decoder;
 extern AVCodec ff_iff_ilbm_decoder;
 extern AVCodec ff_imm4_decoder;
@@ -173,7 +170,6 @@ extern AVCodec ff_kmvc_decoder;
 extern AVCodec ff_lagarith_decoder;
 extern AVCodec ff_ljpeg_encoder;
 extern AVCodec ff_loco_decoder;
-extern AVCodec ff_lscr_decoder;
 extern AVCodec ff_m101_decoder;
 extern AVCodec ff_magicyuv_encoder;
 extern AVCodec ff_magicyuv_decoder;
@@ -330,7 +326,6 @@ extern AVCodec ff_vcr1_decoder;
 extern AVCodec ff_vmdvideo_decoder;
 extern AVCodec ff_vmnc_decoder;
 extern AVCodec ff_vp3_decoder;
-extern AVCodec ff_vp4_decoder;
 extern AVCodec ff_vp5_decoder;
 extern AVCodec ff_vp6_decoder;
 extern AVCodec ff_vp6a_decoder;
@@ -428,7 +423,6 @@ extern AVCodec ff_g723_1_decoder;
 extern AVCodec ff_g729_decoder;
 extern AVCodec ff_gsm_decoder;
 extern AVCodec ff_gsm_ms_decoder;
-extern AVCodec ff_hcom_decoder;
 extern AVCodec ff_iac_decoder;
 extern AVCodec ff_ilbc_decoder;
 extern AVCodec ff_imc_decoder;
@@ -500,7 +494,6 @@ extern AVCodec ff_xma2_decoder;
 extern AVCodec ff_pcm_alaw_encoder;
 extern AVCodec ff_pcm_alaw_decoder;
 extern AVCodec ff_pcm_bluray_decoder;
-extern AVCodec ff_pcm_dvd_encoder;
 extern AVCodec ff_pcm_dvd_decoder;
 extern AVCodec ff_pcm_f16le_decoder;
 extern AVCodec ff_pcm_f24le_decoder;
@@ -576,7 +569,6 @@ extern AVCodec ff_adpcm_4xm_decoder;
 extern AVCodec ff_adpcm_adx_encoder;
 extern AVCodec ff_adpcm_adx_decoder;
 extern AVCodec ff_adpcm_afc_decoder;
-extern AVCodec ff_adpcm_agm_decoder;
 extern AVCodec ff_adpcm_aica_decoder;
 extern AVCodec ff_adpcm_ct_decoder;
 extern AVCodec ff_adpcm_dtk_decoder;
@@ -681,11 +673,9 @@ extern AVCodec ff_qdmc_at_decoder;
 extern AVCodec ff_qdm2_at_decoder;
 extern AVCodec ff_libaom_av1_decoder;
 extern AVCodec ff_libaom_av1_encoder;
-extern AVCodec ff_libaribb24_decoder;
 extern AVCodec ff_libcelt_decoder;
 extern AVCodec ff_libcodec2_encoder;
 extern AVCodec ff_libcodec2_decoder;
-extern AVCodec ff_libdav1d_decoder;
 extern AVCodec ff_libdavs2_decoder;
 extern AVCodec ff_libfdk_aac_encoder;
 extern AVCodec ff_libfdk_aac_decoder;
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -487,7 +487,7 @@ static void parse_bs_info(const uint32_t bs_info, unsigned int n,
 static int32_t decode_rice(GetBitContext *gb, unsigned int k)
 {
    int max = get_bits_left(gb) - k;
-    unsigned q = get_unary(gb, 0, max);
+    int q   = get_unary(gb, 0, max);
    int r   = k ? get_bits1(gb) : !(q & 1);

    if (k > 1) {
@@ -507,7 +507,7 @@ static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof)
    int i, j;

    for (i = 0, j = k - 1; i < j; i++, j--) {
-        unsigned tmp1 = ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20);
+        int tmp1 = ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20);
        cof[j]  += ((MUL64(par[k], cof[i]) + (1 << 19)) >> 20);
        cof[i]  += tmp1;
    }
@@ -767,8 +767,8 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
        if (*bd->use_ltp) {
            int r, c;

-            bd->ltp_gain[0]   = decode_rice(gb, 1) * 8;
-            bd->ltp_gain[1]   = decode_rice(gb, 2) * 8;
+            bd->ltp_gain[0]   = decode_rice(gb, 1) << 3;
+            bd->ltp_gain[1]   = decode_rice(gb, 2) << 3;

            r                 = get_unary(gb, 0, 4);
            c                 = get_bits(gb, 2);
@@ -779,8 +779,8 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)

            bd->ltp_gain[2]   = ltp_gain_values[r][c];

-            bd->ltp_gain[3]   = decode_rice(gb, 2) * 8;
-            bd->ltp_gain[4]   = decode_rice(gb, 1) * 8;
+            bd->ltp_gain[3]   = decode_rice(gb, 2) << 3;
+            bd->ltp_gain[4]   = decode_rice(gb, 1) << 3;

            *bd->ltp_lag      = get_bits(gb, ctx->ltp_lag_length);
            *bd->ltp_lag     += FFMAX(4, opt_order + 1);
@@ -789,20 +789,14 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)

    // read first value and residuals in case of a random access block
    if (bd->ra_block) {
-        start = FFMIN(opt_order, 3);
-        av_assert0(sb_length <= sconf->frame_length);
-        if (sb_length <= start) {
-            // opt_order or sb_length may be corrupted, either way this is unsupported and not well defined in the specification
-            av_log(avctx, AV_LOG_ERROR, "Sub block length smaller or equal start\n");
-            return AVERROR_PATCHWELCOME;
-        }
-
        if (opt_order)
            bd->raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4);
        if (opt_order > 1)
            bd->raw_samples[1] = decode_rice(gb, FFMIN(s[0] + 3, ctx->s_max));
        if (opt_order > 2)
            bd->raw_samples[2] = decode_rice(gb, FFMIN(s[0] + 1, ctx->s_max));
+
+        start = FFMIN(opt_order, 3);
    }

    // read all residuals
@@ -867,7 +861,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
                    res >>= 1;

                    if (cur_k) {
-                        res  *= 1U << cur_k;
+                        res  *= 1 << cur_k;
                        res  |= get_bits_long(gb, cur_k);
                    }
                }
@@ -980,7 +974,7 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
        y = 1 << 19;

        for (sb = -opt_order; sb < 0; sb++)
-            y += (uint64_t)MUL64(lpc_cof[sb], raw_samples[sb]);
+            y += MUL64(lpc_cof[sb], raw_samples[sb]);

        *raw_samples -= y >> 20;
    }
@@ -1039,7 +1033,7 @@ static int decode_block(ALSDecContext *ctx, ALSBlockData *bd)

    if (*bd->shift_lsbs)
        for (smp = 0; smp < bd->block_length; smp++)
-            bd->raw_samples[smp] = (unsigned)bd->raw_samples[smp] << *bd->shift_lsbs;
+            bd->raw_samples[smp] <<= *bd->shift_lsbs;

    return 0;
 }
@@ -1385,9 +1379,6 @@ static SoftFloat_IEEE754 multiply(SoftFloat_IEEE754 a, SoftFloat_IEEE754 b) {
    mantissa_temp = (uint64_t)a.mant * (uint64_t)b.mant;
    mask_64       = (uint64_t)0x1 << 47;

-    if (!mantissa_temp)
-        return FLOAT_0;
-
    // Count the valid bit count
    while (!(mantissa_temp & mask_64) && mask_64) {
        bit_count--;
@@ -1416,7 +1407,7 @@ static SoftFloat_IEEE754 multiply(SoftFloat_IEEE754 a, SoftFloat_IEEE754 b) {
        return_val = 0x80000000U;
    }

-    return_val |= ((unsigned)av_clip(a.exp + b.exp + bit_count - 47, -126, 127) << 23) & 0x7F800000;
+    return_val |= (a.exp + b.exp + bit_count - 47) << 23;
    return_val |= mantissa;
    return av_bits2sf_ieee754(return_val);
 }
@@ -1805,11 +1796,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
        if (!ctx->cs_switch) {                                                       \
            for (sample = 0; sample < ctx->cur_frame_length; sample++)               \
                for (c = 0; c < avctx->channels; c++)                                \
-                    *dest++ = ctx->raw_samples[c][sample] * (1U << shift);            \
+                    *dest++ = ctx->raw_samples[c][sample] << shift;                  \
        } else {                                                                     \
            for (sample = 0; sample < ctx->cur_frame_length; sample++)               \
                for (c = 0; c < avctx->channels; c++)                                \
-                    *dest++ = ctx->raw_samples[sconf->chan_pos[c]][sample] * (1U << shift); \
+                    *dest++ = ctx->raw_samples[sconf->chan_pos[c]][sample] << shift; \
        }                                                                            \
    }

@@ -1993,8 +1984,6 @@ static av_cold int decode_init(AVCodecContext *avctx)

    // allocate quantized parcor coefficient buffer
    num_buffers = sconf->mc_coding ? avctx->channels : 1;
-    if (num_buffers * (uint64_t)num_buffers > INT_MAX) // protect chan_data_buffer allocation
-        return AVERROR_INVALIDDATA;

    ctx->quant_cof        = av_malloc_array(num_buffers, sizeof(*ctx->quant_cof));
    ctx->lpc_cof          = av_malloc_array(num_buffers, sizeof(*ctx->lpc_cof));
@@ -2127,6 +2116,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
    return 0;

 fail:
+    decode_end(avctx);
    return ret;
 }

@@ -2152,5 +2142,4 @@ AVCodec ff_als_decoder = {
    .decode         = decode_frame,
    .flush          = flush,
    .capabilities   = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -460,7 +460,7 @@ static inline void update_rice(APERice *rice, unsigned int x)

    if (rice->ksum < lim)
        rice->k--;
-    else if (rice->ksum >= (1 << (rice->k + 5)) && rice->k < 24)
+    else if (rice->ksum >= (1 << (rice->k + 5)))
        rice->k++;
 }

@@ -554,7 +554,7 @@ static inline int ape_decode_value_3990(APEContext *ctx, APERice *rice)
    overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);

    if (overflow == (MODEL_ELEMENTS - 1)) {
-        overflow  = (unsigned)range_decode_bits(ctx, 16) << 16;
+        overflow  = range_decode_bits(ctx, 16) << 16;
        overflow |= range_decode_bits(ctx, 16);
    }

@@ -1130,7 +1130,7 @@ static av_always_inline int predictor_update_filter(APEPredictor *p,
                  p->buf[delayA - 3] * p->coeffsA[filter][3];

    /*  Apply a scaled first-order filter compression */
-    p->buf[delayB]     = p->filterA[filter ^ 1] - ((int)(p->filterB[filter] * 31U) >> 5);
+    p->buf[delayB]     = p->filterA[filter ^ 1] - ((p->filterB[filter] * 31) >> 5);
    p->buf[adaptB]     = APESIGN(p->buf[delayB]);
    p->buf[delayB - 1] = p->buf[delayB] - p->buf[delayB - 1];
    p->buf[adaptB - 1] = APESIGN(p->buf[delayB - 1]);
@@ -1142,8 +1142,8 @@ static av_always_inline int predictor_update_filter(APEPredictor *p,
                  p->buf[delayB - 3] * p->coeffsB[filter][3] +
                  p->buf[delayB - 4] * p->coeffsB[filter][4];

-    p->lastA[filter] = decoded + ((int)((unsigned)predictionA + (predictionB >> 1)) >> 10);
-    p->filterA[filter] = p->lastA[filter] + ((int)(p->filterA[filter] * 31U) >> 5);
+    p->lastA[filter] = decoded + ((predictionA + (predictionB >> 1)) >> 10);
+    p->filterA[filter] = p->lastA[filter] + ((p->filterA[filter] * 31) >> 5);

    sign = APESIGN(decoded);
    p->coeffsA[filter][0] += p->buf[adaptA    ] * sign;
@@ -1229,7 +1229,7 @@ static void predictor_decode_mono_3950(APEContext *ctx, int count)
            p->buf = p->historybuffer;
        }

-        p->filterA[0] = currentA + ((int)(p->filterA[0] * 31U) >> 5);
+        p->filterA[0] = currentA + ((p->filterA[0] * 31) >> 5);
        *(decoded0++) = p->filterA[0];
    }

--- a/libavcodec/arbc.c
+++ b/libavcodec/arbc.c
@@ -1,227 +0,0 @@
-/*
- * Gryphon's Anim Compressor decoder
- * Copyright (c) 2019 Paul B Mahol
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "libavutil/imgutils.h"
-#include "libavutil/internal.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/mem.h"
-
-#include "avcodec.h"
-#include "bytestream.h"
-#include "internal.h"
-
-typedef struct ARBCContext {
-    GetByteContext gb;
-
-    AVFrame *prev_frame;
-} ARBCContext;
-
-static int fill_tile4(AVCodecContext *avctx, int color, AVFrame *frame)
-{
-    ARBCContext *s = avctx->priv_data;
-    GetByteContext *gb = &s->gb;
-    int nb_tiles = bytestream2_get_le16(gb);
-    int h = avctx->height - 1;
-    int pixels_overwritten = 0;
-
-    if ((avctx->width / 4 + 1) * (avctx->height / 4 + 1) < nb_tiles)
-        return 0;
-
-    for (int i = 0; i < nb_tiles; i++) {
-        int y = bytestream2_get_byte(gb);
-        int x = bytestream2_get_byte(gb);
-        uint16_t mask = bytestream2_get_le16(gb);
-        int start_y = y * 4, start_x = x * 4;
-        int end_y = start_y + 4, end_x = start_x + 4;
-
-        for (int j = start_y; j < end_y; j++) {
-            for (int k = start_x; k < end_x; k++) {
-                if (mask & 0x8000) {
-                    if (j >= avctx->height || k >= avctx->width) {
-                        mask = mask << 1;
-                        continue;
-                    }
-                    AV_WB24(&frame->data[0][frame->linesize[0] * (h - j) + 3 * k], color);
-                    pixels_overwritten ++;
-                }
-                mask = mask << 1;
-            }
-        }
-    }
-    return pixels_overwritten;
-}
-
-static int fill_tileX(AVCodecContext *avctx, int tile_width, int tile_height,
-                       int color, AVFrame *frame)
-{
-    ARBCContext *s = avctx->priv_data;
-    GetByteContext *gb = &s->gb;
-    const int step_h = tile_height / 4;
-    const int step_w = tile_width / 4;
-    int nb_tiles = bytestream2_get_le16(gb);
-    int h = avctx->height - 1;
-    int pixels_overwritten = 0;
-
-    if ((avctx->width / tile_width + 1) * (avctx->height / tile_height + 1) < nb_tiles)
-        return 0;
-
-    for (int i = 0; i < nb_tiles; i++) {
-        int y = bytestream2_get_byte(gb);
-        int x = bytestream2_get_byte(gb);
-        uint16_t mask = bytestream2_get_le16(gb);
-        int start_y = y * tile_height, start_x = x * tile_width;
-        int end_y = start_y + tile_height, end_x = start_x + tile_width;
-
-        if (start_x >= avctx->width || start_y >= avctx->height)
-            continue;
-
-        for (int j = start_y; j < end_y; j += step_h) {
-            for (int k = start_x; k < end_x; k += step_w) {
-                if (mask & 0x8000U) {
-                    for (int m = 0; m < step_h; m++) {
-                        for (int n = 0; n < step_w; n++) {
-                            if (j + m >= avctx->height || k + n >= avctx->width)
-                                continue;
-                            AV_WB24(&frame->data[0][frame->linesize[0] * (h - (j + m)) + 3 * (k + n)], color);
-                        }
-                    }
-                    pixels_overwritten += FFMIN(step_h, avctx->height - j) * FFMIN(step_w, avctx->width - k);
-                }
-                mask = mask << 1;
-            }
-        }
-    }
-    return pixels_overwritten;
-}
-
-static int decode_frame(AVCodecContext *avctx, void *data,
-                        int *got_frame, AVPacket *avpkt)
-{
-    ARBCContext *s = avctx->priv_data;
-    AVFrame *frame = data;
-    int ret, nb_segments;
-    int prev_pixels = avctx->width * avctx->height;
-
-    if (avpkt->size < 10)
-        return AVERROR_INVALIDDATA;
-
-    bytestream2_init(&s->gb, avpkt->data, avpkt->size);
-    bytestream2_skip(&s->gb, 8);
-    nb_segments = bytestream2_get_le16(&s->gb);
-    if (nb_segments == 0)
-        return avpkt->size;
-
-    if (7 * nb_segments > bytestream2_get_bytes_left(&s->gb))
-        return AVERROR_INVALIDDATA;
-
-    if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
-        return ret;
-
-    if (s->prev_frame->data[0]) {
-        ret = av_frame_copy(frame, s->prev_frame);
-        if (ret < 0)
-            return ret;
-    }
-
-    for (int i = 0; i < nb_segments; i++) {
-        int resolution_flag;
-        int fill;
-
-        if (bytestream2_get_bytes_left(&s->gb) <= 0)
-            return AVERROR_INVALIDDATA;
-
-        fill = bytestream2_get_byte(&s->gb) << 16;
-        bytestream2_skip(&s->gb, 1);
-        fill |= bytestream2_get_byte(&s->gb) << 8;
-        bytestream2_skip(&s->gb, 1);
-        fill |= bytestream2_get_byte(&s->gb) << 0;
-        bytestream2_skip(&s->gb, 1);
-        resolution_flag = bytestream2_get_byte(&s->gb);
-
-        if (resolution_flag & 0x10)
-            prev_pixels -= fill_tileX(avctx, 1024, 1024, fill, frame);
-        if (resolution_flag & 0x08)
-            prev_pixels -= fill_tileX(avctx, 256, 256, fill, frame);
-        if (resolution_flag & 0x04)
-            prev_pixels -= fill_tileX(avctx, 64, 64, fill, frame);
-        if (resolution_flag & 0x02)
-            prev_pixels -= fill_tileX(avctx, 16, 16, fill, frame);
-        if (resolution_flag & 0x01)
-            prev_pixels -= fill_tile4(avctx, fill, frame);
-    }
-
-    av_frame_unref(s->prev_frame);
-    if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
-        return ret;
-
-    frame->pict_type = prev_pixels <= 0 ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
-    frame->key_frame = prev_pixels <= 0;
-    *got_frame = 1;
-
-    return avpkt->size;
-}
-
-static av_cold int decode_init(AVCodecContext *avctx)
-{
-    ARBCContext *s = avctx->priv_data;
-
-    avctx->pix_fmt = AV_PIX_FMT_RGB24;
-
-    s->prev_frame = av_frame_alloc();
-    if (!s->prev_frame)
-        return AVERROR(ENOMEM);
-
-    return 0;
-}
-
-static void decode_flush(AVCodecContext *avctx)
-{
-    ARBCContext *s = avctx->priv_data;
-
-    av_frame_unref(s->prev_frame);
-}
-
-static av_cold int decode_close(AVCodecContext *avctx)
-{
-    ARBCContext *s = avctx->priv_data;
-
-    av_frame_free(&s->prev_frame);
-
-    return 0;
-}
-
-AVCodec ff_arbc_decoder = {
-    .name           = "arbc",
-    .long_name      = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"),
-    .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = AV_CODEC_ID_ARBC,
-    .priv_data_size = sizeof(ARBCContext),
-    .init           = decode_init,
-    .decode         = decode_frame,
-    .flush          = decode_flush,
-    .close          = decode_close,
-    .capabilities   = AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
-};
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -25,16 +25,14 @@
 #include "libavcodec/h264dsp.h"
 #include "libavcodec/arm/startcode.h"

-void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
                                     int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
                                     int beta, int8_t *tc0);
-void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
                                       int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
                                       int beta, int8_t *tc0);
-void ff_h264_h_loop_filter_chroma422_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
-                                          int beta, int8_t *tc0);

 void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height,
                                   int log2_den, int weight, int offset);
@@ -79,11 +77,9 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
        c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
        c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
        c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
-
-        if (chroma_format_idc <= 1)
-            c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
-        else
-            c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma422_neon;
+        if(chroma_format_idc == 1){
+        c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
+        }

        c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
        c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;
--- a/libavcodec/arm/h264dsp_neon.S
+++ b/libavcodec/arm/h264dsp_neon.S
@@ -237,7 +237,6 @@ function ff_h264_h_loop_filter_chroma_neon, export=1
        h264_loop_filter_start

        sub             r0,  r0,  #2
-h_loop_filter_chroma420:
        vld1.32         {d18[0]}, [r0], r1
        vld1.32         {d16[0]}, [r0], r1
        vld1.32         {d0[0]},  [r0], r1
@@ -272,24 +271,6 @@ h_loop_filter_chroma420:
        bx              lr
 endfunc

-function ff_h264_h_loop_filter_chroma422_neon, export=1
-        h264_loop_filter_start
-        push            {r4, lr}
-        add             r4,  r0,  r1
-        add             r1,  r1,  r1
-        sub             r0,  r0,  #2
-
-        bl              h_loop_filter_chroma420
-
-        ldr             r12, [sp, #8]
-        ldr             r12, [r12]
-        vmov.32         d24[0], r12
-        sub             r0,  r4,  #2
-
-        bl              h_loop_filter_chroma420
-        pop             {r4, pc}
-endfunc
-
@ Biweighted prediction

 .macro  biweight_16     macs, macd
--- a/libavcodec/arm/vp8dsp_neon.S
+++ b/libavcodec/arm/vp8dsp_neon.S
@@ -773,6 +773,23 @@ endfunc
        vqrshrun.s16    \d1, q14, #7
 .endm

+.macro  vp8_epel8_v6    d0,  s0,  s1,  s2,  s3,  s4,  s5
+        vmovl.u8        q10, \s2
+        vmovl.u8        q11, \s3
+        vmovl.u8        q9,  \s1
+        vmovl.u8        q12, \s4
+        vmovl.u8        q8,  \s0
+        vmovl.u8        q13, \s5
+        vmul.u16        q10, q10, d0[2]
+        vmul.u16        q11, q11, d0[3]
+        vmls.u16        q10, q9,  d0[1]
+        vmls.u16        q11, q12, d1[0]
+        vmla.u16        q10, q8,  d0[0]
+        vmla.u16        q11, q13, d1[1]
+        vqadd.s16       q11, q10, q11
+        vqrshrun.s16    \d0, q11, #7
+.endm
+
 .macro  vp8_epel8_v6_y2 d0, d1, s0, s1, s2, s3, s4, s5, s6
        vmovl.u8        q10, \s0
        vmovl.u8        q11, \s3
@@ -892,12 +909,12 @@ function ff_put_vp8_epel16_h6v6_neon, export=1
        sub             r2,  r2,  r3,  lsl #1
        sub             r2,  r2,  #2
        push            {r4,lr}
-        vpush           {d8-d15}
+        vpush           {d8-d9}

        @ first pass (horizontal):
-        ldr             r4,  [sp, #64+8+4]          @ mx
+        ldr             r4,  [sp, #28]          @ mx
        movrel          lr,  subpel_filters-16
-        ldr             r12, [sp, #64+8+0]          @ h
+        ldr             r12, [sp, #24]          @ h
        add             r4,  lr,  r4, lsl #4
        sub             sp,  sp,  #336+16
        vld1.16         {q0},     [r4,:128]
@@ -914,9 +931,9 @@ function ff_put_vp8_epel16_h6v6_neon, export=1
        bne             1b

        @ second pass (vertical):
-        ldr             r4,  [sp, #336+16+64+8+8]   @ my
+        ldr             r4,  [sp, #336+16+32]   @ my
        movrel          lr,  subpel_filters-16
-        ldr             r12, [sp, #336+16+64+8+0]   @ h
+        ldr             r12, [sp, #336+16+24]   @ h
        add             r4,  lr,  r4, lsl #4
        add             lr,  sp,  #15
        vld1.16         {q0},     [r4,:128]
@@ -924,20 +941,18 @@ function ff_put_vp8_epel16_h6v6_neon, export=1
 2:
        vld1.8          {d2-d5},  [lr,:128]!
        vld1.8          {d6-d9},  [lr,:128]!
-        vld1.8          {d10-d13},[lr,:128]!
-        vld1.8          {d14-d15},[lr,:128]
-        sub             lr,  lr,  #64
+        vld1.8          {d28-d31},[lr,:128]
+        sub             lr,  lr,  #48

-        vp8_epel8_v6_y2 d2,  d4,  d2,  d4,  d6,  d8,  d10, d12, d14
-        vp8_epel8_v6_y2 d3,  d5,  d3,  d5,  d7,  d9,  d11, d13, d15
+        vp8_epel8_v6    d2, d2, d4, d6, d8, d28, d30
+        vp8_epel8_v6    d3, d3, d5, d7, d9, d29, d31

        vst1.8          {d2-d3}, [r0,:128], r1
-        vst1.8          {d4-d5}, [r0,:128], r1
-        subs            r12, r12, #2
+        subs            r12, r12, #1
        bne             2b

        add             sp,  sp,  #336+16
-        vpop            {d8-d15}
+        vpop            {d8-d9}
        pop             {r4,pc}
 endfunc

--- a/libavcodec/ass_split.c
+++ b/libavcodec/ass_split.c
@@ -249,7 +249,7 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
    const ASSSection *section = &ass_sections[ctx->current_section];
    int *number = &ctx->field_number[ctx->current_section];
    int *order = ctx->field_order[ctx->current_section];
-    int i, len;
+    int *tmp, i, len;

    while (buf && *buf) {
        if (buf[0] == '[') {
@@ -280,9 +280,9 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
                while (!is_eol(*buf)) {
                    buf = skip_space(buf);
                    len = strcspn(buf, ", \r\n");
-                    if (av_reallocp_array(&order, (*number + 1), sizeof(*order)) != 0)
+                    if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order))))
                        return NULL;
-
+                    order = tmp;
                    order[*number] = -1;
                    for (i=0; section->fields[i].name; i++)
                        if (!strncmp(buf, section->fields[i].name, len)) {
--- a/libavcodec/assenc.c
+++ b/libavcodec/assenc.c
@@ -57,7 +57,7 @@ static int ass_encode_frame(AVCodecContext *avctx,

        if (sub->rects[i]->type != SUBTITLE_ASS) {
            av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
-            return AVERROR(EINVAL);
+            return -1;
        }

 #if FF_API_ASS_TIMING
@@ -93,7 +93,7 @@ static int ass_encode_frame(AVCodecContext *avctx,

        if (len > bufsize-total_len-1) {
            av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n");
-            return AVERROR(EINVAL);
+            return -1;
        }

        total_len += len;
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -173,7 +173,10 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64])
 {
    int i;

-    av_assert0(a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) >= MAX_MB_SIZE);
+    if (a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) < MAX_MB_SIZE) {
+        av_log(a->avctx, AV_LOG_ERROR, "encoded frame too large\n");
+        return -1;
+    }

    if (a->avctx->codec_id == AV_CODEC_ID_ASV1) {
        for (i = 0; i < 6; i++)
--- a/libavcodec/atrac3plus.c
+++ b/libavcodec/atrac3plus.c
@@ -81,8 +81,8 @@ av_cold void ff_atrac3p_init_vlcs(void)
 {
    int i, wl_vlc_offs, ct_vlc_offs, sf_vlc_offs, tab_offset;

-    static const uint8_t wl_nb_bits[4]  = { 2, 3, 5, 5 };
-    static const uint8_t wl_nb_codes[4] = { 3, 5, 8, 8 };
+    static const int wl_nb_bits[4]  = { 2, 3, 5, 5 };
+    static const int wl_nb_codes[4] = { 3, 5, 8, 8 };
    static const uint8_t * const wl_bits[4] = {
        atrac3p_wl_huff_bits1, atrac3p_wl_huff_bits2,
        atrac3p_wl_huff_bits3, atrac3p_wl_huff_bits4
@@ -95,8 +95,8 @@ av_cold void ff_atrac3p_init_vlcs(void)
        atrac3p_wl_huff_xlat1, atrac3p_wl_huff_xlat2, NULL, NULL
    };

-    static const uint8_t ct_nb_bits[4]  = { 3, 4, 4, 4 };
-    static const uint8_t ct_nb_codes[4] = { 4, 8, 8, 8 };
+    static const int ct_nb_bits[4]  = { 3, 4, 4, 4 };
+    static const int ct_nb_codes[4] = { 4, 8, 8, 8 };
    static const uint8_t * const ct_bits[4]  = {
        atrac3p_ct_huff_bits1, atrac3p_ct_huff_bits2,
        atrac3p_ct_huff_bits2, atrac3p_ct_huff_bits3
@@ -109,8 +109,8 @@ av_cold void ff_atrac3p_init_vlcs(void)
        NULL, NULL, atrac3p_ct_huff_xlat1, NULL
    };

-    static const uint8_t sf_nb_bits[8]  = {  9,  9,  9,  9,  6,  6,  7,  7 };
-    static const uint8_t sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 };
+    static const int sf_nb_bits[8]  = {  9,  9,  9,  9,  6,  6,  7,  7 };
+    static const int sf_nb_codes[8] = { 64, 64, 64, 64, 16, 16, 16, 16 };
    static const uint8_t  * const sf_bits[8]  = {
        atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits1, atrac3p_sf_huff_bits2,
        atrac3p_sf_huff_bits3, atrac3p_sf_huff_bits4, atrac3p_sf_huff_bits4,
--- a/libavcodec/atrac3plusdsp.c
+++ b/libavcodec/atrac3plusdsp.c
@@ -248,7 +248,7 @@ void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *f
        out[i] += wavreg1[i] + wavreg2[i];
 }

-static const uint8_t subband_to_powgrp[ATRAC3P_SUBBANDS] = {
+static const int subband_to_powgrp[ATRAC3P_SUBBANDS] = {
    0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4
 };

@@ -411,7 +411,7 @@ static const float pwc_levs[16] = {
 };

 /** Map subband number to quant unit number. */
-static const uint8_t subband_to_qu[17] = {
+static const int subband_to_qu[17] = {
    0, 8, 12, 16, 18, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32
 };

--- a/libavcodec/atrac9dec.c
+++ b/libavcodec/atrac9dec.c
@@ -71,8 +71,6 @@ typedef struct ATRAC9BlockData {
    int cpe_base_channel;
    int is_signs[30];

-    int reuseable;
-
 } ATRAC9BlockData;

 typedef struct ATRAC9Context {
@@ -202,8 +200,6 @@ static inline int parse_band_ext(ATRAC9Context *s, ATRAC9BlockData *b,
    int ext_band = 0;

    if (b->has_band_ext) {
-        if (b->q_unit_cnt < 13)
-            return AVERROR_INVALIDDATA;
        ext_band = at9_tab_band_ext_group[b->q_unit_cnt - 13][2];
        if (stereo) {
            b->channel[1].band_ext = get_bits(gb, 2);
@@ -245,7 +241,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b,
                                    ATRAC9ChannelData *c, GetBitContext *gb,
                                    int channel_idx, int first_in_pkt)
 {
-    static const uint8_t mode_map[2][4] = { { 0, 1, 2, 3 }, { 0, 2, 3, 4 } };
+    static const int mode_map[2][4] = { { 0, 1, 2, 3 }, { 0, 2, 3, 4 } };
    const int mode = mode_map[channel_idx][get_bits(gb, 2)];

    memset(c->scalefactors, 0, sizeof(c->scalefactors));
@@ -539,6 +535,9 @@ static inline void apply_band_extension(ATRAC9Context *s, ATRAC9BlockData *b,
        at9_q_unit_to_coeff_idx[g_units[3]],
    };

+    if (!b->has_band_ext || !b->has_band_ext_data)
+        return;
+
    for (int ch = 0; ch <= stereo; ch++) {
        ATRAC9ChannelData *c = &b->channel[ch];

@@ -669,7 +668,6 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb,
    if (!reuse_params) {
        int stereo_band, ext_band;
        const int min_band_count = s->samplerate_idx > 7 ? 1 : 3;
-        b->reuseable = 0;
        b->band_count = get_bits(gb, 4) + min_band_count;
        b->q_unit_cnt = at9_tab_band_q_unit_map[b->band_count];

@@ -701,11 +699,6 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb,
            }
            b->band_ext_q_unit = at9_tab_band_q_unit_map[ext_band];
        }
-        b->reuseable = 1;
-    }
-    if (!b->reuseable) {
-        av_log(s->avctx, AV_LOG_ERROR, "invalid block reused!\n");
-        return AVERROR_INVALIDDATA;
    }

    /* Calculate bit alloc gradient */
@@ -748,9 +741,7 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb,

    apply_intensity_stereo(s, b, stereo);
    apply_scalefactors    (s, b, stereo);
-
-    if (b->has_band_ext && b->has_band_ext_data)
-        apply_band_extension  (s, b, stereo);
+    apply_band_extension  (s, b, stereo);

 imdct:
    for (int i = 0; i <= stereo; i++) {
--- a/libavcodec/av1.h
+++ b/libavcodec/av1.h
@@ -127,37 +127,4 @@ enum {
    AV1_CSP_COLOCATED = 2, // -> AVCHROMA_LOC_TOPLEFT.
 };

-// Scalability modes (section 6.7.5)
-enum {
-    AV1_SCALABILITY_L1T2 = 0,
-    AV1_SCALABILITY_L1T3 = 1,
-    AV1_SCALABILITY_L2T1 = 2,
-    AV1_SCALABILITY_L2T2 = 3,
-    AV1_SCALABILITY_L2T3 = 4,
-    AV1_SCALABILITY_S2T1 = 5,
-    AV1_SCALABILITY_S2T2 = 6,
-    AV1_SCALABILITY_S2T3 = 7,
-    AV1_SCALABILITY_L2T1h = 8,
-    AV1_SCALABILITY_L2T2h = 9,
-    AV1_SCALABILITY_L2T3h = 10,
-    AV1_SCALABILITY_S2T1h = 11,
-    AV1_SCALABILITY_S2T2h = 12,
-    AV1_SCALABILITY_S2T3h = 13,
-    AV1_SCALABILITY_SS = 14,
-    AV1_SCALABILITY_L3T1 = 15,
-    AV1_SCALABILITY_L3T2 = 16,
-    AV1_SCALABILITY_L3T3 = 17,
-    AV1_SCALABILITY_S3T1 = 18,
-    AV1_SCALABILITY_S3T2 = 19,
-    AV1_SCALABILITY_S3T3 = 20,
-    AV1_SCALABILITY_L3T2_KEY = 21,
-    AV1_SCALABILITY_L3T3_KEY = 22,
-    AV1_SCALABILITY_L4T5_KEY = 23,
-    AV1_SCALABILITY_L4T7_KEY = 24,
-    AV1_SCALABILITY_L3T2_KEY_SHIFT = 25,
-    AV1_SCALABILITY_L3T3_KEY_SHIFT = 26,
-    AV1_SCALABILITY_L4T5_KEY_SHIFT = 27,
-    AV1_SCALABILITY_L4T7_KEY_SHIFT = 28,
-};
-
 #endif /* AVCODEC_AV1_H */
--- a/libavcodec/av1_frame_split_bsf.c
+++ b/libavcodec/av1_frame_split_bsf.c
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2019 James Almer <jamrial@gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * This bitstream filter splits AV1 Temporal Units into packets containing
- * just one frame, plus any leading and trailing OBUs that may be present at
- * the beginning or end, respectively.
- *
- * Temporal Units already containing only one frame will be passed through
- * unchanged. When splitting can't be performed, the Temporal Unit will be
- * passed through containing only the remaining OBUs starting from the first
- * one after the last successfully split frame.
- */
-
-#include "libavutil/avassert.h"
-
-#include "avcodec.h"
-#include "bsf.h"
-#include "cbs.h"
-#include "cbs_av1.h"
-
-typedef struct AV1FSplitContext {
-    AVPacket *buffer_pkt;
-    CodedBitstreamContext *cbc;
-    CodedBitstreamFragment temporal_unit;
-
-    int nb_frames;
-    int cur_frame;
-    int cur_frame_idx;
-    int last_frame_idx;
-} AV1FSplitContext;
-
-static int av1_frame_split_filter(AVBSFContext *ctx, AVPacket *out)
-{
-    AV1FSplitContext *s = ctx->priv_data;
-    CodedBitstreamFragment *td = &s->temporal_unit;
-    int i, ret;
-    int split = !!s->buffer_pkt->data;
-
-    if (!s->buffer_pkt->data) {
-        int nb_frames = 0;
-
-        ret = ff_bsf_get_packet_ref(ctx, s->buffer_pkt);
-        if (ret < 0)
-            return ret;
-
-        ret = ff_cbs_read_packet(s->cbc, td, s->buffer_pkt);
-        if (ret < 0) {
-            av_log(ctx, AV_LOG_WARNING, "Failed to parse temporal unit.\n");
-            goto passthrough;
-        }
-
-        for (i = 0; i < td->nb_units; i++) {
-            CodedBitstreamUnit *unit = &td->units[i];
-
-            if (unit->type == AV1_OBU_FRAME ||
-                unit->type == AV1_OBU_FRAME_HEADER)
-                nb_frames++;
-            else if (unit->type == AV1_OBU_TILE_LIST) {
-                av_log(ctx, AV_LOG_VERBOSE, "Large scale tiles are unsupported.\n");
-                goto passthrough;
-            }
-        }
-        if (nb_frames > 1) {
-            s->cur_frame = 0;
-            s->cur_frame_idx = s->last_frame_idx = 0;
-            s->nb_frames = nb_frames;
-            split = 1;
-        }
-    }
-
-    if (split) {
-        AV1RawFrameHeader *frame = NULL;
-        int cur_frame_type = -1, size = 0;
-
-        for (i = s->cur_frame_idx; i < td->nb_units; i++) {
-            CodedBitstreamUnit *unit = &td->units[i];
-
-            size += unit->data_size;
-            if (unit->type == AV1_OBU_FRAME) {
-                AV1RawOBU *obu = unit->content;
-
-                if (frame) {
-                    av_log(ctx, AV_LOG_WARNING, "Frame OBU found when Tile data for a "
-                                                "previous frame was expected.\n");
-                    goto passthrough;
-                }
-
-                frame = &obu->obu.frame.header;
-                cur_frame_type = obu->header.obu_type;
-                s->last_frame_idx = s->cur_frame_idx;
-                s->cur_frame_idx  = i + 1;
-                s->cur_frame++;
-
-                // split here unless it's the last frame, in which case
-                // include every trailing OBU
-                if (s->cur_frame < s->nb_frames)
-                    break;
-            } else if (unit->type == AV1_OBU_FRAME_HEADER) {
-                AV1RawOBU *obu = unit->content;
-
-                if (frame) {
-                    av_log(ctx, AV_LOG_WARNING, "Frame Header OBU found when Tile data for a "
-                                                "previous frame was expected.\n");
-                    goto passthrough;
-                }
-
-                frame = &obu->obu.frame_header;
-                cur_frame_type = obu->header.obu_type;
-                s->last_frame_idx = s->cur_frame_idx;
-                s->cur_frame++;
-
-                // split here if show_existing_frame unless it's the last
-                // frame, in which case include every trailing OBU
-                if (frame->show_existing_frame &&
-                    s->cur_frame < s->nb_frames) {
-                    s->cur_frame_idx = i + 1;
-                    break;
-                }
-            } else if (unit->type == AV1_OBU_TILE_GROUP) {
-                AV1RawOBU *obu = unit->content;
-                AV1RawTileGroup *group = &obu->obu.tile_group;
-
-                if (!frame || cur_frame_type != AV1_OBU_FRAME_HEADER) {
-                    av_log(ctx, AV_LOG_WARNING, "Unexpected Tile Group OBU found before a "
-                                                "Frame Header.\n");
-                    goto passthrough;
-                }
-
-                if ((group->tg_end == (frame->tile_cols * frame->tile_rows) - 1) &&
-                    // include every trailing OBU with the last frame
-                    s->cur_frame < s->nb_frames) {
-                    s->cur_frame_idx = i + 1;
-                    break;
-                }
-            }
-        }
-        av_assert0(frame && s->cur_frame <= s->nb_frames);
-
-        ret = av_packet_ref(out, s->buffer_pkt);
-        if (ret < 0)
-            goto fail;
-
-        out->data = (uint8_t *)td->units[s->last_frame_idx].data;
-        out->size = size;
-
-        // skip the frame in the buffer packet if it's split successfully, so it's not present
-        // if the packet is passed through in case of failure when splitting another frame.
-        s->buffer_pkt->data += size;
-        s->buffer_pkt->size -= size;
-
-        if (!frame->show_existing_frame && !frame->show_frame)
-            out->pts = AV_NOPTS_VALUE;
-
-        if (s->cur_frame == s->nb_frames) {
-            av_packet_unref(s->buffer_pkt);
-            ff_cbs_fragment_reset(s->cbc, td);
-        }
-
-        return 0;
-    }
-
-passthrough:
-    av_packet_move_ref(out, s->buffer_pkt);
-
-    ret = 0;
-fail:
-    if (ret < 0) {
-        av_packet_unref(out);
-        av_packet_unref(s->buffer_pkt);
-    }
-    ff_cbs_fragment_reset(s->cbc, td);
-
-    return ret;
-}
-
-static const CodedBitstreamUnitType decompose_unit_types[] = {
-    AV1_OBU_TEMPORAL_DELIMITER,
-    AV1_OBU_SEQUENCE_HEADER,
-    AV1_OBU_FRAME_HEADER,
-    AV1_OBU_TILE_GROUP,
-    AV1_OBU_FRAME,
-};
-
-static int av1_frame_split_init(AVBSFContext *ctx)
-{
-    AV1FSplitContext *s = ctx->priv_data;
-    CodedBitstreamFragment *td = &s->temporal_unit;
-    int ret;
-
-    s->buffer_pkt = av_packet_alloc();
-    if (!s->buffer_pkt)
-        return AVERROR(ENOMEM);
-
-    ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, ctx);
-    if (ret < 0)
-        return ret;
-
-    s->cbc->decompose_unit_types    = (CodedBitstreamUnitType*)decompose_unit_types;
-    s->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types);
-
-    if (!ctx->par_in->extradata_size)
-        return 0;
-
-    ret = ff_cbs_read_extradata(s->cbc, td, ctx->par_in);
-    if (ret < 0)
-        av_log(ctx, AV_LOG_WARNING, "Failed to parse extradata.\n");
-
-    ff_cbs_fragment_reset(s->cbc, td);
-
-    return 0;
-}
-
-static void av1_frame_split_flush(AVBSFContext *ctx)
-{
-    AV1FSplitContext *s = ctx->priv_data;
-
-    av_packet_unref(s->buffer_pkt);
-    ff_cbs_fragment_reset(s->cbc, &s->temporal_unit);
-}
-
-static void av1_frame_split_close(AVBSFContext *ctx)
-{
-    AV1FSplitContext *s = ctx->priv_data;
-
-    av_packet_free(&s->buffer_pkt);
-    ff_cbs_fragment_free(s->cbc, &s->temporal_unit);
-    ff_cbs_close(&s->cbc);
-}
-
-static const enum AVCodecID av1_frame_split_codec_ids[] = {
-    AV_CODEC_ID_AV1, AV_CODEC_ID_NONE,
-};
-
-const AVBitStreamFilter ff_av1_frame_split_bsf = {
-    .name           = "av1_frame_split",
-    .priv_data_size = sizeof(AV1FSplitContext),
-    .init           = av1_frame_split_init,
-    .flush          = av1_frame_split_flush,
-    .close          = av1_frame_split_close,
-    .filter         = av1_frame_split_filter,
-    .codec_ids      = av1_frame_split_codec_ids,
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Thompson	10506de9ad	cbs_av1: Support redundant frame headers (cherry picked from commit `f5894178fb`)	2018-11-05 23:11:03 +00:00
Mark Thompson	af3fccfeff	cbs_av1: Fix header writing when already aligned (cherry picked from commit `6bdb7712ae`)	2018-11-05 23:10:57 +00:00
Mark Thompson	ec1b5216fc	configure: Add missing V4L2 M2M decoder BSF dependencies (cherry picked from commit `e9d2e3fdaa`)	2018-11-05 23:10:49 +00:00
Mark Thompson	066ff02621	configure: Add missing IVF muxer BSF dependency (cherry picked from commit `a4fb2b1150`)	2018-11-05 23:10:41 +00:00
James Almer	398a70309e	avcodec/cbs_av1: fix decoder/encoder_buffer_delay variable types buffer_delay_length_minus_1 is five bits long, meaning decode_buffer_delay and encoder_buffer_delay can have values up to 32 bits long. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit `89a0d33e3a`)	2018-11-04 22:06:20 -03:00
Mark Thompson	acd13f1255	configure: Fix av1_metadata BSF dependency (cherry picked from commit `34429182b9`)	2018-11-04 22:06:11 -03:00
James Almer	1c98cf4ddd	avformat/ivfenc: use the av1_metadata bsf to insert Temporal Delimiter OBUs if needed Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit `2d2af23349`)	2018-11-04 22:06:08 -03:00
Marton Balint	63c1e291ef	avformat/ftp: allow nonstandard 202 reply to OPTS UTF8 Fixes ticket #7481. Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit `8e5a2495a8`)	2018-11-04 22:55:09 +01:00
Michael Niedermayer	7ebc27e1fa	avcodec/cavsdec: Propagate error codes inside decode_mb_i() Fixes: Timeout Fixes: 10702/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CAVS_fuzzer-5669940938407936 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 `c1cee05656`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	bc5777bdab	avcodec/mpeg4videodec: Clear partitioned frame in decode_studio_vop_header() partitioned_frame is also set/cleared in decode_vop_header() Fixes: out of array read Fixes: 9789/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5638681627983872 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 `074187d599`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	7d23ccac8d	avcodec/mpegaudio_parser: Consume more than 0 bytes in case of the unsupported mp3adu case Fixes: Timeout Fixes: 10966/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADU_fuzzer-5348695024336896 Fixes: 10969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5691669402877952 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 `df91af140c`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	2f04b78b95	avcodec/prosumer: Simplify bit juggling of the c variable in decompress() Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit `66425add27`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	fd05e20650	avcodec/prosumer: Remove always true check in decompress() Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit `1dfa0b6f36`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	a163384467	avcodec/prosumer: Remove unneeded () Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit `506839a3e9`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Michael Niedermayer	b9875b7583	avcodec/prosumer: Check for bytestream eof in decompress() Fixes: Infinite loop Fixes: 10685/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PROSUMER_fuzzer-5652236881887232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit `9acdf17b2c`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-04 20:26:49 +01:00
Philip Langdale	ebc1c49e41	avfilter/vf_cuda_yadif: Avoid new syntax for vector initialisation This requires a newer version of CUDA than we want to require. (cherry picked from commit `8e50215b5e`)	2018-11-03 15:50:31 -07:00
Philip Langdale	6feec11e48	avcodec/nvdec: Increase frame pool size to help deinterlacing With the cuda yadif filter in use, the number of mapped decoder frames could increase by two, as the filter holds on to additional frames. (cherry picked from commit `1b41115ef7`)	2018-11-03 15:50:25 -07:00
Philip Langdale	67126555fc	avfilter/vf_yadif_cuda: CUDA accelerated yadif deinterlacer This is a cuda implementation of yadif, which gives us a way to do deinterlacing when using the nvdec hwaccel. In that scenario we don't have access to the nvidia deinterlacer. (cherry picked from commit `d5272e94ab`)	2018-11-03 15:50:12 -07:00
Philip Langdale	041231fcd6	libavfilter/vf_yadif: Make frame management logic and options shareable I'm writing a cuda implementation of yadif, and while this obviously has a very different implementation of the actual filtering, all the frame management is unchanged. To avoid duplicating that logic, let's make it shareable. From the perspective of the existing filter, the only real change is introducing a function pointer for the filter() function so it can be specified for the specific filter. (cherry picked from commit `598f0f3927`)	2018-11-03 15:45:55 -07:00
Josh de Kock	765fb1f224	fate/api-h264-slice-test: use cleaner error handling Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit `1052578dad`)	2018-11-03 12:57:51 -03:00
Josh de Kock	5060a615c7	fate/api-h264-slice-test: don't use ssize_t Fixes ticket #7521 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit `8096f52049`)	2018-11-03 12:57:37 -03:00
Michael Niedermayer	1665ac6a44	RELEASE_NOTES: Based on the version from 4.0 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-02 01:36:21 +01:00
Michael Niedermayer	3c7e973430	Update for 4.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2018-11-02 01:33:08 +01:00
@@ -1 +1 @@
 .1.git
 .1