Michael Niedermayer a61899a0f1 Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0' ...

* commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0':
  vdpau: add av_vdpau_bind_context()

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

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

2014-10-06 15:04:03 +02:00

84 KiB

Raw Blame History

View Raw