diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-10-26 00:18:47 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-11-26 21:41:19 +0000 |
| commit | b0cd14fb1dab4b044f7fe6b53ac635409849de77 (patch) | |
| tree | 62b0130fd26c8b2c859fcf426e3432f2fd3f9725 /fftools/ffmpeg.h | |
| parent | 3a71bcc213f223428622ac3750fe1a923f2f3ab4 (diff) | |
| download | ffmpeg-b0cd14fb1dab4b044f7fe6b53ac635409849de77.tar.gz | |
ffmpeg: Use codec hardware config to configure hwaccels
Removes specific support for all hwaccels supported by the generic code
(DXVA2, D3D11VA, NVDEC, VAAPI and VDPAU).
Diffstat (limited to 'fftools/ffmpeg.h')
| -rw-r--r-- | fftools/ffmpeg.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e0977e1bf1..4e73d59082 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -61,14 +61,10 @@ enum HWAccelID { HWACCEL_NONE = 0, HWACCEL_AUTO, - HWACCEL_VDPAU, - HWACCEL_DXVA2, + HWACCEL_GENERIC, HWACCEL_VIDEOTOOLBOX, HWACCEL_QSV, - HWACCEL_VAAPI, HWACCEL_CUVID, - HWACCEL_D3D11VA, - HWACCEL_NVDEC, }; typedef struct HWAccel { @@ -76,7 +72,6 @@ typedef struct HWAccel { int (*init)(AVCodecContext *s); enum HWAccelID id; enum AVPixelFormat pix_fmt; - enum AVHWDeviceType device_type; } HWAccel; typedef struct HWDevice { @@ -370,11 +365,11 @@ typedef struct InputStream { /* hwaccel options */ enum HWAccelID hwaccel_id; + enum AVHWDeviceType hwaccel_device_type; char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; /* hwaccel context */ - enum HWAccelID active_hwaccel_id; void *hwaccel_ctx; void (*hwaccel_uninit)(AVCodecContext *s); int (*hwaccel_get_buffer)(AVCodecContext *s, AVFrame *frame, int flags); |