Merge from 1.1. VDR needs to be updated.

--HG--
rename : src/liba52/parse.c => contrib/a52dec/parse.c
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/alphablend.h => include/xine/alphablend.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/input/input_plugin.h => include/xine/input_plugin.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/fooaudio.c => src/audio_dec/fooaudio.c
rename : src/libxineadec/gsm610.c => src/audio_dec/gsm610.c
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/audio_dec/xine_musepack_decoder.c
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/libspucc/cc_decoder.c => src/spu_dec/cc_decoder.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudec/spu.c => src/spu_dec/spudec.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
rename : src/libspucc/xine_cc_decoder.c => src/spu_dec/xine_cc_decoder.c
rename : src/libxinevdec/bitplane.c => src/video_dec/bitplane.c
rename : src/libxinevdec/foovideo.c => src/video_dec/foovideo.c
rename : src/libxinevdec/gdkpixbuf.c => src/video_dec/gdkpixbuf.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/xine_mpeg2_decoder.c => src/video_dec/libmpeg2/xine_mpeg2_decoder.c
rename : src/libxinevdec/rgb.c => src/video_dec/rgb.c
rename : src/libxinevdec/yuv.c => src/video_dec/yuv.c

7 files changed, 21 insertions, 29 deletions

diff --git a/src/video_dec/bitplane.c b/src/video_dec/bitplane.c
index b8997e409..811fe4dcf 100644
--- a/src/video_dec/bitplane.c
+++ b/src/video_dec/bitplane.c
@@ -252,7 +252,7 @@ static uint8_t *bitplane_decode_byterun1 (uint8_t *compressed,
   int i                                 = 0;
   int j                                 = 0;
 
-  uint8_t *uncompressed                 = xine_xmalloc( size_uncompressed );
+  uint8_t *uncompressed                 = calloc(1, size_uncompressed );
 
   while ( i < size_compressed &&
           pixel_ptr < size_uncompressed ) {
@@ -1188,7 +1188,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
 
     free (this->buf);
     this->bufsize                       = VIDEOBUFSIZE;
-    this->buf                           = xine_xmalloc(this->bufsize);
+    this->buf                           = calloc(1, this->bufsize);
     this->size                          = 0;
     this->framenumber                   = 0;
 
@@ -1254,7 +1254,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
           case BUF_VIDEO_BITPLANE:
             /* uncompressed Buffer, set decoded_buf pointer direct to input stream */
             if( this->buf_uk == NULL )
-              this->buf_uk              = xine_xmalloc( (this->size) );
+              this->buf_uk              = malloc(this->size);
             xine_fast_memcpy (this->buf_uk, this->buf, this->size);
             break;
           case BUF_VIDEO_BITPLANE_BR1:
@@ -1293,7 +1293,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
           }
         }
         if( this->buf_uk_hist == NULL ) {
-          this->buf_uk_hist             = xine_xmalloc( (this->size_uk) );
+          this->buf_uk_hist             = malloc(this->size_uk);
           xine_fast_memcpy (this->buf_uk_hist, this->buf_uk, this->size_uk);
           xine_fast_memcpy (this->index_buf_hist, this->index_buf,
                             (this->num_pixel * this->bytes_per_pixel));
@@ -1305,20 +1305,12 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
         /* when no start-picture is given, create a empty one */
         if( this->buf_uk_hist == NULL ) {
           this->size_uk                 = (((this->num_pixel) / 8) * this->num_bitplanes);
-          this->buf_uk                  = xine_xmalloc( (this->size_uk) );
-          this->buf_uk_hist             = xine_xmalloc( (this->size_uk) );
-          for (i = 0; i < this->size_uk; i++) {
-            this->buf_uk[i]             = 0;
-            this->buf_uk_hist[i]        = 0;
-          }
+          this->buf_uk                  = calloc(this->num_bitplanes, ((this->num_pixel) / 8));
+          this->buf_uk_hist             = calloc(this->num_bitplanes, ((this->num_pixel) / 8));
         }
         if( this->index_buf == NULL ) {
           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;
-          }
         }
 
         switch( anhd->operation ) {
@@ -1499,7 +1491,7 @@ static void bitplane_dispose (video_decoder_t *this_gen) {
 
 static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stream_t *stream) {
 
-  bitplane_decoder_t  *this             = (bitplane_decoder_t *) xine_xmalloc (sizeof (bitplane_decoder_t));
+  bitplane_decoder_t  *this             = (bitplane_decoder_t *) calloc(1, sizeof(bitplane_decoder_t));
 
   this->video_decoder.decode_data       = bitplane_decode_data;
   this->video_decoder.flush             = bitplane_flush;
@@ -1522,7 +1514,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
 
 static void *init_plugin (xine_t *xine, void *data) {
 
-  bitplane_class_t *this                = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t));
+  bitplane_class_t *this                = (bitplane_class_t *) calloc(1, sizeof(bitplane_class_t));
 
   this->decoder_class.open_plugin       = open_plugin;
   this->decoder_class.identifier        = "bitplane";
diff --git a/src/video_dec/foovideo.c b/src/video_dec/foovideo.c
index 49c63422c..653f7eb47 100644
--- a/src/video_dec/foovideo.c
+++ b/src/video_dec/foovideo.c
@@ -202,7 +202,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
 
   foovideo_decoder_t  *this ;
 
-  this = (foovideo_decoder_t *) xine_xmalloc (sizeof (foovideo_decoder_t));
+  this = (foovideo_decoder_t *) calloc(1, sizeof(foovideo_decoder_t));
 
   this->video_decoder.decode_data         = foovideo_decode_data;
   this->video_decoder.flush               = foovideo_flush;
@@ -236,7 +236,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   foovideo_class_t *this;
 
-  this = (foovideo_class_t *) xine_xmalloc (sizeof (foovideo_class_t));
+  this = (foovideo_class_t *) calloc(1, sizeof(foovideo_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "foovideo";
diff --git a/src/video_dec/gdkpixbuf.c b/src/video_dec/gdkpixbuf.c
index 34644241d..01378acbc 100644
--- a/src/video_dec/gdkpixbuf.c
+++ b/src/video_dec/gdkpixbuf.c
@@ -236,7 +236,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
 
   g_type_init ();
 
-  this = (image_decoder_t *) xine_xmalloc (sizeof (image_decoder_t));
+  this = (image_decoder_t *) calloc(1, sizeof(image_decoder_t));
 
   this->video_decoder.decode_data         = image_decode_data;
   this->video_decoder.flush               = image_flush;
@@ -260,7 +260,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   image_class_t       *this;
 
-  this = (image_class_t *) xine_xmalloc (sizeof (image_class_t));
+  this = (image_class_t *) calloc(1, sizeof(image_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "gdkpixbuf";
diff --git a/src/video_dec/image.c b/src/video_dec/image.c
index 5c8439a67..f4d39b5dc 100644
--- a/src/video_dec/image.c
+++ b/src/video_dec/image.c
@@ -212,7 +212,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
 
   lprintf("opened\n");
 
-  this = (image_decoder_t *) xine_xmalloc (sizeof (image_decoder_t));
+  this = (image_decoder_t *) calloc(1, sizeof(image_decoder_t));
 
   this->video_decoder.decode_data         = image_decode_data;
   this->video_decoder.flush               = image_flush;
@@ -238,7 +238,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   image_class_t       *this;
 
-  this = (image_class_t *) xine_xmalloc (sizeof (image_class_t));
+  this = (image_class_t *) calloc(1, sizeof(image_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "imagevdec";
diff --git a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
index fc8bd4dc2..0419efa61 100644
--- a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
@@ -117,7 +117,7 @@ static void mpeg2dec_dispose (video_decoder_t *this_gen) {
 static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stream_t *stream) {
   mpeg2dec_decoder_t *this ;
 
-  this = (mpeg2dec_decoder_t *) xine_xmalloc (sizeof (mpeg2dec_decoder_t));
+  this = (mpeg2dec_decoder_t *) calloc(1, sizeof(mpeg2dec_decoder_t));
 
   this->video_decoder.decode_data         = mpeg2dec_decode_data;
   this->video_decoder.flush               = mpeg2dec_flush;
@@ -142,7 +142,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   mpeg2_class_t *this;
 
-  this = (mpeg2_class_t *) xine_xmalloc (sizeof (mpeg2_class_t));
+  this = (mpeg2_class_t *) calloc(1, sizeof(mpeg2_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "mpeg2dec";
diff --git a/src/video_dec/rgb.c b/src/video_dec/rgb.c
index 9c8409e5f..9f3dd279c 100644
--- a/src/video_dec/rgb.c
+++ b/src/video_dec/rgb.c
@@ -144,7 +144,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
 
     /* minimal buffer size */
     this->bufsize = this->width * this->height * this->bytes_per_pixel;
-    this->buf = xine_xmalloc(this->bufsize);
+    this->buf = calloc(1, this->bufsize);
     this->size = 0;
 
     init_yuv_planes(&this->yuv_planes, this->width, this->height);
@@ -394,7 +394,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
 
   rgb_decoder_t  *this ;
 
-  this = (rgb_decoder_t *) xine_xmalloc (sizeof (rgb_decoder_t));
+  this = (rgb_decoder_t *) calloc(1, sizeof(rgb_decoder_t));
 
   this->video_decoder.decode_data         = rgb_decode_data;
   this->video_decoder.flush               = rgb_flush;
@@ -416,7 +416,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   rgb_class_t *this;
 
-  this = (rgb_class_t *) xine_xmalloc (sizeof (rgb_class_t));
+  this = (rgb_class_t *) calloc(1, sizeof(rgb_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "RGB";
diff --git a/src/video_dec/yuv.c b/src/video_dec/yuv.c
index c1e5825c5..323a1648f 100644
--- a/src/video_dec/yuv.c
+++ b/src/video_dec/yuv.c
@@ -316,7 +316,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
 
   yuv_decoder_t  *this ;
 
-  this = (yuv_decoder_t *) xine_xmalloc (sizeof (yuv_decoder_t));
+  this = (yuv_decoder_t *) calloc(1, sizeof(yuv_decoder_t));
 
   this->video_decoder.decode_data         = yuv_decode_data;
   this->video_decoder.flush               = yuv_flush;
@@ -338,7 +338,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   yuv_class_t *this;
 
-  this = (yuv_class_t *) xine_xmalloc (sizeof (yuv_class_t));
+  this = (yuv_class_t *) calloc(1, sizeof(yuv_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.identifier      = "YUV";