1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
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
..
2016-05-31 15:15:54 +02:00
2014-07-20 02:01:50 +02:00
2015-10-08 23:11:32 +02:00
2016-05-04 18:16:21 +02:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2016-03-28 14:13:17 -08:00
2016-05-04 18:16:21 +02:00
2015-02-02 05:04:14 +01:00