summaryrefslogtreecommitdiff
path: root/libavutil/hwcontext_qsv.h
Commit message (Collapse)AuthorAge
* Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'James Almer2016-09-28
| | | | | | | | | | | * commit '59e7361cc791e5103be1712dc59a2055f118d0da': hwcontext: add a QSV implementation Conflicts: doc/APIchanges libavutil/version.h Merged-by: James Almer <jamrial@gmail.com>
* hwcontext: add a QSV implementationAnton Khirnov2016-06-21