vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 6 10:59:12 2019 +0200| [6281004e24013141d85f4225a53c2ac89e330b9b] | committer: Steve Lhomme
d3d11/d3d9: move ActivePictureSys() in va_surface.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6281004e24013141d85f4225a53c2ac89e330b9b --- modules/codec/avcodec/va_surface.h | 6 ++++++ modules/video_chroma/d3d11_fmt.h | 6 ------ modules/video_chroma/d3d9_fmt.h | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/modules/codec/avcodec/va_surface.h b/modules/codec/avcodec/va_surface.h index abb52eb81d..23fcc367c0 100644 --- a/modules/codec/avcodec/va_surface.h +++ b/modules/codec/avcodec/va_surface.h @@ -36,4 +36,10 @@ struct va_pic_context picture_sys_t picsys; }; +static inline picture_sys_t *ActivePictureSys(picture_t *p_pic) +{ + struct va_pic_context *pic_ctx = (struct va_pic_context*)p_pic->context; + return pic_ctx ? &pic_ctx->picsys : p_pic->p_sys; +} + #endif /* AVCODEC_VA_SURFACE_H */ diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h index a2eb803f7f..e8a2a78850 100644 --- a/modules/video_chroma/d3d11_fmt.h +++ b/modules/video_chroma/d3d11_fmt.h @@ -76,12 +76,6 @@ typedef struct #include "../codec/avcodec/va_surface.h" -static inline picture_sys_t *ActivePictureSys(picture_t *p_pic) -{ - struct va_pic_context *pic_ctx = (struct va_pic_context*)p_pic->context; - return pic_ctx ? &pic_ctx->picsys : p_pic->p_sys; -} - /* index to use for texture/resource that use a known DXGI format * (ie not DXGI_FORMAT_UNKNWON) */ #define KNOWN_DXGI_INDEX 0 diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h index 36231b27e5..6b758e0ffa 100644 --- a/modules/video_chroma/d3d9_fmt.h +++ b/modules/video_chroma/d3d9_fmt.h @@ -69,12 +69,6 @@ typedef struct #include "../codec/avcodec/va_surface.h" -static inline picture_sys_t *ActivePictureSys(picture_t *p_pic) -{ - struct va_pic_context *pic_ctx = (struct va_pic_context*)p_pic->context; - return pic_ctx ? &pic_ctx->picsys : p_pic->p_sys; -} - static inline void AcquirePictureSys(picture_sys_t *p_sys) { IDirect3DSurface9_AddRef(p_sys->surface); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
