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

* commit 'a05cc561':
  checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters
Merged-by: James Almer <jamrial@gmail.com>

* commit '8e2ea691':
  lavf: use the new bitstream filter for extracting extradata
Merged-by: James Almer <jamrial@gmail.com>

* commit '89b35a13':
  lavc: add a bitstream filter for extracting extradata from packets
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f6e2f8a9':
  hevcdec: move parameter set parsing into a separate header
Merged-by: James Almer <jamrial@gmail.com>

* commit '150c896a':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header
Merged-by: James Almer <jamrial@gmail.com>

It was lost as part of a merge in 6397815b.

* commit '645c6ff4':
  hevcdec: drop the prototype of a non-existing function

This commit is a noop. The prototype in question is not in our tree.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c359d624':
  hevcdec: move decoder-independent declarations into a separate header
Merged-by: James Almer <jamrial@gmail.com>

No need to include config.h for HAVE_BIGENDIAN when libavutil/avconfig.h
is already included.

* commit '4abe3b04':
  hevc: rename hevc.[ch] to hevcdec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6c31ba22':
  avformat/matroska: fix MatroskaVideoFieldOrder enum values

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

* commit '20b75970':
  file protocol: handle the file: protocol string in file_check

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