* commit '69f6f03c':
  rv10: cosmetics, reformat
  qdm2: check that the FFT size is a power of 2

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