Merge from 1.1.

--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c

2 files changed, 5 insertions, 3 deletions

diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index 213769ff5..71bbfba60 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -659,7 +659,7 @@ rmff_header_t  *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwid
     
   lprintf("Stream description size: %i\n", size);
 
-  description = calloc(size+1, sizeof(char));
+  description = malloc(size+1);
 
   if( rtsp_read_data(rtsp_session, description, size) <= 0) {
     xine_buffer_free(buf);
diff --git a/src/input/mms.c b/src/input/mms.c
index ba584b4f8..69694aff2 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -202,9 +202,9 @@ static void mms_buffer_put_64 (mms_buffer_t *mms_buffer, uint64_t value) {
 }
 
 
+#ifdef LOG
 static void print_command (char *data, int len) {
 
-#ifdef LOG
   int i;
   int dir = _X_LE_32 (data + 36) >> 16;
   int comm = _X_LE_32 (data + 36) & 0xFFFF;
@@ -240,8 +240,10 @@ static void print_command (char *data, int len) {
   if (len > CMD_HEADER_LEN)
     printf ("\n");
   printf ("----------------------------------------------\n");
+}
+#else
+# define print_command(data, len)
 #endif
-}