Skip to content

F
ffmpeg.wasm-core
Commit 4a5074d7 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '84b223cc' 

* commit '84b223cc':
  configure: Make the new qsv encoder depend on libmfx

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2ecbf44f 84b223cc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
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