* commit 'd3e4d406':
  h264dec: reset nb_slice_ctx_queued for hwaccel decoding

This commit is a noop, see 74480198Merged-by: James Almer <jamrial@gmail.com>

* commit 'e5b01972':
  m4vdec: Check for non-startcode 00 00 00 sequences in probe

This commit is a noop, see 7c1835c5Merged-by: James Almer <jamrial@gmail.com>

* commit '3ccec334':
  sbrdsp: Move a misplaced #endif directive to the right spot
Merged-by: James Almer <jamrial@gmail.com>

* commit 'e723dce6':
  dvbsubdec: Use NULL instead of 0 as pointer value

This commit is a noop. The affected code isn't in our tree.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'fc94a1ac':
  Revert "libavutil: Use an intermediate variable in AV_COPY*U"

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>

* commit '9806b9ab':
  Revert "Don't use expressions with side effects in macro parameters"

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f79d8474':
  intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64
Merged-by: James Almer <jamrial@gmail.com>

* commit '230b1c07':
  intreadwrite: Add intermediate variables in the byteswise AV_W*() macros

Mostly a noop. Merged for cosmetic purposes.
See d83ff76cMerged-by: James Almer <jamrial@gmail.com>

* commit '014773b6':
  libavutil: Use an intermediate variable in AV_COPY*U

This commit is a noop. It would be reverted in a future merge either
way.
Merged-by: James Almer <jamrial@gmail.com>

* commit '25bacd0a':
  Don't use expressions with side effects in macro parameters

This commit is a noop. It would be reverted in a future merge either
way.
Merged-by: James Almer <jamrial@gmail.com>

Fixes multiple  runtime error: shift exponent 792 is too large for 32-bit type 'unsigned int'

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

Fixes: 839/clusterfuzz-testcase-4871084446842880

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

Benchmarks with START_TIMER indicate that the code is faster with unsigned, (that is
with the patch), there was quite some fluctuation in the numbers so this may be just
random

Fixes: 811/clusterfuzz-testcase-6465493076541440

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

libnpp was erroneously grouped up with libfdk-aac and openssl to check
if --enable-nonfree wasn't passed only with --enable-gpl in
9f28db47. The latter two are compatible
with LGPL, libnpp is not.
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '7ebdffc3':
  dxv: Check to make sure we don't overrun buffers on corrupt inputs
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e328178d':
  qsvdec: only access hwaccel_context is the pixel format is QSV
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ed1cd810':
  flac demuxer: improve probing

Suggested commit very closely matches our code, except with regards to
AVPROBE_SCORE_EXTENSION. The code layout is mostly merged but preserves
our behaviour.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '5ebef79a':
  Fix instances of broken indentation found by gcc 6

Noop, see 21d3f0c0, 6089c44aMerged-by: Clément Bœsch <u@pkh.me>

* commit '5ed4644d':
  x11grab: Rename internal component to "xcbgrab"
Merged-by: Clément Bœsch <u@pkh.me>

* commit '4fef648d':
  Remove the legacy X11 screen grabber
Merged-by: Clément Bœsch <u@pkh.me>

* commit '8495d84f':
  ac3dec: Add some inline hints
Merged-by: Clément Bœsch <u@pkh.me>

* commit '3db51bf6':
  ac3dec: Simplify skipping
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f0ccc65b':
  ac3dec: Split coupling-specific code from decode_audio_block()
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a5ebe5d1':
  ac3dec: Split spx-specific code from decode_audio_block()
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2ac00d2d':
  mov: Validate the ID number

This commit is a noop as the modified check is not present in FFmpeg.
See d30870cc.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a115eb9e':
  mimic: do not release the newly obsolete reference at the end of decoding
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ae90119c':
  configure: Simplify license incompatibility check

An extra GPLV3 list is added for libsmbclient as having it in both GPL
and VERSION3 lists would cause a duplicate in the final config list.

Also, for consistency, libnpp is treated the same as the other nonfree
component (libfdk_aac and openssl).
Merged-by: Clément Bœsch <u@pkh.me>

add kVTCompressionPropertyKey_DataRateLimits support by rc_max_bitrate
Reviewed-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

* commit 'e46a6fb7':
  avconv: Check that muxing_queue exists before reading from it

Mostly noop. This was fixed in FFmpeg in 7f7c494a.

The merge makes the cosmetics match but does not include the weird
av_log().
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '100fb0dd':
  configure: Allow detecting and using LLVM lld-link as linker for windows
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '79fb0692':
  configure: Move defines for controlling MSVCRT headers to the CRT detection section
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '56af0bc1':
  configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block

Also includes _strtoui64 in the check.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '48b80f83':
  hpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '40ad05ba':
  checkasm: Cast unsigned to signed
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'b183abfb':
  vpx: Support color range

Decoder chunk not merged as the framework automatically copies avctx
color range to the frame color range. And we already set the avctx field
since cbcc88c0.
Merged-by: Clément Bœsch <cboesch@gopro.com>

when cannot get pkt duration, hlsenc segments duration will
be set to 0, this patch can fix it.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

Preparation for potentially disabling merged side data by default in the
libs. Do this in particular because it affects fate tests.

The changed tests either reflect added packet side data, or the changed
packet size due to merged side data removal reducing the packet size.

The current form of the messages indicating matches in the white
or black lists seems to be a bit too much relying on context.

Make the messages more explicit.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>