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

Merge commit '172b2cee' 


* commit '172b2cee':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
	libavcodec/dxva2.c

See: 94d07b31
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 7fc6545d 172b2cee
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
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