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

Merge commit 'a61c2115' 


* commit 'a61c2115':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c6eee312 a61c2115
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