Commits

Anonymous committed 4c96f57

Changed stream_open to not return a struct, which for some reason was
not working right on my desktop at home... but not on my laptop.

Comments (0)

Files changed (3)

 	RELEASEGIL
 }
 
-PyMovie *stream_open(PyMovie *movie, const char *filename, AVInputFormat *iformat, int threaded)
+void stream_open(PyMovie *movie, const char *filename, AVInputFormat *iformat, int threaded)
 {
     if (!movie)
-        return NULL;
+        return;
     DECLAREGIL
     if(threaded)
 	{
 		Py_DECREF(movie);
 		if(threaded)
 			RELEASEGIL
-		return movie;
+		return;
 	}
 	if(threaded)
 		{GRABGIL}
 	Py_DECREF(movie);
     if(threaded)
 	    {RELEASEGIL}
-    return movie;
+    return;
 }
 
  void stream_close(PyMovie *movie)
 	while((movie->loops>-1||eternity) && !movie->stop )
 	{
 		movie->loops--;
-		movie=stream_open(movie, movie->filename, NULL, 1);
+		stream_open(movie, movie->filename, NULL, 1);
 		movie->paused=0;
 		state =decoder(movie);
 		if(movie->video_st)
 int stream_component_open(PyMovie *is, int stream_index, int threaded); //TODO: break down into separate functions
 void stream_component_close(PyMovie *is, int stream_index);
 int decoder(void *arg);
-PyMovie *stream_open(PyMovie *is, const char *filename, AVInputFormat *iformat, int threaded);
+void stream_open(PyMovie *is, const char *filename, AVInputFormat *iformat, int threaded);
 void stream_close(PyMovie *is);
 void stream_cycle_channel(PyMovie *is, int codec_type);
 int decoder_wrapper(void *arg);
 		self->canon_surf=surf;
 	}
 	self->start_time = AV_NOPTS_VALUE;
-	self=stream_open(self, filename, NULL, 0);
+	stream_open(self, filename, NULL, 0);
 	if(!self)
 	{
 		PyErr_SetString(PyExc_IOError, "stream_open failed");