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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 5a49b80a3..94b14756e 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -338,7 +338,7 @@ static void frame_reallocate(fb_driver_t *this, fb_frame_t *frame,
   else
   {
     free(frame->data);
-    frame->data = xine_xcalloc(frame->sc.output_width *
+    frame->data = calloc(frame->sc.output_width *
 			       frame->sc.output_height,
 			       this->bytes_per_pixel);
   }
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 8f51964e2..1ee1ceb8f 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -280,7 +280,7 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
     this->bytes_per_pixel = this->bpp / 8;
     this->image_byte_order = myimage->byte_order;
 
-    myimage->data = xine_xcalloc (width * height, this->bytes_per_pixel);
+    myimage->data = calloc (width * height, this->bytes_per_pixel);
   }
 
   return myimage;