diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:23:16 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:23:16 +0000 |
| commit | 6992276acaaee32b33bd5f6e2f0d89588c4ae59a (patch) | |
| tree | cd5d035d3293ae6076de0b6cc0a41e132e64539d /libavutil/hwcontext.c | |
| parent | 63c3e35332838fca19b7ffdae13233b0f3759402 (diff) | |
| parent | ad884d100259e55cb51a4239cd8a4fd5154c2073 (diff) | |
Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'
* commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073':
hwcontext: add a CUDA implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@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 08a0859752..3eada29742 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -29,6 +29,9 @@ #include "pixfmt.h" static const HWContextType *hw_table[] = { +#if CONFIG_CUDA + &ff_hwcontext_type_cuda, +#endif #if CONFIG_VDPAU &ff_hwcontext_type_vdpau, #endif |