* commit 'e5e8a26d':
  libxvid: Use proper context in av_log() calls
Merged-by: James Almer <jamrial@gmail.com>

* commit '12db2832':
  libxvid: Require availability of mkstemp()

This commit is a noop. Our libxvid wrapper doesn't use mkstemp().
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a67ae670':
  arm: vp9: Add NEON itxfm routines

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

* commit '0b37cd09':
  checkasm: add vp9dsp.itxfm_add tests.

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

* commit 'fd0fae60':
  pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

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

* commit '11623217':
  arm: vp9mc: Use a different helper register for PIC loads

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

* commit '824e8c28':
  arm: Clear the gp register alias at the end of functions

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

* commit '905cdcaa':
  examples/decode_audio: Add missing header for av_free()
Merged-by: James Almer <jamrial@gmail.com>

* commit '6a62795d':
  aarch64: h264idct: Use the offset parameter to movrel

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

* commit '557c1675':
  arm: vp9mc: Minor adjustments from review of the aarch64 version

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

* commit '383d96aa':
  aarch64: vp9: Add NEON optimizations of VP9 MC functions

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

* commit 'c44a8a3e':
  aarch64: Add an offset parameter to the movrel macro

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

* commit 'a4cfcddc':
  vp9: Make the subpel filters non-static

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

* commit '98cae966':
  matroskaenc: write updated STREAMINFO metadata for FLAC streams if available

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

* commit 'f4bf2363':
  matroskaenc: fix muxing AAC streams when using aac_adtstoasc bsf

This commit is a noop. aac_adtstoasc bsf sends its extradata update
straight to codecpar->extradata.
This behavior violates the bsf API and should be fixed so this change
may then be applied.
Merged-by: James Almer <jamrial@gmail.com>

* commit '84f22568':
  pthread_frame: properly propagate the hw frame context across frame threads

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

* commit '72a19f40':
  mpegaudiodsp: aarch64: Adjust function prototype after 2caa93b8Merged-by: James Almer <jamrial@gmail.com>

* commit '2dd46486':
  configure: Move license checks directly after command line parsing
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c78495d1':
  configure: Log name and parameters of all helper functions where it makes sense
Merged-by: James Almer <jamrial@gmail.com>

* commit '8a6e7a67':
  configure: Use check_cpp in CPP flags tests
Merged-by: James Almer <jamrial@gmail.com>

* commit '831005b2':
  configure: Log correct test name and use correct filter when testing objective C flags
Merged-by: James Almer <jamrial@gmail.com>

* commit 'fe7bc1f1':
  configure: Do not unconditionally check for (and enable) xlib
Merged-by: James Almer <jamrial@gmail.com>

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes ticket #6280.

It was addressed in commit 91ccd38c

The value must be identical between slices, since mbaff depends on
picture_structure and sps, both of which are checked to be identical
to the first slice before this point.

In practice, this silences some tsan warnings in fate-h264.

Doing so is analogous to writing to source data in memcpy(), and causes
(harmless) tsan warnings in fate-h264.

This fixes race conditions reported by tsan in fate-lagarith. The races
were because each thread's LagarithContext::avctx was set to the first
thread's AVCodecContext.

This fixes a race condition that was already documented in the source
code, and is also reported by tsan in fate-fic-avi.

Fixes reported race conditions by tsan in fate-avio-direct.

Otherwise all thread's private contexts have the avctx pointer set to
the AVCodecContext of the first thread, which means all writes to
ctx->avctx->* (in e.g. read_header) are effectively race conditions.

Fixes fate-dnxhd under tsan.

Adding an MOV format option to turn on/off the editlist supporting code, introduced in https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

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