diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 00:05:16 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 00:05:16 +0100 |
| commit | b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b (patch) | |
| tree | 8fd56bdda807c35dcf5cd0bbe88bd151158f24d7 /src/video_dec | |
| parent | 9a34a9096f156d46176cf30270e38a32410cd116 (diff) | |
| parent | d59c3de535738d8cd5d313b5a4f5502fa0aa7081 (diff) | |
| download | xine-lib-b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b.tar.gz xine-lib-b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/libxinevdec/bitplane.c => src/video_dec/bitplane.c
Diffstat (limited to 'src/video_dec')
| -rw-r--r-- | src/video_dec/bitplane.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_dec/bitplane.c b/src/video_dec/bitplane.c index 327e14aee..b8997e409 100644 --- a/src/video_dec/bitplane.c +++ b/src/video_dec/bitplane.c @@ -1158,8 +1158,8 @@ static void bitplane_decode_data (video_decoder_t *this_gen, this->bytes_per_pixel = 1; /* New Buffer for indexes (palette based formats) */ - this->index_buf = xine_xcalloc( this->num_pixel, this->bytes_per_pixel ); - this->index_buf_hist = xine_xcalloc( this->num_pixel, this->bytes_per_pixel ); + this->index_buf = calloc( this->num_pixel, this->bytes_per_pixel ); + this->index_buf_hist = calloc( this->num_pixel, this->bytes_per_pixel ); this->num_bitplanes = bih->biPlanes; this->camg_mode = bih->biCompression; @@ -1313,8 +1313,8 @@ static void bitplane_decode_data (video_decoder_t *this_gen, } } if( this->index_buf == NULL ) { - this->index_buf = xine_xcalloc( this->num_pixel, this->bytes_per_pixel ); - this->index_buf_hist = xine_xcalloc( this->num_pixel, this->bytes_per_pixel ); + this->index_buf = calloc( this->num_pixel, this->bytes_per_pixel ); + this->index_buf_hist = calloc( this->num_pixel, this->bytes_per_pixel ); for (i = 0; i < (this->num_pixel * this->bytes_per_pixel); i++) { this->index_buf[i] = 0; this->index_buf_hist[i] = 0; |