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_internal.h | |
| 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_internal.h')
| -rw-r--r-- | libavutil/hwcontext_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index 0ea04f802e..f18b616fca 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -97,6 +97,7 @@ struct AVHWFramesInternal { }; extern const HWContextType ff_hwcontext_type_cuda; +extern const HWContextType ff_hwcontext_type_vaapi; extern const HWContextType ff_hwcontext_type_vdpau; #endif /* AVUTIL_HWCONTEXT_INTERNAL_H */ |