James Almer eba0414768 Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da' ...

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

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>

2016-09-28 13:30:27 -03:00

3.6 KiB

Raw Blame History

View Raw