Merge branch 'master' into lpcm_encoder

[vlc] / modules / video_output / msw / common.h

diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h
index 291d8e04bf98dd32271a3bece07e7413e46dd5db..3a67c7d11759edcde7492927aa29dc727216cabd 100644 (file)
--- a/modules/video_output/msw/common.h
+++ b/modules/video_output/msw/common.h
@@ -126,6 +126,7 @@ struct vout_display_sys_t
     bool   use_wallpaper;   /* show as desktop wallpaper ? */
 
     bool   use_overlay;     /* Are we using an overlay surface */
+    bool   restore_overlay;
 
     /* DDraw capabilities */
     bool            can_blit_fourcc;
@@ -156,6 +157,13 @@ struct vout_display_sys_t
     vout_display_opengl_t vgl;
 #endif
 
+#ifdef MODULE_NAME_IS_direct2d
+    HINSTANCE              d2_dll;            /* handle of the opened d2d1 dll */
+    ID2D1Factory           *d2_factory;                         /* D2D factory */
+    ID2D1HwndRenderTarget  *d2_render_target;          /* D2D rendering target */
+    ID2D1Bitmap            *d2_bitmap;                            /* D2 bitmap */
+#endif
+
 #ifdef MODULE_NAME_IS_direct3d
     bool allow_hw_yuv;    /* Should we use hardware YUV->RGB conversions */
     /* show video on desktop window ? */
@@ -236,6 +244,7 @@ void CommonClean(vout_display_t *);
 void CommonManage(vout_display_t *);
 int  CommonControl(vout_display_t *, int , va_list );
 void CommonDisplay(vout_display_t *);
+int  CommonUpdatePicture(picture_t *, picture_t **, uint8_t *, unsigned);
 
 void UpdateRects (vout_display_t *,
                   const vout_display_cfg_t *,