[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp dump.c, 1.38, 1.39 dump.h, 1.7, 1.8 mplayer.c, 1.244, 1.245

[Nick K. <nic...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15557

Modified Files:
	dump.c dump.h mplayer.c 
Log Message:
ignore dumxer errors during network download

Index: dump.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/dump.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -p -u -d -r1.38 -r1.39
--- dump.c	12 Dec 2007 10:09:08 -0000	1.38
+++ dump.c	28 May 2008 08:56:23 -0000	1.39
@@ -33,17 +33,16 @@ int  dump_parse(const char *param)
     return type;
 }
 
-void dump_stream(demuxer_t *demuxer)
+void dump_stream(stream_t *stream)
 {
   unsigned char buf[4096];
   int len;
   FILE *f;
   const char *ext,*name;
-  stream_t *stream=demuxer->stream;
   pinfo[xp_id].current_module="dumpstream";
   stream_reset(stream);
   stream_seek(stream,stream->start_pos);
-  ext=demuxer->driver->defext;
+  ext=".ext";
   if(!port)
   {
     strcpy(buf,"stream_dump");

Index: dump.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/dump.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -p -u -d -r1.7 -r1.8
--- dump.h	20 Feb 2006 18:25:34 -0000	1.7
+++ dump.h	28 May 2008 08:56:23 -0000	1.8
@@ -7,7 +7,7 @@
 #include "libmpdemux/demuxer_r.h"
 
 extern int  dump_parse(const char *param);
-extern void dump_stream(demuxer_t *demuxer);
+extern void dump_stream(stream_t *stream);
 extern void dump_mux_init(demuxer_t *demuxer);
 extern void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
 extern void dump_mux_close(demuxer_t *demuxer);

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/mplayer.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -p -u -d -r1.244 -r1.245
--- mplayer.c	10 Jan 2008 10:52:25 -0000	1.244
+++ mplayer.c	28 May 2008 08:56:23 -0000	1.245
@@ -2318,6 +2318,9 @@ if(stream_cache_size && !stream_dump_typ
     if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
 }
 
+// DUMP STREAMS:
+if(stream_dump_type==1) dump_stream(stream);
+
 //============ Open DEMUXERS --- DETECT file type =======================
 initial_audio_pts=HUGE;
 if(!has_audio) audio_id=-2; // do NOT read audio packets...
@@ -2333,10 +2336,8 @@ d_audio=demuxer->audio;
 d_video=demuxer->video;
 d_dvdsub=demuxer->sub;
 
-if(seek_to_byte) stream_seek(stream,seek_to_byte);
+if(seek_to_byte) stream_skip(stream,seek_to_byte);
 
-// DUMP STREAMS:
-if(stream_dump_type==1) dump_stream(demuxer);
 
 sh_audio=d_audio->sh;
 sh_video=d_video->sh;