* commit '728c4658':
  vdpau: add a constructor for AVVDPAUContext.

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