Michael Niedermayer 8ee7b3881b 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@gmx.at>
2013-01-14 13:29:00 +01:00
..
2012-10-08 11:22:42 +02:00
2013-01-02 23:52:35 +01:00
2012-01-28 11:04:19 +01:00
2012-12-15 11:46:47 +01:00
2013-01-05 10:25:32 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2012-12-24 00:53:55 +01:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2012-10-02 09:43:27 +02:00
2012-12-21 00:18:34 +01:00