This was merged in the wrong place.

Cherry-picked from libav commit cfee5e1aSigned-off-by: James Almer <jamrial@gmail.com>

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

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

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

Fixes: undefined behavior
Fixes: 702974
Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This avoids an integer overflow
the solution matches oggparsevorbis.c and 45581ed1

Fixes: 700242
Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Makes the test output consistent across all targets.

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

* commit 'e18ba2df':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5a1d605c':
  hwcontext_dxva2: split transfer_data() into upload/download functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9d702657':
  hwcontext_dxva2: fix handling of the mapping flags
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '0d3176e3':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

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

* commit 'adb0e941':
  avpacket: Mark src pointer as constant

See 5bb3f882Merged-by: Clément Bœsch <u@pkh.me>

* commit '0a4b9d0c':
  hlsenc: Add encryption support

This commit is a noop, see 907ac20a

Note that this commit differs from our encryption support in various
ways so it may need some adjustments in the future.
Merged-by: Clément Bœsch <u@pkh.me>

Commits ade370a4 and e3fb74f7 were reordered while merging, so this
change got lost.

* commit 'd860a3cc':
  crypto: Add encryption support

See 00d4013dMerged-by: Clément Bœsch <u@pkh.me>

* commit '76167140':
  qsvdec: Drop stray extra braces around initializer
Merged-by: Clément Bœsch <u@pkh.me>

* commit '715b8243':
  qsv: Drop some unused variables
Merged-by: Clément Bœsch <u@pkh.me>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'bb265b76':
  examples/transcode_aac: Drop pointless return value const qualifier

This commit is a noop, the function doesn't exist in FFmpeg anymore
since e181e290.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'bfe92dfe':
  Ignore all generated example binaries

This commit is a noop, the .gitignore was updated during the merges of
these examples.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'bf864627':
  doc: Add note about recent regression in AviSynth+
Merged-by: Clément Bœsch <u@pkh.me>

* commit '3cc3463f':
  avisynth: Support pix_fmts added to AviSynth+

This commit is mostly a noop, see
92916e85.

Cosmetics and a small fix are merged.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'aaae5970':
  avisynth: Simplify the pix_fmt check for the newer AviSynth API

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

* commit 'bcefafa2':
  avisynth: Fix setting stream timebase

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

* commit '481ff3cf':
  fate: Add h264 and hevc extradata reload tests

Only the HEVC part is merged, see 00c80798Merged-by: Clément Bœsch <u@pkh.me>

* commit 'd5d62ce6':
  mov: Fix identity matrix boolean logic

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

* commit '81d7f0bb':
  checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e7ae8f7a':
  aarch64: vp9: loop filter: replace 'orr; cbn?z' with 'adds; b.{eq,ne};

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

* commit 'd7595de0':
  aarch64: vp9: use alternative returns in the core loop filter function

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

* commit 'e17567a8':
  libilbc: support for latest git of libilbc

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

* commit 'ffe89e1e':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place
Merged-by: Clément Bœsch <u@pkh.me>