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/post | |
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/post')
-rw-r--r-- | src/post/mosaico/mosaico.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 6c01a66e1..026a2a429 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -155,7 +155,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, _x_post_init(&this->post, 0, inputs); - this->pip = (mosaico_pip_t *)xine_xcalloc((inputs - 1), sizeof(mosaico_pip_t)); + this->pip = (mosaico_pip_t *)calloc((inputs - 1), sizeof(mosaico_pip_t)); this->pip_count = inputs - 1; pthread_cond_init(&this->vpts_limit_changed, NULL); |