* commit 'bc75b64c':
  vc1pred: remove logically dead code

Conflicts:
	libavcodec/vc1_pred.c

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