Merge commit '757d8586'

* commit '757d8586':
  vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

Conflicts:
	libavcodec/mpeg12.c

Nothing changes as the buggy code is not in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>