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.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.h')
| -rw-r--r-- | libavutil/hwcontext.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h index ee0f1df299..44be1977a8 100644 --- a/libavutil/hwcontext.h +++ b/libavutil/hwcontext.h @@ -27,6 +27,7 @@ enum AVHWDeviceType { AV_HWDEVICE_TYPE_VDPAU, AV_HWDEVICE_TYPE_CUDA, + AV_HWDEVICE_TYPE_VAAPI, }; typedef struct AVHWDeviceInternal AVHWDeviceInternal; |