[Mplayer-cvslog] CVS: main/Gui/mplayer common.c,1.2,1.3 mw.c,1.108,1.109 pb.c,1.4,1.5 sw.c,1.40,1.41

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv19304/Gui/mplayer

Modified Files:
	common.c mw.c pb.c sw.c 
Log Message:


many 10l for me ...


Index: common.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common.c	1 Feb 2003 08:46:17 -0000	1.2
+++ common.c	20 Mar 2003 12:42:09 -0000	1.3
@@ -15,6 +15,7 @@
 #include "../../config.h"
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
+#include "../../libvo/fastmemcpy.h"
 
 #include "../../libmpdemux/stream.h"
 #include "../../mixer.h"

Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mw.c	1 Feb 2003 16:42:00 -0000	1.108
+++ mw.c	20 Mar 2003 12:42:09 -0000	1.109
@@ -15,6 +15,7 @@
 #include "../../config.h"
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
+#include "../../libvo/fastmemcpy.h"
 
 #include "../../libmpdemux/stream.h"
 #include "../../mixer.h"

Index: pb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/pb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pb.c	6 Feb 2003 22:44:52 -0000	1.4
+++ pb.c	20 Mar 2003 12:42:09 -0000	1.5
@@ -15,6 +15,7 @@
 #include "../../config.h"
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
+#include "../../libvo/fastmemcpy.h"
 
 #include "../../libmpdemux/stream.h"
 #include "../../mixer.h"
@@ -214,13 +215,13 @@
 
 void mplPBInit( void )
 {
- gfree( (void**)&mplPBDrawBuffer );
-
  if ( !appMPlayer.barIsPresent ) return;
 
- if ( ( mplPBDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.bar.Bitmap.ImageSize ) ) == NULL )
+ gfree( (void**)&mplPBDrawBuffer );
+
+ if ( ( mplPBDrawBuffer = (unsigned char *)malloc( appMPlayer.bar.Bitmap.ImageSize ) ) == NULL )
   {
-   fprintf( stderr,MSGTR_NEMDB );
+   mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB );
    exit( 0 );
   }
 

Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sw.c	17 Jan 2003 22:39:39 -0000	1.40
+++ sw.c	20 Mar 2003 12:42:09 -0000	1.41
@@ -5,6 +5,7 @@
 
 #include "../../config.h"
 #include "../../libvo/x11_common.h"
+#include "../../libvo/fastmemcpy.h"
 
 #include "../app.h"
 #include "../interface.h"