hwaccel: do not offer unsupported pixel formats
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 26 Jan 2013 20:47:55 +0000 (22:47 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Sun, 27 Jan 2013 06:03:22 +0000 (07:03 +0100)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/h264.c
libavcodec/mpegvideo.c

index 62288b007eb9ad3b9068e97cdfe05da42640d3ec..ffe7586ad8f2703144cd5346b5ad3bb47a20ef42 100644 (file)
@@ -60,10 +60,18 @@ static const uint8_t div6[QP_MAX_NUM + 1] = {
 };
 
 static const enum AVPixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = {
+#if CONFIG_H264_DXVA2_HWACCEL
     AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_H264_VAAPI_HWACCEL
     AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_H264_VDA_HWACCEL
     AV_PIX_FMT_VDA_VLD,
+#endif
+#if CONFIG_H264_VDPAU_HWACCEL
     AV_PIX_FMT_VDPAU,
+#endif
     AV_PIX_FMT_YUVJ420P,
     AV_PIX_FMT_NONE
 };
index 6320fbc1387424d90c63b8883d6a7febfa6fed7c..a4105a5dcddb5f2d713d3310167bc15475e7b87c 100644 (file)
@@ -131,10 +131,18 @@ const enum AVPixelFormat ff_pixfmt_list_420[] = {
 };
 
 const enum AVPixelFormat ff_hwaccel_pixfmt_list_420[] = {
+#if CONFIG_DXVA2
     AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_VAAPI
     AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_VDA
     AV_PIX_FMT_VDA_VLD,
+#endif
+#if CONFIG_VDPAU
     AV_PIX_FMT_VDPAU,
+#endif
     AV_PIX_FMT_YUV420P,
     AV_PIX_FMT_NONE
 };