Commit 198c5782 authored by damienf's avatar damienf
Browse files

- win32 vouts: fiex potential crash (SIGFPE) if the output window geometry is empty

parent 9a1b826c
...@@ -334,7 +334,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -334,7 +334,7 @@ static int Init( vout_thread_t *p_vout )
E_(UpdateRects)( p_vout, VLC_TRUE ); E_(UpdateRects)( p_vout, VLC_TRUE );
/* create picture pool */ /* create picture pool */
p_vout->fmt_out.i_chroma = 0; p_vout->output.i_chroma = 0;
i_ret = Direct3DVoutCreatePictures(p_vout, 1); i_ret = Direct3DVoutCreatePictures(p_vout, 1);
if( VLC_SUCCESS != i_ret ) if( VLC_SUCCESS != i_ret )
{ {
......
...@@ -688,6 +688,13 @@ void E_(UpdateRects)( vout_thread_t *p_vout, vlc_bool_t b_force ) ...@@ -688,6 +688,13 @@ void E_(UpdateRects)( vout_thread_t *p_vout, vlc_bool_t b_force )
rect_dest_clipped.right, rect_dest_clipped.bottom ); rect_dest_clipped.right, rect_dest_clipped.bottom );
#endif #endif
#else /* MODULE_NAME_IS_vout_directx */
/* AFAIK, there are no clipping constraints in Direct3D, OpenGL and GDI */
rect_dest_clipped = rect_dest;
#endif
/* the 2 following lines are to fix a bug when clicking on the desktop */ /* the 2 following lines are to fix a bug when clicking on the desktop */
if( (rect_dest_clipped.right - rect_dest_clipped.left)==0 || if( (rect_dest_clipped.right - rect_dest_clipped.left)==0 ||
(rect_dest_clipped.bottom - rect_dest_clipped.top)==0 ) (rect_dest_clipped.bottom - rect_dest_clipped.top)==0 )
...@@ -695,12 +702,6 @@ void E_(UpdateRects)( vout_thread_t *p_vout, vlc_bool_t b_force ) ...@@ -695,12 +702,6 @@ void E_(UpdateRects)( vout_thread_t *p_vout, vlc_bool_t b_force )
SetRectEmpty( &rect_src_clipped ); SetRectEmpty( &rect_src_clipped );
return; return;
} }
#else /* MODULE_NAME_IS_vout_directx */
/* AFAIK, there are no clipping constraints in Direct3D, OpenGL and GDI */
rect_dest_clipped = rect_dest;
#endif
/* src image dimensions */ /* src image dimensions */
rect_src.left = 0; rect_src.left = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment