diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-10-01 15:25:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-01 15:25:44 +0200 |
commit | 8e8fcee4a55de171303ebe526d3cf051522111bf (patch) | |
tree | fef75d382fc6216a093eeaf80560473dff19d883 /media/ffvpx/libavutil/hwcontext.h | |
parent | 79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (diff) | |
parent | 45c24f05d023a2cd8289ed40a13708392ce2e6a4 (diff) | |
download | UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.gz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.lz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.xz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.zip |
Merge pull request #805 from MoonchildProductions/revert-801-update-from-upstream
Revert "Update ffvpx code to 4.0.2"
Diffstat (limited to 'media/ffvpx/libavutil/hwcontext.h')
-rw-r--r-- | media/ffvpx/libavutil/hwcontext.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/ffvpx/libavutil/hwcontext.h b/media/ffvpx/libavutil/hwcontext.h index f5a4b6238..03334e20e 100644 --- a/media/ffvpx/libavutil/hwcontext.h +++ b/media/ffvpx/libavutil/hwcontext.h @@ -25,17 +25,15 @@ #include "pixfmt.h" enum AVHWDeviceType { - AV_HWDEVICE_TYPE_NONE, AV_HWDEVICE_TYPE_VDPAU, AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_VAAPI, AV_HWDEVICE_TYPE_DXVA2, AV_HWDEVICE_TYPE_QSV, AV_HWDEVICE_TYPE_VIDEOTOOLBOX, + AV_HWDEVICE_TYPE_NONE, AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DRM, - AV_HWDEVICE_TYPE_OPENCL, - AV_HWDEVICE_TYPE_MEDIACODEC, }; typedef struct AVHWDeviceInternal AVHWDeviceInternal; |