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

Merge commit '35177ba7' 


* commit '35177ba7':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9c6eef6f 35177ba7
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