summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau_internal.h
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2017-03-04 23:57:33 +0000
committerwm4 <nfxjfg@googlemail.com>2017-03-23 09:36:42 +0100
commit7e4ba776a2240d40124d5540ea6b2118fa2fe26a (patch)
treef41708a36f6a571352ed2d131993f1bc97420fac /libavcodec/vdpau_internal.h
parent156bd8278f4098426cffaa68efb161907e5c1869 (diff)
downloadffmpeg-7e4ba776a2240d40124d5540ea6b2118fa2fe26a.tar.gz
lavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API
This supports retrieving the device from a provided hw_frames_ctx, and automatically creating a hw_frames_ctx if hw_device_ctx is set. The old API is not deprecated yet. The user can still use av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use the API before that by allocating and setting hwaccel_context manually. Cherry-picked from Libav commit 1a7ddba5. (Adds missing APIchanges entry to the Libav version.) Reviewed-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
-rw-r--r--libavcodec/vdpau_internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 77800af33f..30d01af65d 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -28,6 +28,8 @@
#include <vdpau/vdpau.h>
#include "libavutil/frame.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_vdpau.h"
#include "avcodec.h"
#include "vdpau.h"