* commit '701e8b42':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
	libavcodec/vc1_parser.c

See: a0d7f9ecMerged-by: Michael Niedermayer <michaelni@gmx.at>