* commit 'ce083282':
  vdpau: common support for managing the VdpDecoder in avcodec

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