[xine-cvs] CVS: xine-lib/src/demuxers demux_asf.c,1.183,1.184

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv741

Modified Files:
	demux_asf.c 
Log Message:
Fixed crash with debugging on audio/video-only ASF streams,
fixed warnings in AFS demuxer.


Index: demux_asf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_asf.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- demux_asf.c	24 Sep 2006 16:29:10 -0000	1.183
+++ demux_asf.c	3 Oct 2006 07:30:51 -0000	1.184
@@ -273,6 +273,7 @@
   return get_guid_id(this, &g);
 }
 
+#if 0
 static void get_str16_nolen(demux_asf_t *this, int len,
 			    char *buf, int buf_size) {
 
@@ -288,11 +289,10 @@
   }
   *q = '\0';
 }
+#endif
 
 static void asf_send_audio_header (demux_asf_t *this, int stream) {
-
   buf_element_t *buf;
-  asf_demux_stream_t *demux_stream = &this->streams[stream];
   asf_stream_t *asf_stream = this->asf_header->streams[stream];
   xine_waveformatex  *wavex = (xine_waveformatex *)asf_stream->private_data;
 
@@ -584,8 +584,8 @@
 
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
 	    "demux_asf: video stream_id: %d, audio stream_id: %d\n",
-	    this->audio_stream != -1 ? this->asf_header->streams[this->video_stream]->stream_number : -1,
-	    this->video_stream != -1 ? this->asf_header->streams[this->audio_stream]->stream_number : -1);
+	    this->video_stream != -1 ? this->asf_header->streams[this->video_stream]->stream_number : -1,
+	    this->audio_stream != -1 ? this->asf_header->streams[this->audio_stream]->stream_number : -1);
 
     if (this->audio_stream != -1) {
       _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);