* commit '6f1960ab':
  idct: cosmetics: Drop one unnecessary if-block level

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