diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:49:55 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:49:55 +0100 |
| commit | 28abb216cbd5736d65973165b830c08815ce0227 (patch) | |
| tree | 992cf32eb3eb44dd2007c4108e9564c3317725e6 /libavutil/hwcontext.c | |
| parent | eb2da769bddf7e8f4f3202162dacd17c77770dd8 (diff) | |
| parent | 551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4 (diff) | |
| download | ffmpeg-28abb216cbd5736d65973165b830c08815ce0227.tar.gz | |
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
lavu: VAAPI hwcontext 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 4dfec2c4dc..b34b317d5d 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_VAAPI + &ff_hwcontext_type_vaapi, +#endif #if CONFIG_VDPAU &ff_hwcontext_type_vdpau, #endif |