Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/demuxers asfheader.h,1.2,1.3 demux.h,1.32,1.33 demux_asf.c,1.129,1.130 demux_avi.c,1.167,1.168 demux_ogg.c,1.108,1.109 demux_qt.c,1.165,1.166 demux_ts.c,1.89,1.90 group_audio.h,1.1,1.2 group_games.h,1.1,1.2
Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1:/tmp/cvs-serv26765
Modified Files:
asfheader.h demux.h demux_asf.c demux_avi.c demux_ogg.c
demux_qt.c demux_ts.c group_audio.h group_games.h
Log Message:
some housekeeping and compiler warnings
Index: asfheader.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/asfheader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asfheader.h 26 May 2003 17:00:11 -0000 1.2
+++ asfheader.h 6 Oct 2003 15:46:20 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: demux.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- demux.h 25 Jul 2003 21:02:04 -0000 1.32
+++ demux.h 6 Oct 2003 15:46:20 -0000 1.33
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_asf.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- demux_asf.c 13 Sep 2003 11:50:06 -0000 1.129
+++ demux_asf.c 6 Oct 2003 15:46:20 -0000 1.130
@@ -313,9 +313,11 @@
this->audio_fifo->put (this->audio_fifo, buf);
}
+#if 0
static unsigned long str2ulong(unsigned char *str) {
return ( str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24) );
}
+#endif
static void asf_send_video_header (demux_asf_t *this, int stream) {
@@ -605,15 +607,6 @@
xine_fast_memcpy(src,dst,i);
free(dst);
-}
-
-static void hexdump (unsigned char *data, int len, xine_t *xine) {
- int i;
-
- for (i = 0; i < len; i++)
- printf("%02x ", data[i]);
- printf("\n");
-
}
/* redefine abs as macro to handle 64-bit diffs.
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_avi.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- demux_avi.c 10 Sep 2003 23:11:53 -0000 1.167
+++ demux_avi.c 6 Oct 2003 15:46:20 -0000 1.168
@@ -299,6 +299,7 @@
return ( str[0] | (str[1]<<8) | (str[2]<<16) | (str[3]<<24) );
}
+#if 0
static unsigned long str2ushort(unsigned char *str) {
return ( str[0] | (str[1]<<8) );
}
@@ -309,6 +310,7 @@
dst[2] = (n>>16)&0xff;
dst[3] = (n>>24)&0xff;
}
+#endif
#define PAD_EVEN(x) ( ((x)+1) & ~1 )
@@ -580,6 +582,7 @@
return 0; \
} while(0)
+#if 0
static int avi_sampsize(avi_t *AVI, int track) {
int s;
s = ((AVI->audio[track]->wavex->wBitsPerSample+7)/8)*
@@ -616,6 +619,7 @@
return 0;
}
+#endif
static avi_t *AVI_init(demux_avi_t *this) {
Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ogg.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- demux_ogg.c 3 Sep 2003 13:41:10 -0000 1.108
+++ demux_ogg.c 6 Oct 2003 15:46:20 -0000 1.109
@@ -144,6 +144,7 @@
} demux_ogg_class_t;
+#ifdef HAVE_THEORA
static int intlog(int num) {
int ret=0;
@@ -153,6 +154,7 @@
}
return(ret);
}
+#endif
static int get_stream (demux_ogg_t *this, int serno) {
/*finds the stream_num, which belongs to a ogg serno*/
@@ -247,6 +249,7 @@
}
}
+#ifdef HAVE_THEORA
static void send_ogg_packet (demux_ogg_t *this,
fifo_buffer_t *fifo,
ogg_packet *op,
@@ -309,6 +312,7 @@
fifo->put (fifo, buf);
}
}
+#endif
/* redefine abs as macro to handle 64-bit diffs.
i guess llabs may not be available everywhere */
Index: demux_qt.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_qt.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- demux_qt.c 25 Aug 2003 21:51:38 -0000 1.165
+++ demux_qt.c 6 Oct 2003 15:46:20 -0000 1.166
@@ -419,37 +419,6 @@
static inline void debug_audio_demux(const char *format, ...) { }
#endif
-static void hexdump (char *buf, int length) {
-
- int i;
-
- printf ("demux_qt: ascii contents>");
- for (i = 0; i < length; i++) {
- unsigned char c = buf[i];
-
- if ((c >= 32) && (c < 128))
- printf ("%c", c);
- else
- printf (".");
- }
- printf ("\n");
-
- printf ("demux_qt: complete hexdump of package follows:\ndemux_qt 0x0000: ");
- for (i = 0; i < length; i++) {
- unsigned char c = buf[i];
-
- printf ("%02x", c);
-
- if ((i % 16) == 15)
- printf ("\ndemux_qt 0x%04x: ", i);
-
- if ((i % 2) == 1)
- printf (" ");
-
- }
- printf ("\n");
-}
-
static inline void dump_moov_atom(unsigned char *moov_atom, int moov_atom_size) {
#if DEBUG_DUMP_MOOV
@@ -844,7 +813,7 @@
debug_atom_load ("demux_qt: stsd atom\n");
#if DEBUG_ATOM_LOAD
- hexdump (&trak_atom[i], current_atom_size);
+ xine_hexdump (&trak_atom[i], current_atom_size);
#endif
/* allocate space for each of the properties unions */
@@ -1451,7 +1420,7 @@
/* This is a little support function used to process the edit list when
* building a frame table. */
-#define MAX_DURATION 0x7FFFFFFFFFFFFFFF
+#define MAX_DURATION 0x7FFFFFFFFFFFFFFFLL
static void get_next_edit_list_entry(qt_trak *trak,
int *edit_list_index,
unsigned int *edit_list_media_time,
@@ -2713,7 +2682,7 @@
this->input = input;
/* fetch bandwidth config */
- this->bandwidth = 0x7FFFFFFFFFFFFFFF; /* assume infinite bandwidth */
+ this->bandwidth = 0x7FFFFFFFFFFFFFFFLL; /* assume infinite bandwidth */
if (xine_config_lookup_entry (stream->xine, "input.mms_network_bandwidth",
&entry)) {
if ((entry.num_value >= 0) && (entry.num_value <= 11))
Index: demux_ts.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ts.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- demux_ts.c 9 Aug 2003 23:01:58 -0000 1.89
+++ demux_ts.c 6 Oct 2003 15:46:20 -0000 1.90
@@ -935,7 +935,6 @@
uint32_t current_next_indicator;
uint32_t section_number;
uint32_t last_section_number;
- uint32_t PCR_PID;
uint32_t program_info_length;
uint32_t crc32;
uint32_t calc_crc32;
Index: group_audio.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/group_audio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- group_audio.h 25 Aug 2003 21:51:39 -0000 1.1
+++ group_audio.h 6 Oct 2003 15:46:20 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: group_games.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/group_games.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- group_games.h 25 Aug 2003 21:51:39 -0000 1.1
+++ group_games.h 6 Oct 2003 15:46:20 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
|