Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f': h263: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · c43ebd94e4
parent 4ea333d7de 3325911815
commit c43ebd94e4
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@ -680,10 +680,10 @@ frame_end:
 }

 const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
-#if CONFIG_VAAPI
+#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL
    AV_PIX_FMT_VAAPI_VLD,
 #endif
-#if CONFIG_VDPAU
+#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL
    AV_PIX_FMT_VDPAU,
 #endif
    AV_PIX_FMT_YUV420P,