[FFmpeg-cvslog] Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 11:07:07 2013 +0100| [7609d42d0f4682ccccbebe0c70613af189134a33] | committer: Michael Niedermayer

Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'

* commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7609d42d0f4682ccccbebe0c70613af189134a33
---