* commit 'ab839054':
  swscale: Add GRAY12

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

* commit '7471352f':
  pixfmt: Add GRAY12

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

* commit '4ab61cd9':
  qsv{enc,dec}: extend the internal frame allocator
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '00aeedd8':
  qsv{dec,enc}: use a struct as a memory id with internal memory allocator
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit '404e5147':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'e8bbacbf':
  hwcontext_qsv: support frame mapping
Merged-by: Mark Thompson <sw@jkqxz.net>

Fixes CID1396283 and CID1396284
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: CID1396846
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes CID1396835
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '8ea15afb':
  hwcontext_qsv: transfer data through the child context when VPP fails
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'b91ce486':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails
Merged-by: Mark Thompson <sw@jkqxz.net>

* commit 'b115a35e':
  hwcontext_qsv: add support for the P8 format
Merged-by: Mark Thompson <sw@jkqxz.net>

This is more for correctness than actually fixing a missing error path

Fixes CID1399967
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)

This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes CID1401674
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes CID1403225
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '10065d93':
  hwcontext_dxva2: add support for the P8 format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '91097376':
  hwcontext_dxva2: frame mapping support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fabfbfe5':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fcMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'db0b3dcc':
  libx265: Add option to force IDR frames

This commit is a noop, see 8a8902f2Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '3cba09e5':
  x86: Drop stray semicolons after function definitions

This commit is a noop, they are already fixed in FFmpeg.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'd1ef1b9e':
  configure: Silence lld-link when getting the version number
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '392caa65':
  arm: vp9mc: Insert a literal pool at the middle of the file

This commit is a noop, see 68caef9dMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit '8ad9f9d6':
  hwcontext_vaapi: Frame mapping support
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '124e2697':
  lavfi: Hardware map filter
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'd06aa24b':
  hwcontext: Hardware frame mapping
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '67351924':
  Drop unreachable break and return statements
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '99434f4d':
  float_dsp: Have implementation match function pointer prototype
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '6354957a':
  dnxhdenc: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'c778eb15':
  pixblockdsp: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '99ddeddc':
  ituh263dec: Have function signature match across declaration and definition

This commit is a noop, see 2d2b363cMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit '67c65e46':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit '13fcdfb9':
  svq3: Drop unused function dctcoef_get()

This commit is a noop, see 1e298e77Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'ee59f054':
  intrax8: Have function signature match across declaration and definition
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '1a469a5e':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbeMerged-by: Clément Bœsch <cboesch@gopro.com>