[FFmpeg-cvslog] Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 13:54:05 2013 +0200| [3b805dcaa97ed8ac085d6af07ba450846f8487e3] | committer: Michael Niedermayer

Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'

* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h

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

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