Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80': vc1dec: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 0f714abb49
parent c43ebd94e4 654c7446a8
commit 0f714abb49
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@ -6242,13 +6242,13 @@ static const AVProfile profiles[] = {
 };

 static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
-#if CONFIG_DXVA2
+#if CONFIG_VC1_DXVA2_HWACCEL
    AV_PIX_FMT_DXVA2_VLD,
 #endif
-#if CONFIG_VAAPI
+#if CONFIG_VC1_VAAPI_HWACCEL
    AV_PIX_FMT_VAAPI_VLD,
 #endif
-#if CONFIG_VDPAU
+#if CONFIG_VC1_VDPAU_HWACCEL
    AV_PIX_FMT_VDPAU,
 #endif
    AV_PIX_FMT_YUV420P,