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 /libavutil/hwcontext.c | |
| 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 'libavutil/hwcontext.c')
| -rw-r--r-- | libavutil/hwcontext.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 1e9e91329c..8af7afa5ce 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -35,6 +35,9 @@ static const HWContextType *hw_table[] = { #if CONFIG_DXVA2 &ff_hwcontext_type_dxva2, #endif +#if CONFIG_LIBMFX + &ff_hwcontext_type_qsv, +#endif #if CONFIG_VAAPI &ff_hwcontext_type_vaapi, #endif |