virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-26 22:22:17 -03:00
parent 921d7af6e9
commit 1eee394c7c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/vc1dec.c
View File

@ -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