vlc | branch: master | Steve Lhomme <[email protected]> | Wed Oct 23 15:17:49 2019 +0200| [70f95de1c50db2ec4208ff809ed68396723a7146] | committer: Steve Lhomme
d3d11_fmt: do not share D3D11_PICCONTEXT_FROM_PICCTX Each derivative should have its own macro (like d3d11va does) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70f95de1c50db2ec4208ff809ed68396723a7146 --- modules/video_chroma/d3d11_fmt.c | 3 +++ modules/video_chroma/d3d11_fmt.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c index 208efb4a05..e171a44ec9 100644 --- a/modules/video_chroma/d3d11_fmt.c +++ b/modules/video_chroma/d3d11_fmt.c @@ -38,6 +38,9 @@ #include "d3d11_fmt.h" +#define D3D11_PICCONTEXT_FROM_PICCTX(pic_ctx) \ + container_of((pic_ctx), struct d3d11_pic_context, s) + picture_sys_d3d11_t *ActiveD3D11PictureSys(picture_t *pic) { if (unlikely(pic->context == NULL)) diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h index 44b254653d..048436fe76 100644 --- a/modules/video_chroma/d3d11_fmt.h +++ b/modules/video_chroma/d3d11_fmt.h @@ -111,9 +111,6 @@ static inline bool is_d3d11_opaque(vlc_fourcc_t chroma) const struct vlc_video_context_operations d3d11_vctx_ops; -#define D3D11_PICCONTEXT_FROM_PICCTX(pic_ctx) \ - container_of((pic_ctx), struct d3d11_pic_context, s) - picture_sys_d3d11_t *ActiveD3D11PictureSys(picture_t *); static inline d3d11_decoder_device_t *GetD3D11OpaqueDevice(vlc_decoder_device *device) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
