* commit '92ebb332':
  mxf: Add additional H264 PictureEssenceCoding

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

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

Makes no difference for any file tested but is needed
for following bug-fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

0 should have been the default, this change should make no difference
but this is needed for the following bugfix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Unbreak some MXF Proxy files.

* qatar/master:
  aarch64: float_dsp NEON assembler
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1b51b7ba':
  libopenjpeg: Support rgba64 decoding

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

* commit '8f45bd14':
  libopenjpeg: Support rgba64 encoding

Conflicts:
	libavcodec/libopenjpegenc.c

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

* commit '1ea9fa15':
  libopenjpeg: K&R formatting cosmetics

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is part of the patch-set for intel C inline asm on windows support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Ported from arm NEON and added vector_dmul_scalar.

Functions between 1.5 and 5 times faster than the C implementations
using Apple's clang-503.0.19 on A7.

Improves rgb -> gray16 conversion

Fixes Ticket3422

The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This is limited to the case where x264_build = -1, to not break x264 decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  float_dsp: add test program and use it as fate test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd961a79e':
  sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c829b35c':
  lavc: er: remove unused variable size

No change as the variable is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ca80e158':
  mpegts: Forward error codes in various functions

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

* commit '86ba2327':
  mpegts: K&R formatting cosmetics

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

Avoids a warning of the unused function 'autocorrelate'.

The code using it was removed in d66e305b.

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

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

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

* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
Merged-by: Michael Niedermayer <michaelni@gmx.at>