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

Merge commit '7d3183d3' 


* commit '7d3183d3':
  qsv: Skip header compilation depending on what parts of qsv are enabled

Conflicts:
	libavcodec/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0187c2cc 7d3183d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment