* commit 'd25afb57':
  vc1: Set the is_intra bitfield to all 1 when needed

Conflicts:
	libavcodec/vc1_block.c

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