* commit 'c0d973c4':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

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