diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-26 22:22:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-26 22:22:17 -0300 |
| commit | 1eee394c7c84c3b755bc856a49607214de206ded (patch) | |
| tree | 4cc4e0a17dffedfff70b10b40addfc99a4147fef /libavcodec/vc1dec.c | |
| parent | 921d7af6e9e65fabade00e35a7d40a6b80b0a58b (diff) | |
| download | ffmpeg-1eee394c7c84c3b755bc856a49607214de206ded.tar.gz | |
avcodec/vc1dec: fix preprocessor checks and hw_configs lists for the hwaccels
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ac4cfed2c8..cbef89f254 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1146,23 +1146,23 @@ AVCodec ff_vc1_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal*[]) { -#if CONFIG_WMV3_DXVA2_HWACCEL - HWACCEL_DXVA2(wmv3), +#if CONFIG_VC1_DXVA2_HWACCEL + HWACCEL_DXVA2(vc1), #endif -#if CONFIG_WMV3_D3D11VA_HWACCEL - HWACCEL_D3D11VA(wmv3), +#if CONFIG_VC1_D3D11VA_HWACCEL + HWACCEL_D3D11VA(vc1), #endif -#if CONFIG_WMV3_D3D11VA2_HWACCEL - HWACCEL_D3D11VA2(wmv3), +#if CONFIG_VC1_D3D11VA2_HWACCEL + HWACCEL_D3D11VA2(vc1), #endif -#if CONFIG_WMV3_NVDEC_HWACCEL - HWACCEL_NVDEC(wmv3), +#if CONFIG_VC1_NVDEC_HWACCEL + HWACCEL_NVDEC(vc1), #endif -#if CONFIG_WMV3_VAAPI_HWACCEL - HWACCEL_VAAPI(wmv3), +#if CONFIG_VC1_VAAPI_HWACCEL + HWACCEL_VAAPI(vc1), #endif -#if CONFIG_WMV3_VDPAU_HWACCEL - HWACCEL_VDPAU(wmv3), +#if CONFIG_VC1_VDPAU_HWACCEL + HWACCEL_VDPAU(vc1), #endif NULL }, @@ -1183,22 +1183,22 @@ AVCodec ff_wmv3_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal*[]) { -#if CONFIG_VC1_DXVA2_HWACCEL +#if CONFIG_WMV3_DXVA2_HWACCEL HWACCEL_DXVA2(wmv3), #endif -#if CONFIG_VC1_D3D11VA_HWACCEL +#if CONFIG_WMV3_D3D11VA_HWACCEL HWACCEL_D3D11VA(wmv3), #endif -#if CONFIG_VC1_D3D11VA2_HWACCEL +#if CONFIG_WMV3_D3D11VA2_HWACCEL HWACCEL_D3D11VA2(wmv3), #endif -#if CONFIG_VC1_NVDEC_HWACCEL +#if CONFIG_WMV3_NVDEC_HWACCEL HWACCEL_NVDEC(wmv3), #endif -#if CONFIG_VC1_VAAPI_HWACCEL +#if CONFIG_WMV3_VAAPI_HWACCEL HWACCEL_VAAPI(wmv3), #endif -#if CONFIG_VC1_VDPAU_HWACCEL +#if CONFIG_WMV3_VDPAU_HWACCEL HWACCEL_VDPAU(wmv3), #endif NULL |