[FFmpeg-cvslog] Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 13:29:00 2013 +0100| [8ee7b3881bfe96981de28d6eedaf1dcb59fe3215] | committer: Michael Niedermayer

Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
  vdpau: Add context and common helpers for hwaccel support

Conflicts:
	Changelog
	doc/APIchanges
	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=8ee7b3881bfe96981de28d6eedaf1dcb59fe3215
---