Commit c3b01ee0 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* moved garfou's changes before a variable that is at risk of overflow

  maybe this will fix the random crashes?
parent e53ac062
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.h: MacOS X interface plugin * vout.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: vout.h,v 1.13 2003/08/19 14:07:51 garf Exp $ * $Id: vout.h,v 1.14 2003/11/05 00:40:08 hartman Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -73,6 +73,10 @@ struct vout_sys_t ...@@ -73,6 +73,10 @@ struct vout_sys_t
NSRect s_rect; NSRect s_rect;
int b_pos_saved; int b_pos_saved;
VLCWindow * o_window; VLCWindow * o_window;
Rect rect;
int portx;
int porty;
int isplugin;
vlc_bool_t b_mouse_moved; vlc_bool_t b_mouse_moved;
vlc_bool_t b_mouse_pointer_visible; vlc_bool_t b_mouse_pointer_visible;
...@@ -88,9 +92,5 @@ struct vout_sys_t ...@@ -88,9 +92,5 @@ struct vout_sys_t
ImageDescriptionHandle h_img_descr; ImageDescriptionHandle h_img_descr;
Ptr p_fullscreen_state; Ptr p_fullscreen_state;
RgnHandle mask; RgnHandle mask;
Rect rect;
int portx;
int porty;
int isplugin;
#endif #endif
}; };
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* vout.m: MacOS X video output plugin * vout.m: MacOS X video output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.61 2003/10/31 15:54:53 hartman Exp $ * $Id: vout.m,v 1.62 2003/11/05 00:40:08 hartman Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -1026,7 +1026,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1026,7 +1026,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
o_title = [NSMutableString stringWithUTF8String: o_title = [NSMutableString stringWithUTF8String:
p_playlist->pp_items[p_playlist->i_index]->psz_name]; p_playlist->pp_items[p_playlist->i_index]->psz_uri];
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
......
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