* commit 'd46c588f':
  Remove commented-out #includes
  h263dec: Remove broken and disabled debug cruft
  vc1: Reindent INIT_LUT(), align backslashes

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