* commit '08b028c1':
  Remove INIT_AVX from x86inc.asm.
  Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
  dv: fix indentation

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