Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
[ffmpeg.git] / libavcodec / vdpau_vc1.c
2013-01-14 Michael NiedermayerMerge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'
2013-01-13 Rémi Denis-Courmontvdpau: Add VC-1 decoding via hwaccel infrastructure