Michael Niedermayer 31c09b7663 Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'
* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
	libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 13:08:36 +01:00
..
2012-10-08 11:22:42 +02:00
2012-01-28 11:04:19 +01:00
2013-11-13 11:21:57 +01:00
2013-01-06 16:30:02 +01:00
2013-10-24 08:16:17 +02:00
2012-12-21 00:18:34 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00