Mercurial > mplayer.hg

diff Gui/mplayer/pb.c @ 9625:bc24dd70c6e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many 10l for me ...
author pontscho
date Thu, 20 Mar 2003 12:42:16 +0000
parents 91ed6378b9a6
children 4a56f15dee5f
line wrap: on
line diff
--- a/Gui/mplayer/pb.c	Thu Mar 20 10:40:20 2003 +0000
+++ b/Gui/mplayer/pb.c	Thu Mar 20 12:42:16 2003 +0000
@@ -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 );
   }