* commit '582963a8':
  vdpau: Fix VC-1 interlaced mode

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