From 737d35e33408263c04d7730f5487eed0d04938ba Mon Sep 17 00:00:00 2001
From: Rémi Denis-Courmont <remi@remlab.net>
Date: Fri, 19 Dec 2014 19:15:05 +0200
Subject: vdpau: add support for the H.264 High 4:4:4 Predictive profile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavcodec/vdpau_internal.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'libavcodec/vdpau_internal.h')

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 16493b0741..9cc953887a 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -37,16 +37,15 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
     return (uintptr_t)pic->data[3];
 }
 
-#if !FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
+union VDPAUPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
     VdpPictureInfoVC1          vc1;
     VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#else
-#include "vdpau.h"
+#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
+    VdpPictureInfoH264Predictive h264_predictive;
 #endif
+};
 
 typedef struct VDPAUHWContext {
     AVVDPAUContext context;
@@ -85,7 +84,7 @@ struct vdpau_picture_context {
     /**
      * VDPAU picture information.
      */
-    union AVVDPAUPictureInfo info;
+    union VDPAUPictureInfo info;
 
     /**
      * Allocated size of the bitstream_buffers table.
-- 
cgit v1.2.3