diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2014-12-19 19:15:10 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-25 20:47:49 +0100 |
| commit | ebd5320afd42d4315851f3e0ca7f5d4a6300eb68 (patch) | |
| tree | a2a8dc221d858cc706512f4f13b818ac2d3becdd /libavcodec/h264_slice.c | |
| parent | c220a60f92dde9c7c118fc4deddff5c1f617cda9 (diff) | |
| download | ffmpeg-ebd5320afd42d4315851f3e0ca7f5d4a6300eb68.tar.gz | |
vdpau: add support for 4:2:2 and 4:4:4 chroma sampling
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index c2826e69da..edce30f3a5 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -970,6 +970,9 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) *fmt++ = AV_PIX_FMT_YUV420P10; break; case 8: +#if CONFIG_H264_VDPAU_HWACCEL + *fmt++ = AV_PIX_FMT_VDPAU; +#endif if (CHROMA444(h)) { if (h->avctx->colorspace == AVCOL_SPC_RGB) *fmt++ = AV_PIX_FMT_GBRP; @@ -993,9 +996,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) *fmt++ = AV_PIX_FMT_VDA_VLD; *fmt++ = AV_PIX_FMT_VDA; #endif -#if CONFIG_H264_VDPAU_HWACCEL - *fmt++ = AV_PIX_FMT_VDPAU; -#endif if (h->avctx->codec->pix_fmts) choices = h->avctx->codec->pix_fmts; else if (h->avctx->color_range == AVCOL_RANGE_JPEG) |