Skip to content
Snippets Groups Projects
Commit a61899a0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'e3e158e8' 


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

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

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 067d11bf e3e158e8
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment