Skip to content

F
ffmpeg.wasm-core
Commit 1eee394c authored by James Almer's avatar James Almer
Browse files
Options

avcodec/vc1dec: fix preprocessor checks and hw_configs lists for the hwaccels 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 921d7af6
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
libavcodec/vc1dec.c
View file @ 1eee394c
...@@ -1146,23 +1146,23 @@ AVCodec ff_vc1_decoder = { ...@@ -1146,23 +1146,23 @@ AVCodec ff_vc1_decoder = {
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.pix_fmts = vc1_hwaccel_pixfmt_list_420, .pix_fmts = vc1_hwaccel_pixfmt_list_420,
.hw_configs = (const AVCodecHWConfigInternal*[]) { .hw_configs = (const AVCodecHWConfigInternal*[]) {
#if CONFIG_WMV3_DXVA2_HWACCEL #if CONFIG_VC1_DXVA2_HWACCEL
HWACCEL_DXVA2(wmv3), HWACCEL_DXVA2(vc1),
#endif #endif
#if CONFIG_WMV3_D3D11VA_HWACCEL #if CONFIG_VC1_D3D11VA_HWACCEL
HWACCEL_D3D11VA(wmv3), HWACCEL_D3D11VA(vc1),
#endif #endif
#if CONFIG_WMV3_D3D11VA2_HWACCEL #if CONFIG_VC1_D3D11VA2_HWACCEL
HWACCEL_D3D11VA2(wmv3), HWACCEL_D3D11VA2(vc1),
#endif #endif
#if CONFIG_WMV3_NVDEC_HWACCEL #if CONFIG_VC1_NVDEC_HWACCEL
HWACCEL_NVDEC(wmv3), HWACCEL_NVDEC(vc1),
#endif #endif
#if CONFIG_WMV3_VAAPI_HWACCEL #if CONFIG_VC1_VAAPI_HWACCEL
HWACCEL_VAAPI(wmv3), HWACCEL_VAAPI(vc1),
#endif #endif
#if CONFIG_WMV3_VDPAU_HWACCEL #if CONFIG_VC1_VDPAU_HWACCEL
HWACCEL_VDPAU(wmv3), HWACCEL_VDPAU(vc1),
#endif #endif
NULL NULL
}, },
...@@ -1183,22 +1183,22 @@ AVCodec ff_wmv3_decoder = { ...@@ -1183,22 +1183,22 @@ AVCodec ff_wmv3_decoder = {
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.pix_fmts = vc1_hwaccel_pixfmt_list_420, .pix_fmts = vc1_hwaccel_pixfmt_list_420,
.hw_configs = (const AVCodecHWConfigInternal*[]) { .hw_configs = (const AVCodecHWConfigInternal*[]) {
#if CONFIG_VC1_DXVA2_HWACCEL #if CONFIG_WMV3_DXVA2_HWACCEL
HWACCEL_DXVA2(wmv3), HWACCEL_DXVA2(wmv3),
#endif #endif
#if CONFIG_VC1_D3D11VA_HWACCEL #if CONFIG_WMV3_D3D11VA_HWACCEL
HWACCEL_D3D11VA(wmv3), HWACCEL_D3D11VA(wmv3),
#endif #endif
#if CONFIG_VC1_D3D11VA2_HWACCEL #if CONFIG_WMV3_D3D11VA2_HWACCEL
HWACCEL_D3D11VA2(wmv3), HWACCEL_D3D11VA2(wmv3),
#endif #endif
#if CONFIG_VC1_NVDEC_HWACCEL #if CONFIG_WMV3_NVDEC_HWACCEL
HWACCEL_NVDEC(wmv3), HWACCEL_NVDEC(wmv3),
#endif #endif
#if CONFIG_VC1_VAAPI_HWACCEL #if CONFIG_WMV3_VAAPI_HWACCEL
HWACCEL_VAAPI(wmv3), HWACCEL_VAAPI(wmv3),
#endif #endif
#if CONFIG_VC1_VDPAU_HWACCEL #if CONFIG_WMV3_VDPAU_HWACCEL
HWACCEL_VDPAU(wmv3), HWACCEL_VDPAU(wmv3),
#endif #endif
NULL NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment