mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-07-05 06:08:51 +00:00
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
hwcontext: add a QSV implementation
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
101 KiB
101 KiB