* commit '17dac56b':
  lavu: Rename ycgco color space appropriately
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '0361e4dc':
  h264_qpel: x86: Move function with only one instance out of template macro

Note: warning is present with clang.
Merged-by: Clément Bœsch <cboesch@gopro.com>

This is required by the VP9 hwaccels (both DXVA2 and VAAPI) when
threads are enabled.
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

This is more robust in case some change or corner case causes them to be
dereferenced before being set

Fixes CID1396274, CID1396275
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Fixes CID1396260
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes CID1401671
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '88f0cf8c':
  avplay: Correct function pointer assignments in options array

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

* commit '943533d6':
  avconv: Correct function pointer assignments in options array

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

* commit '43de8b32':
  lzf: update pointer p after realloc

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

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