* 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>

Add some planar formats we can handle without distorting the meaning of
hi and lo.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It's often really helpful to know why a frame wasn't decimated (lo or
hi), and how much you exceeded the threshold by, if you're trying to
tweak the thresholds to get what you want.

mpdecimate already prints a line per input frame with -v debug, this
just makes it longer.
Signed-off-by: Peter Cordes <peter@cordes.ca>

If avio_read fails, the buffer can contain uninitialized data.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings, and addresses a few memleaks.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

In this case the mov demuxer can return a large number of empty packets.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Otherwise the loop can take a lot of time if num_descr is very large.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

It can be reallocated.

CC: libav-stable@libav.org

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org

avfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixelutils_get_sad_fn()
Signed-off-by: Peter Cordes <peter@cordes.ca>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>