summaryrefslogtreecommitdiffstats
path: root/Gui/mplayer/pb.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-20 12:42:16 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-20 12:42:16 +0000
commit90b278bfaa7dcc0fa26d81cc033fc4cc1c3801a4 (patch)
treea6e2dd81d6efb35c87d3c4246be345434dffcd26 /Gui/mplayer/pb.c
parentb45f146c371817e0056af61a8dadbcfb54399271 (diff)
downloadmpv-90b278bfaa7dcc0fa26d81cc033fc4cc1c3801a4.tar.bz2
mpv-90b278bfaa7dcc0fa26d81cc033fc4cc1c3801a4.tar.xz
many 10l for me ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9626 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/pb.c')
-rw-r--r--Gui/mplayer/pb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c
index 7e7cadb882..644729e660 100644
--- a/Gui/mplayer/pb.c
+++ b/Gui/mplayer/pb.c
@@ -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 mplPBShow( int x, int y )
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 );
}