* commit '69277069':
  dct: Check memory allocation

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

* commit 'e524f373':
  asv: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '074a1b37':
  aacpsy: Check memory allocation

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

* commit '149fa0b7':
  mpegvideo: Move MotionEstContext and function declarations to a separate header

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

* commit 'b2b76691':
  mpegvideo: mpeg12: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '378a0008':
  mpegvideo: Move tables to a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31a117a0':
  mpegvideo: msmpeg4: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f15846a':
  mpegvideo: wmv2: Move function declarations

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

* commit '902a55f7':
  dxva2_hevc: re-write reference frame handling

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

* commit '35818b8a':
  dxva2_hevc: fix 32x32 scaling lists

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

* commit '5c720657':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

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

* commit 'bff0349d':
  avio: Add avio_read wrapper to simplify error checking
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cffb9ea8':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

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

* commit '8e9c39e8':
  mov: abort on EOF in ff_mov_read_chan

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

* commit 'a8a90906':
  mov: Correctly allocate ctts_data

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

* commit 'f261a55d':
  mov: Fix two memleaks

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

* commit '3f38d4b8':
  vp9: Parse subsampling and report missing feature

Conflicts:
	libavcodec/vp9.c
	libavcodec/vp9.h

No change as FFmpeg already supports subsampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd68c0538':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

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

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

* commit 'cae39851':
  x86: Add helper macros to check for slow cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7cafb5d':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

* commit 'd0bf20a4':
  ppc: vsx: Implement diff_pixels and get_pixels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'eecd29b3':
  ppc: vsx: Implement float_dsp

Conflicts:
	libavutil/ppc/float_dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '7d07ee5a':
  ppc: cpu: Add support for VSX and POWER8 extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'da60b99a':
  ppc: Restrict some Altivec implementations to Big Endian

Conflicts:
	libavcodec/ppc/huffyuvdsp_altivec.c
	libavcodec/ppc/me_cmp.c

Not merged, our PPC64LE fate clients passed all tests last time they did run
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f22ebd25':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
	configure

See: ab123739 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3058872c':
  ppc: Clarify and extend the cpuid check

Conflicts:
	libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'baa94563':
  ppc: linux: Check altivec using the auxv

Conflicts:
	libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7014b659':
  ppc: pixblockdsp: Use the abriged vector types
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '72cebae0':
  ppc: avutil: Use the abriged vector types

Conflicts:
	libavutil/ppc/float_dsp_altivec.c
	libavutil/ppc/util_altivec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '254eb5b6':
  ppc: avutil: Drop a potentially dangerous workaround

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

avoid calling cleanup functions on uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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