vlc | branch: master | Steve Lhomme <[email protected]> | Wed Oct 23 15:18:14 2019 +0200| [d7e2cccc4953c94584770a27ade06ed132d30e3e] | committer: Steve Lhomme
d3d9_fmt: do not share D3D9_PICCONTEXT_FROM_PICCTX Each derivative should have its own macro (like dxva2 does) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d7e2cccc4953c94584770a27ade06ed132d30e3e --- modules/video_chroma/d3d9_fmt.c | 3 +++ modules/video_chroma/d3d9_fmt.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c index 580a13a528..508bfc838f 100644 --- a/modules/video_chroma/d3d9_fmt.c +++ b/modules/video_chroma/d3d9_fmt.c @@ -28,6 +28,9 @@ #include <initguid.h> #include "d3d9_fmt.h" +#define D3D9_PICCONTEXT_FROM_PICCTX(pic_ctx) \ + container_of((pic_ctx), struct d3d9_pic_context, s) + picture_sys_d3d9_t *ActiveD3D9PictureSys(picture_t *pic) { if (unlikely(pic->context == NULL)) diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h index 06d2119152..5dd312ceba 100644 --- a/modules/video_chroma/d3d9_fmt.h +++ b/modules/video_chroma/d3d9_fmt.h @@ -98,9 +98,6 @@ static inline bool is_d3d9_opaque(vlc_fourcc_t chroma) const struct vlc_video_context_operations d3d9_vctx_ops; -#define D3D9_PICCONTEXT_FROM_PICCTX(pic_ctx) \ - container_of((pic_ctx), struct d3d9_pic_context, s) - picture_sys_d3d9_t *ActiveD3D9PictureSys(picture_t *); static inline d3d9_decoder_device_t *GetD3D9OpaqueDevice(vlc_decoder_device *device) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
