* commit 'c220a60f':
  vdpau: add helper for surface chroma type and size

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