* commit '14cab426':
  build: Hardcode avversion.h dependency

This commit is a noop, see:
4d0ac9ae
4ae87554Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f22363c7':
  openssl: Avoid double semicolons after the GET_BIO_DATA macro

This commit is a noop, see fc83de7eMerged-by: Clément Bœsch <u@pkh.me>

* commit '052b9785':
  aviocat: Support avio options
Merged-by: Clément Bœsch <u@pkh.me>

* commit '99aeae20':
  scale_npp: fix passthrough mode

This commit is a noop, see f524275eMerged-by: Clément Bœsch <u@pkh.me>

* commit '0aec37e6':
  vaapi_decode: Remove vestigial unmap code
  vaapi_decode: Clear parameter buffers to fix picture reuse

This merge is a noop, see 79307ae5Merged-by: Clément Bœsch <u@pkh.me>

* commit '754b20d7':
  vaapi_h264: fix RefPicList[] field flags.

This commit is a noop, see 88325c2eMerged-by: Clément Bœsch <u@pkh.me>

* commit 'ee050797':
  openssl: Support version 1.1.0.

This commit is mostly a noop, see 798c6ecc

Included the simplifications by Martin Storsjö and fixed the
GET_BIO_DATA() macro to prevent a warning after the simplifications.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '016387fe':
  rtmpdh: Don't use the OpenSSL DH struct
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2f806622':
  bktr: Use memset(0) instead of zero initialization for struct sigaction
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ed48a9d8':
  checkasm: Add a test for HEVC add_residual
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6d5636ad':
  hevc: x86: Add add_residual() SIMD optimizations

See a6af4bf6

This merge is only cosmetics (renames, space shuffling, etc).

The functionnal changes in the ASM are *not* merged:
- unrolling with %rep is kept
- ADD_RES_MMX_4_8 is left untouched: this needs investigation
Merged-by: Clément Bœsch <u@pkh.me>

This will simplify incoming merge.

* commit '043b0b9f':
  Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v

The merge also includes all our own occurences.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '4b07ebf1':
  mov: Update colr values

Mostly noop, see a3cab3d4

Only the use of av_color_{primaries,transfer,space}_name() is merged.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0d9b9bd3':
  lavu: Add JEDEC P22 color primaries
Merged-by: Clément Bœsch <u@pkh.me>

Mistake introduced in a1f6b1d9.

* commit '7c9e2b29':
  Makefile: fix checking whether reconfiguring is required
Merged-by: James Almer <jamrial@gmail.com>

* commit '59c90097':
  hevc: factor out a repeated condition

This commit is a noop. It doesn't apply as our codebase has diverged
too much.
Merged-by: James Almer <jamrial@gmail.com>

* commit '0bfdcce4':
  hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>

* commit '096a8eff':
  lavf: check that the codec is supported by extract_extradata

This commit is a noop. The code it changes was reverted.
See 40fa9d41Merged-by: James Almer <jamrial@gmail.com>

This reverts commit 1c193ac1, reversing
changes made to 7ebc9f8d.

Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.

* commit '788544ff':
  audiodsp: x86: Remove pointless header file

This commit is a noop, see 6ec3dc97Merged-by: James Almer <jamrial@gmail.com>

* commit '1f821e5a':
  configure: Print warnings after all other output
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b89804da':
  x86: videodsp: Add parentheses to expression to work around warning
Merged-by: James Almer <jamrial@gmail.com>

* commit 'da4f8c8e':
  fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'dd5d4a0e':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber
Merged-by: James Almer <jamrial@gmail.com>

* commit '7911186e':
  emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>

* commit 'be9dba5c':
  swscale: Properly load alpha for planar rgb

This commit is a noop, see
4170a44b
df36257aMerged-by: James Almer <jamrial@gmail.com>

* commit 'd3257162':
  build: Add VSX-OBJS to SUBDIR_VARS
Merged-by: James Almer <jamrial@gmail.com>

* commit '58224dc5':
  ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories
Merged-by: James Almer <jamrial@gmail.com>

* commit '0cf86fab':
  vaapi_encode: Write sequence header as extradata

This commit is a noop. It has already been cherry-picked in
51020adcMerged-by: James Almer <jamrial@gmail.com>

* commit 'f9bb356e':
  vaapi_h265: Include header for slice types
Merged-by: James Almer <jamrial@gmail.com>

* commit '6be7944e':
  x86: Add missing colons after assembly labels
Merged-by: James Almer <jamrial@gmail.com>

* commit '2816f8a8':
  build: Drop arch-specific checkasm Makefiles
Merged-by: James Almer <jamrial@gmail.com>

* commit '93d5b022':
  build: Drop duplicate asm recipe
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c91d6a33':
  checkasm: aarch64: Add filler args to make sure all parameters are passed on the stack
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f1b3e131':
  checkasm: aarch64: Clobber the stack before calling functions
Merged-by: James Almer <jamrial@gmail.com>