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

Merge commit '89ac99ba' 


* commit '89ac99ba':
  vdpau: pass codec-specific parameters from hwaccel

Conflicts:
	libavcodec/vdpau.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8df41976 89ac99ba
No related branches found
No related tags found
No related merge requests 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