diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-02 16:42:31 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-02 16:42:31 +0000 |
| commit | b850a6695d74798dac5de1a4320a32d56b1affb4 (patch) | |
| tree | e5bd10b457b5e686319caa75e27ccf162561ab76 /gui | |
| parent | bd83e685ecc9dd2ca7701da963be49922c4467f1 (diff) | |
| download | mpv-b850a6695d74798dac5de1a4320a32d56b1affb4.tar.bz2 mpv-b850a6695d74798dac5de1a4320a32d56b1affb4.tar.xz | |
Use calloc instead of malloc+memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23218 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gui/bitmap.c b/gui/bitmap.c index e844aabc44..c0e693da9e 100644 --- a/gui/bitmap.c +++ b/gui/bitmap.c @@ -74,13 +74,12 @@ static int conv24to32( txSample * bf ) tmpImage=bf->Image; bf->ImageSize=bf->Width * bf->Height * 4; bf->BPP=32; - if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL ) + if ( ( bf->Image=calloc( 1, bf->ImageSize ) ) == NULL ) { free( tmpImage ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] not enough memory for image\n" ); return 1; } - memset( bf->Image,0,bf->ImageSize ); for ( c=0,i=0; c < bf->ImageSize; ) { bf->Image[c++]=tmpImage[i++]; //red |