* commit '04d14c9b':
  vc1: Split the decoder in components

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