(cherry picked from Libav commit d10102d2)
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

when set_compensation is called with zero sample_delta,
compensation does not happen (because dst_incr == ideal_dst_incr)
but compensation_distance is set

regression since 01ebb57cFound-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

This cna happen if the user tries to call the new decode API for
subtitles.

Fixes CID 1402071.

Reflects the actual code and silences a gcc warning:
ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type

* commit '0df48011':
  vp9: make mv bounds 32bit.

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

* commit '24a36256':
  buffer: fix av_buffer_realloc() when the data is offset wrt buffer start
Merged-by: Clément Bœsch <u@pkh.me>

Fixes a gcc warning:
libavcodec/utils.c:2244:26: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Reflects the actual code and silences a gcc warning:
libavcodec/utils.c:2102:36: warning: passing argument 1 of 'av_packet_get_side_data' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Add missing options.
List correct variable types.
Re-order options and markup flag options properly.
Add more texinfo markup.
Signed-off-by: Lou Logan <lou@lrcd.com>

pcr_period is in milliseconds.
Signed-off-by: Lou Logan <lou@lrcd.com>

* commit 'e99ecda5':
  checkasm: add vp9 MC tests.
  vp9mc/x86: sse2 MC assembly.
  vp9mc/x86: add AVX and AVX2 MC
  vp9mc/x86: rename ff_* to ff_vp9_*
  vp9mc/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
  vp9mc/x86: simplify a few inits.
  vp9mc/x86: add 16px functions (64bit only).

Noop (aside from a formatting comment in vp9mc.asm). We already have all
of this. We should consider making a final diff between the two projects
when the dust comes down.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '89466de4':
  vp9/x86: rename vp9dsp to vp9mc

File was already renamed, only the top description is updated.
Merged-by: Clément Bœsch <u@pkh.me>

better quality without speedloss
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

avcodec/h264_cabac: Fix runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself

Fixes: 858/clusterfuzz-testcase-5168477042114560

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

Fixes: 857/clusterfuzz-testcase-5319093760557056

Benchmark changes from 335->333 (so if its not a random fluctuation then it would be faster)

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

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

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

That pointer isn't used by absolutely anything.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '89aebc5b':
  lavc: align the linesize to 32 when AVX is enabled
Merged-by: James Almer <jamrial@gmail.com>

* commit '63ac8e2d':
  lavu: add LOCAL_ALIGNED_32

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

* commit '3c504bc3':
  x86: deduplicate some constants
Merged-by: James Almer <jamrial@gmail.com>

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