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

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>

Libav, for some reason, merged this as a public API function. This will
aid in future merges.

A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes out of array read
Fixes: j2k-poc.bin
Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Support packets larger than block size, return single block size.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Fixes ticket #4479.

See ticket #5138 for a sample.

commit "avpacket: Deprecate av_dup_packet" broke the use
av_interleaved_write_uncoded_frame as any input uncoded frame has an
invalid packet size that will crash when av_packet_ref tries to allocate
'size' new memory. Since the packet is a temporary created within mux.c
itself it can be used directly without needing a new ref.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>

level can be 5, but there are only four codebooks.

Fixes ubsan runtime error: index 5 out of bounds for type 'int8_t
[4][96]'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>