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

* commit '7d8d726b':
  rtmpproto: Don't include a client version in the unencrypted C1 handshake
Merged-by: Clément Bœsch <u@pkh.me>

* commit '9f23f77a':
  rtmpproto: Don't include the libavformat version as "clientid"
Merged-by: Clément Bœsch <u@pkh.me>

* commit '8b5e0d17':
  rtmpproto: Send chunk size on the network channel
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'd6ded940':
  rtmpproto: Lengthen the filename buffer when receiving streams
Merged-by: Clément Bœsch <u@pkh.me>

* commit '7395784b':
  rtmpproto: Check the return from ff_amf_read_string
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'c9527bf3':
  Make the RELEASE file match with the most recent tag

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

* commit '881477c7':
  swscale: Add the GBRAP12 output
  Add GBRAP12 pixel format support
  swscale: Enable GBRP12 output
  swscale: x86: Add some forgotten 12-bit planar YUV cases
  swscale: Add input support for 12-bit formats

This merge is noop, these commits are recrafted cherry-picks from
FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1e93aa69':
  Add GBRP12 pixel format support

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

* commit 'e7e5be86':
  APIchanges: Expand the name of recently added pixel formats

This commit is a noop, we don't have this entry.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '14e7e19a':
  lavc: bsf: Document input/output codecparam alloc/init process
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'eb542106':
  swscale: Add missing yuv444p12 swapping

This commit is a noop, these pixel formats were introduced long ago and
present in the switch case.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '112cee02':
  hevc: Add SSE2 and AVX IDCT
Merged-by: Clément Bœsch <u@pkh.me>

Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot be represented in type 'int'

Fixes: 902/clusterfuzz-testcase-4561155144024064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegReviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: 898/clusterfuzz-testcase-6149765467209728

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

This came up while debugging a problem with mpv:
https://github.com/mpv-player/mpv/issues/4155Signed-off-by: wm4 <nfxjfg@googlemail.com>

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

* commit '9b2ccafb':
  aarch64: Add missing sign extension in ff_h264_idct8_add_neon
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'cbd84b8a':
  nvenc: Fix error log

This commit is a noop, the error message is correct in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'da284837':
  nvenc: Force high_444 profile for 444 input

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

* commit 'e4128c08':
  Revert "hevc: x86: Refactor IDCT macro declarations"

So apparently this was technically correct be reverted due to
authorship. Reverted as well in FFmpeg for now...

See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.htmlMerged-by: Clément Bœsch <u@pkh.me>

* commit '5801f9ed':
  h264_intrapred: x86: Update comments left behind in 95c89da3Merged-by: Clément Bœsch <u@pkh.me>

* commit '20abcaa2':
  configure: #include stdint.h as part of libxavs test

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