diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2013-01-26 22:47:55 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-27 07:03:22 +0100 |
| commit | 78bc4d69ebe6189395e5c7e4719ddef50bc943ba (patch) | |
| tree | c0137755befe0e4266750ccee2d7601a2525655b | |
| parent | ec0e92002b72496923ef6044cfb7f4b3f8bfabf6 (diff) | |
| download | ffmpeg-78bc4d69ebe6189395e5c7e4719ddef50bc943ba.tar.gz | |
hwaccel: do not offer unsupported pixel formats
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/h264.c | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 62288b007e..ffe7586ad8 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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 }; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 6320fbc138..a4105a5dcd 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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 }; |