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

Conflicts:
    doc/APIchanges
    libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>