[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.96,1.97

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv18481

Modified Files:
	open.c 
Log Message:
Fix playback of file after playing an url
Patch by Aurelien Jacobs <aurel (at) gnuage (dot) org>


Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- open.c	3 May 2004 18:19:16 -0000	1.96
+++ open.c	11 Jun 2004 20:57:03 -0000	1.97
@@ -517,6 +517,7 @@
 //	    if (len == -1)	
 //    		   return new_stream(f,STREAMTYPE_STREAM); // open as stream
 	    url_free(url);
+	    url = NULL;
             stream=new_stream(f,STREAMTYPE_SMB);
     	    stream->end_pos=len;
 	    return stream;
@@ -530,10 +531,12 @@
 	if( streaming_start( stream, file_format, url )<0){
           mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename);
 	  url_free(url);
+	  url = NULL;
 	  return NULL;
 	} else {
         mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname );
 	url_free(url);
+	url = NULL;
 	return stream;
 	}
   }