[PATCH] videoinput module fixes version 2

Andrew de Quincey <[email protected]> Tue, 12 Aug 2003 09:36:06 +0100

Newsgroups	gmane.comp.video.videolan.vls.devel
Message-ID	<[email protected]>

Found another bug in videoinput.cpp, so here is version 2 of that patch

This patch fixes:

1) Slight bug in the videoinput.cpp for Mpeg2-TS source.
2) The StopStreaming() code was slightly wrong and caused a segfault on 
shutdown. Fixed

vls-cvs-videoinput-2.patch (text/x-diff, 630 B)

--- vls.orig/src/modules/videoinput/videoinput.cpp	2003-08-11 11:15:48.000000000 +0100
+++ vls/src/modules/videoinput/videoinput.cpp	2003-08-12 03:29:28.000000000 +0100
@@ -181,7 +181,7 @@
     pBuffer = new C_SyncFifo(uiSize);
     // Get file name
     strReaderType = "file";
-    pBroadcast->SetOption("device", m_strDevice);
+    pBroadcast->SetOption("filename", m_strDevice);
 
     // Converter configuration
     strConverterType = "ts2ts";
@@ -382,8 +382,8 @@
   try
   {
     pStreamer->Stop();
-    delete pStreamer;
     pTrickPlay->Stop();
+    delete pStreamer;
     delete pTrickPlay;
   }
   catch(E_Exception e)