From a0407c7861a4906f41152cf25ac3851a5a8eb6f8 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 6 Oct 2003 15:46:20 +0000 Subject: some housekeeping and compiler warnings CVS patchset: 5456 CVS date: 2003/10/06 15:46:20 --- src/demuxers/asfheader.h | 4 ++-- src/demuxers/demux.h | 4 ++-- src/demuxers/demux_asf.c | 13 +++---------- src/demuxers/demux_avi.c | 6 +++++- src/demuxers/demux_ogg.c | 6 +++++- src/demuxers/demux_qt.c | 39 ++++----------------------------------- src/demuxers/demux_ts.c | 3 +-- src/demuxers/group_audio.h | 4 ++-- src/demuxers/group_games.h | 4 ++-- 9 files changed, 26 insertions(+), 57 deletions(-) (limited to 'src') diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index 095a1a573..d2975078e 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -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. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: asfheader.h,v 1.2 2003/05/26 17:00:11 tchamp Exp $ + * $Id: asfheader.h,v 1.3 2003/10/06 15:46:20 mroi Exp $ * * demultiplexer for asf streams * diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index fa64bca05..757deb745 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -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. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux.h,v 1.32 2003/07/25 21:02:04 miguelfreitas Exp $ + * $Id: demux.h,v 1.33 2003/10/06 15:46:20 mroi Exp $ */ #ifndef HAVE_DEMUX_H diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 2434c72d5..e2a8c4c28 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.129 2003/09/13 11:50:06 tmattern Exp $ + * $Id: demux_asf.c,v 1.130 2003/10/06 15:46:20 mroi Exp $ * * demultiplexer for asf streams * @@ -313,9 +313,11 @@ static void asf_send_audio_header (demux_asf_t *this, int stream) { 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) { @@ -607,15 +609,6 @@ static void asf_reorder(demux_asf_t *this, uint8_t *src, int len){ 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. i guess llabs may not be available everywhere */ #define abs(x) ( ((x)<0) ? -(x) : (x) ) diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 0d6fd4221..841f3b2c1 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.167 2003/09/10 23:11:53 tmattern Exp $ + * $Id: demux_avi.c,v 1.168 2003/10/06 15:46:20 mroi Exp $ * * demultiplexer for avi streams * @@ -299,6 +299,7 @@ static unsigned long str2ulong(unsigned char *str) { 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 @@ static void long2str(unsigned char *dst, int n) { dst[2] = (n>>16)&0xff; dst[3] = (n>>24)&0xff; } +#endif #define PAD_EVEN(x) ( ((x)+1) & ~1 ) @@ -580,6 +582,7 @@ do { \ 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 @@ static int avi_add_index_entry(demux_avi_t *this, avi_t *AVI, unsigned char *tag return 0; } +#endif static avi_t *AVI_init(demux_avi_t *this) { diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index ec0772fca..654f74d5e 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.108 2003/09/03 13:41:10 andruil Exp $ + * $Id: demux_ogg.c,v 1.109 2003/10/06 15:46:20 mroi Exp $ * * demultiplexer for ogg streams * @@ -144,6 +144,7 @@ typedef struct { } demux_ogg_class_t; +#ifdef HAVE_THEORA static int intlog(int num) { int ret=0; @@ -153,6 +154,7 @@ static int intlog(int num) { } 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 @@ static void get_stream_length (demux_ogg_t *this) { } } +#ifdef HAVE_THEORA static void send_ogg_packet (demux_ogg_t *this, fifo_buffer_t *fifo, ogg_packet *op, @@ -309,6 +312,7 @@ static void send_ogg_packet (demux_ogg_t *this, fifo->put (fifo, buf); } } +#endif /* redefine abs as macro to handle 64-bit diffs. i guess llabs may not be available everywhere */ diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 8131ee183..550b1cd20 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.165 2003/08/25 21:51:38 f1rmb Exp $ + * $Id: demux_qt.c,v 1.166 2003/10/06 15:46:20 mroi Exp $ * */ @@ -419,37 +419,6 @@ static inline void debug_video_demux(const char *format, ...) { } 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 @@ static qt_error parse_trak_atom (qt_trak *trak, 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 @@ static qt_error parse_reference_atom (reference_t *ref, /* 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 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str 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)) diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 7341cc5b1..a361bc32b 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_ts.c,v 1.89 2003/08/09 23:01:58 jcdutton Exp $ + * $Id: demux_ts.c,v 1.90 2003/10/06 15:46:20 mroi Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -935,7 +935,6 @@ static void demux_ts_parse_pmt (demux_ts_t *this, 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; diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h index 3d3061d12..848559b3a 100644 --- a/src/demuxers/group_audio.h +++ b/src/demuxers/group_audio.h @@ -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. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: group_audio.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $ + * $Id: group_audio.h,v 1.2 2003/10/06 15:46:20 mroi Exp $ */ #ifndef HAVE_GROUP_AUDIO_H diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h index 1b8bfb60e..ced46c193 100644 --- a/src/demuxers/group_games.h +++ b/src/demuxers/group_games.h @@ -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. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: group_games.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $ + * $Id: group_games.h,v 1.2 2003/10/06 15:46:20 mroi Exp $ */ #ifndef HAVE_GROUP_GAMES_H -- cgit v1.2.3