diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:29:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:30:01 +0100 |
| commit | f5c0b9aa6f3843d33961981aa16317d05d74e9dc (patch) | |
| tree | 06a695f4e3663d4310bdbc3eed0906de92920f25 | |
| parent | edde562130feb901f29d7cef930c4b5b133661b9 (diff) | |
| parent | 96753bd00d6d4046db6818c0aadc21bf2a11d77b (diff) | |
| download | ffmpeg-f5c0b9aa6f3843d33961981aa16317d05d74e9dc.tar.gz | |
Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'
* commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b':
dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
dsputil: add missing HAVE_YASM guard
hwaccel: do not offer unsupported pixel formats
vdpau: add missing pixel format for H.264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 9 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 624c407f97..8436032b18 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -67,9 +67,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 e6e7337082..33e275826b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -128,10 +128,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 }; |