Skip to content
Snippets Groups Projects
Commit eba04147 authored by James Almer's avatar James Almer
Browse files

Merge commit '59e7361c' 


* commit '59e7361c':
  hwcontext: add a QSV implementation

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: default avatarJames Almer <jamrial@gmail.com>
parents e9a5fc96 59e7361c
No related branches found
No related tags found
No related merge requests found
Expand all 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