diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /video/hwdec.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/hwdec.h')
| -rw-r--r-- | video/hwdec.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/video/hwdec.h b/video/hwdec.h index f2fa7943af..9d1035cd6e 100644 --- a/video/hwdec.h +++ b/video/hwdec.h @@ -47,7 +47,14 @@ struct mp_hwdec_ctx { // HWDEC_CUDA: CUcontext* void *ctx; - // Optional. + // libavutil-wrapped context, if available. + struct AVBufferRef *av_device_ref; // AVVAAPIDeviceContext* + + // List of IMGFMT_s, terminated with 0. NULL if N/A. + int *supported_formats; + + // Optional. Legacy. (New code should use AVHWFramesContext and + // mp_image_hw_download().) // Allocates a software image from the pool, downloads the hw image from // mpi, and returns it. // pool can be NULL (then just use straight allocation). |