[FFmpeg-cvslog] Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 13:00:10 2013 +0100| [5f231d909f158e40d20281b88e7aecc2333057fe] | committer: Michael Niedermayer

Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'

* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

Conflicts:
	doc/APIchanges
	libavcodec/vdpau.c
	libavcodec/vdpau.h
	libavcodec/version.h

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

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