ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
id3v2: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c

The function does not do any rounding, so there is no point in
keeping it in a round template file.
x86: dsputil: Move cavs and vc1-specific functions where they belong
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: K&R formatting cosmetics
  ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add wmv2 dependency to vc1 compilation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
vmdav: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
vmdav: unbreak decoding of samples from game The Last Dynasty

This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since c0cbe36b18ab3e.

While here show warning if decoding is aborted for some reason.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avutil/mem: add av_memdup()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/blend: use correct way to check number of planes

This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavfi/blend: merge config_input_top into config_output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavu/opencl: fix bug of opencl options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: fix segfault with random output

Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ape_decode_value_3900: check tmpk

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ape_decode_value_3860: check k before using it in get_bits()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
cavs: Remove cavsdata.h header, unused since 88386feefd
aac: Remove aacpsy.h header, unused since 78e65cd7726
nutdec: Implement duration parsing for indexed nuts

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