avcodec/vc1dec: fix preprocessor checks and hw_configs lists for the hwaccels
authorJames Almer <jamrial@gmail.com>
Mon, 27 Nov 2017 01:22:17 +0000 (22:22 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 27 Nov 2017 01:22:17 +0000 (22:22 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/vc1dec.c

index ac4cfed..cbef89f 100644 (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