* commit '82ee14d2':
  ppc: dsputil: comment formatting and wording/grammar improvements

Conflicts:
	libavcodec/ppc/gmc_altivec.c
	libavcodec/ppc/idct_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cce791b1':
  hpeldsp_template: Merge some declarations and initializations

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

* commit '2539cf1c':
  hpeldsp_template: K&R formatting cosmetics

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

* commit '2972087e':
  hpel_template: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e8eace32':
  hpel_template: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  float-dsp-test: do not use C99's predefined  __func__
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is not supported by all compilers on FATE. Fixes "some test were
skipped" errors.

At least two times faster than the C version.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     348.8  20.1     339.6  15.1    88.8%       +2.7%  (insignificant)
6:2 function  38.1   8.1      26.4   4.1     100.0%      +44.5%
8:2 total     339.1  15.4     324.5  15.5    99.4%       +4.5%
8:2 function  33.8   7.0      27.3   5.6     99.7%       +23.6%
6:6 total     604.6  20.8     572.8  20.6    100.0%      +5.6%
6:6 function  95.8   8.4      68.9   8.2     100.0%      +39.1%
8:8 total     766.4  17.6     741.5  21.2    100.0%      +3.4%
8:8 function  106.0  11.4     86.1   9.9     100.0%      +23.1%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '606cc8af':
  configure: ppc: Disable ldbrx instruction by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'af9481d7':
  mxf: Lowercase UL strings

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

* commit '6920fb2b':
  mxf: Verbose debug logging
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '842ea36c':
  mxf: Override faulty PreviousPartition entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This fixes fate-float_dsp-test on RVCT 4.0.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

Only enable it for CPUs that support it.
This restores the behavior prior to 7a650caf.

The specification uses lower case most of the time.

Print the UL in code format and in the short format used by the
specification.

Some files set the PreviousPartition field to point to its own offset.

If we are parsing forward the Previous partition is immediately known
and its value could be used, otherwise we can safely point to the
header.
Reported-By: Jean Baptiste Kempf <jb@videolan.org>

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>