Remove block_t->p_sys, which is not really needed either.

[vlc] / modules / access / screen / win32.c

diff --git a/modules/access/screen/win32.c b/modules/access/screen/win32.c
index bf3125af3960eaf3c3f152881f14c391b5b7033e..f553eee0dbf66348189ca3a274b16c1c99f6ec20 100644 (file)
--- a/modules/access/screen/win32.c
+++ b/modules/access/screen/win32.c
@@ -157,6 +157,7 @@ int screen_CloseCapture( demux_t *p_demux )
 
 struct block_sys_t
 {
+    block_t self;
     HBITMAP hbmp;
 };
 
@@ -170,7 +171,7 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     screen_data_t *p_data = p_sys->p_data;
-    block_t *p_block;
+    block_sys_t *p_block;
     void *p_buffer;
     int i_buffer;
     HBITMAP hbmp;
@@ -204,17 +205,16 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
         DeleteObject( hbmp );
         return NULL;
     }
-    memset( p_block, 0, sizeof( block_t ) );
-    p_block->p_sys = (block_sys_t *)( (uint8_t *)p_block + sizeof( block_t ) );
+    memset( &p_block->self, 0, sizeof( block_t->self ) );
 
     /* Fill all fields */
     i_buffer = (p_sys->fmt.video.i_bits_per_pixel + 7) / 8 *
         p_sys->fmt.video.i_width * p_sys->fmt.video.i_height;
-    p_block->p_next         = NULL;
-    p_block->i_buffer       = i_buffer;
-    p_block->p_buffer       = p_buffer;
-    p_block->pf_release     = CaptureBlockRelease;
-    p_block->p_sys->hbmp    = hbmp;
+    p_block->self.p_next     = NULL;
+    p_block->self.i_buffer   = i_buffer;
+    p_block->self.p_buffer   = p_buffer;
+    p_block->self.pf_release = CaptureBlockRelease;
+    p_block->hbmp            = hbmp;
 
     return p_block;
 }