* commit '8d34a2f8':
  vdpau: Support for VDPAU accelerated HEVC decoding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '8958c5c6':
  hevc: Track long and short term RPS size for VDPAU
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '8c399bd5':
  dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e579d8b2':
  lavf: Dump the cpb side data information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. Ours should be superior.

* commit 'd005ccc6':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit 'fb25d99b':
  buffersrc: do not discard the error from ff_filter_frame()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f7d77b9a':
  eatqi: Remove MpegEncContext dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7c25ffe0':
  mpeg1: Make intra-block decoding independent of MpegEncContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '249827f7':
  mpeg12dec: Refactor mpeg1_decode_block_intra()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'cdbaa436':
  mpeg12dec: Always close reader on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit '7a00653b':
  tiny_psnr: Support large files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Newer example in blend from f80b4750 is faster and simpler.
Signed-off-by: Lou Logan <lou@lrcd.com>

This commit is a no-op. FFmpeg already has this.

* commit '99214d42':
  dnxhd: Make the encoder message friendlier
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '34c9eba9':
  configure: Refactor toolchain flag setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.

* commit 'dd53af4b':
  avplay: drop support for building without lavfi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '5781bfae':
  flacenc: Load default prediction_order parameters if none is selected
  asfdec: make sure packet_size is non-zero before seeking
  asfdec: check for too small size in asf_read_unknown
  asfdec: check avio_skip in asf_read_simple_index
  asfdec: break if EOF is reached after asf_read_packet_header
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '389b7984':
  msvc: Fix libx264 linking
  doc: Improve the channelsplit example
  configure: Support MSYS2 mingw-w64 64bit
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e280fe13':
  v210: Use separate sample_factors
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '15ec7aa4':
  v210: Add avx2 version of the 10-bit line encoder
  v210: Add avx2 version of the 8-bit line encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '1ba1fede':
  flacenc: Restore defaults and range for {min, max}_prediction_order
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '60f0fde3':
  libx264: Make sure to preserve default option values
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '77a44f57':
  configure: add missing avx2 support check
  x86: Add ymm_reg struct
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'eafb05fc':
  v210: x86: Add the correct guards around the asm code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '4709f721':
  lavfi: Use AV_CEIL_RSHIFT where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e8030714':
  yuv4mpegenc: Use AV_CEIL_RSHIFT where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6695f178':
  pixdesc: Use AV_CEIL_RSHIFT in documentation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1546a41a':
  pixdesc: Drop unneeded deprecation warning guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9cac1b4b':
  qsvenc: Add private option to replace coder_type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-nop.

* commit 'eef9f065':
  avplay: Allow to override the codec
  avplay: Statically allocate the player state
  avplay: Rename cur_stream to player
  avplay: Rename VideoState to PlayerState
  avplay: Allocate the refresh thread next to the decode thread
  avplay: Move the stream setup in the main thread
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '81306fd4':
  hls: eliminate ffurl_* usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

Similar to how the AAC encoder does it.
0 means the video's been compressed losslessly/almost losslessly
thoughout. Generally, the higher, the worse.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

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

Fixes: CID1352550
Fixes: CID1352549
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>