* commit '5dcc2015':
  simple_idct: Move x86-specific declarations to a header in the x86 directory

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