* commit '7c79587d':
  lavc: Move scenechange_threshold to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5764d381':
  lavc: Move chromaoffset to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0ac9f33a':
  lavc: Move frame_skip_* to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '84c4714f':
  lavc: Move brd_scale to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

Fixes build on msvc.

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

This was introduced in 0e6c8532.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Test target hasn't been updated with the latest changes.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

It could accidentally divide by zero if num was zero.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

These will be re-merged once it's been fixed properly.

This reverts:
 * Commit '8e7bea6d'
   configure: Improve requesting specific features
 * Commit 'e93aa2c9'
   configure: Force-enable select_any dependencies only on --enable
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

* commit '0e6c8532'
  lavc: Move b_frame_strategy and b_sensitivity to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is a NOOP.

* commit '55c7e5bf':
  riff: add C210 FourCC (Canopus C210)
  riff: add YUYV FourCC (Drastic YUYV)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd43a165b':
  imgconvert: Add the proper API guards to a deprecated function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f7168d70':
  imgconvert: Move AVPicture-related static function to the deprecated section
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '892f037c':
  imgconvert: Move the shrink functions only where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9d3ea5cb':
  imgconvert: Drop outdated comment block
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

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

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

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

This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

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

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

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

One big NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

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