[FFmpeg-cvslog] Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 13:24:22 2013 +0200| [bf36dc50ea448999c8f8c7a35f6139a7040f6275] | committer: Michael Niedermayer

Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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