* commit 'cf9861de':
  isom: Add X-Com Radvision FourCC

See: ac494e5aMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '02d76141':
  riff: Add 'tshd' FourCC for H.264

Conflicts:
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0f504e9':
  libx264: Allow full-range yuv422 and yuv444 pixel formats

See: 79209f5dMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9ed48e8':
  dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '48aef27f':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

See: b38910c9Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -

* commit '96dd0442':
  isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91894f27':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
	configure

See: 9e208ce6Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Prevent a spurious read from uninitialized memory.

It uses 6 registers, unbreaks building on hardened x86 system.

Bug-Id: gentoo/541930
CC: libav-stable@libav.org

As produced by Camtasia 4.

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also make sure the allocation and its check are properly done.

This macro is unused since 247fa6c2.

* commit '2cb9c2fc':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Real world MMX code does not put EMMS at the start and end of every function,
it would be incredibly inefficient to do that
thus do not warn about that
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '50ff0c05':
  movenc: Support writing multiple trun atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'faab8f9f':
  configure: move cross_compile checks after the toolchain section

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e1b5cbc':
  configure: handle Apple's armv7s in probe_arm_arch()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f01c7715':
  fate: add explicit support for the toolchain configure option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9d60c39':
  doc: fate: remove outdated SSH key fingerprint

Conflicts:
	doc/fate.texi

Not merged, this does not apply to our servers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>