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

* qatar/master:
  x86: dsputil: Simplify xvmc deprecation conditional

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

* commit 'dc4d726b':
  build: Add separate hidden config option for the intrax8 code

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

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

* qatar/master:
  aarch64: port neon clobber test from arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f896bca0':
  aarch64: h264 (bi)weight NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '36e3b1f2':
  aarch64: h264 loop filter NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This allows for slightly cleaner dependency specification.

* commit 'c65d67ef':
  aarch64: hpeldsp NEON optimizations

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

* commit 'd5dd8c7b':
  aarch64: h264 qpel NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8438b3f0':
  aarch64: h264 idct NEON assembler optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '71617884':
  aarch64: h264 chroma motion compensation NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b7b17ed6':
  aarch64: add cpuflags support for NEON and VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1e9265cd':
  dct-test: test ff_simple_idct_neon only on ARM for now
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2620df13':
  mov: Free an earlier allocated array if allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd51f0996':
  mov: Free intermediate arrays in the normal cleanup function

Conflicts:
	libavformat/mov.c

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

4412 decicycles in ff_vp9_loop_filter_h_16_16_ssse3, 4193462 runs, 842 skips
3600 decicycles in ff_vp9_loop_filter_h_16_16_avx, 4193621 runs, 683 skips

3010 decicycles in ff_vp9_loop_filter_v_16_16_ssse3, 4193528 runs, 776 skips
2678 decicycles in ff_vp9_loop_filter_v_16_16_avx, 4193742 runs, 562 skips

23025 decicycles in ff_vp9_idct_idct_32x32_add_ssse3, 2096871 runs, 281 skips
19943 decicycles in ff_vp9_idct_idct_32x32_add_avx, 2096815 runs, 337 skips

4675 decicycles in ff_vp9_idct_idct_16x16_add_ssse3, 4194018 runs, 286 skips
3980 decicycles in ff_vp9_idct_idct_16x16_add_avx, 4194022 runs, 282 skips

967 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 16776972 runs, 244 skips
887 decicycles in ff_vp9_idct_idct_8x8_add_avx, 16777002 runs, 214 skips

Ported from ARMv7 NEON.

Ported from ARMv7 NEON.

Ported from ARMv7 NEON.

Ported from ARMv7 NEON.

Ported from ARMv7 NEON.

Since RV40 and VC-1 use almost the same algorithm so optimizations for
those two decoders are easy to do and included.

NEON and VFP are currently mandatory for all ARMv8 profiles. Both are
handled as extensions as far as cpuflags are concerned. This is
consistent with handling x86_64 which always has SSE2, but still
handles it as an extension.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

It could probably also be considered an error if the pointer isn't
null at this point, but then we might risk rejecting some
slightly broken files that we might have handled so far.

Sample-Id: 00000496-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

These arrays are normally freed at the end of mov_read_trak,
but make sure they're freed in case mov_read_trak returned
early (due to errors) or in case the atoms that allocate arrays
are encountered at some other point than within a trak (which
we don't have checks against).

Sample-Id: 00000496-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  aarch64: bswap inline assembly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '032d4da8':
  aarch64: configure: set arch dependent features
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b411918':
  cabac: remove leftovers from the cabac encoder

Not merged, as we have not removed the cabac test which uses these
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3304

Alternatively max_dec_pic_buffering could be removed completely as its not used.

Based on a patch by Jose Santiago <santiago@haivision.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also remove "webp:" from log messages. Using the AVCodecContext is enough.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b9902ed90_7462_new_alaw.voc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mxf: Fix potential leak in mxf_read_local_tags()

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

* commit '8b708f1c':
  mxf: Correctly support files from Pinnacle Thunder

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

* commit '0d6605c7':
  mxf: Fix a possible leak of extradata

Conflicts:
	libavformat/mxfdec.c

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

* commit '1a4e4ad0':
  mxf: Use av_malloc_array

Conflicts:
	libavformat/mxfdec.c

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

Signed-off-by: Janne Grunau <janne-libav@jannau.net>