diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-22 22:38:49 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-22 22:38:49 +0200 |
| commit | 3689efea3d59579291ecafccc3d9cbe720e7bea3 (patch) | |
| tree | 7bde9ce5ad61c7b9fe7f5bb0e23ea17a0adc90f5 /libavutil/hwcontext.c | |
| parent | d0b21b28a3d348c0302c98cee23c4820cd13e1e2 (diff) | |
| parent | c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8 (diff) | |
| download | ffmpeg-3689efea3d59579291ecafccc3d9cbe720e7bea3.tar.gz | |
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@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 619f21eab3..eeeb2880ff 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -32,6 +32,9 @@ static const HWContextType *hw_table[] = { #if CONFIG_CUDA &ff_hwcontext_type_cuda, #endif +#if CONFIG_DXVA2 + &ff_hwcontext_type_dxva2, +#endif #if CONFIG_VAAPI &ff_hwcontext_type_vaapi, #endif |