summaryrefslogtreecommitdiff
path: root/libavcodec/hevc.c
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2016-02-12 20:38:42 +0200
committerLuca Barbato <lu_zero@gentoo.org>2016-02-13 14:42:38 +0100
commit8d34a2f803c9ca9433b5a51bacbbe352e8d327e2 (patch)
treef5aa7398c97f78fab652a7591d686394c71b538a /libavcodec/hevc.c
parent8958c5c64d05453204642b55a7b8b44c93023b17 (diff)
vdpau: Support for VDPAU accelerated HEVC decoding
Signed-off-by: RĂ©mi Denis-Courmont <remi@remlab.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/hevc.c')
-rw-r--r--libavcodec/hevc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index ca3226dd90..a5a525a6df 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -380,7 +380,7 @@ static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps,
static int set_sps(HEVCContext *s, const HEVCSPS *sps)
{
- #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL)
+ #define HWACCEL_MAX (CONFIG_HEVC_DXVA2_HWACCEL + CONFIG_HEVC_D3D11VA_HWACCEL + CONFIG_HEVC_VDPAU_HWACCEL)
enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
int ret;
@@ -404,6 +404,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps)
#if CONFIG_HEVC_D3D11VA_HWACCEL
*fmt++ = AV_PIX_FMT_D3D11VA_VLD;
#endif
+#if CONFIG_HEVC_VDPAU_HWACCEL
+ *fmt++ = AV_PIX_FMT_VDPAU;
+#endif
}
*fmt++ = sps->pix_fmt;