diff options
author | James Almer <jamrial@gmail.com> | 2016-09-28 13:30:27 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:30:27 -0300 |
commit | eba041476879fc46a49fa36fca03f1565ecaefca (patch) | |
tree | 937fd074b99894eb3f1c9ec096c8e74bbe12f946 /doc | |
parent | e9a5fc967867f9bd361f472306ca130bb64b0b04 (diff) | |
parent | 59e7361cc791e5103be1712dc59a2055f118d0da (diff) | |
download | ffmpeg-eba041476879fc46a49fa36fca03f1565ecaefca.tar.gz |
Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
hwcontext: add a QSV implementation
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 7acfc3e845..786962973a 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-09-xx - xxxxxxx - lavu 55.32.100 / 55.16.0 - hwcontext.h hwcontext_qsv.h + Add AV_HWDEVICE_TYPE_QSV and a new installed header with QSV-specific + hwcontext definitions. + 2016-09-xx - xxxxxxx - lavc 57.59.100/ 57.23.0 - avcodec.h AVCodecContext.hw_frames_ctx now may be used by decoders. |