test if access dc1394 is right earlier in the probing process to avoid side effect...

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

diff --git a/THANKS b/THANKS
index 84934b9cbb9dc6c3147a339ca4c5b5d9338c158c..ef872888cb1ad7f78ead3f431401c1ae6fd2b542 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -137,6 +137,7 @@ Jean-François Massol <jf.massol -<@t> gmail.com> - Qt4 Sout work
 Jérôme Guilbaud - Update of the WinAmp 5 VLC skin
 Joel Arvidsson <dogai at privat.utfors.se> - Swedish translation
 Joeri van Dooren <joeri at van.dooren.be> - OS X icon (v0.4.0)
+Joseph Tulou <brezhoneg1 at yahoo.fr> - small dc1394 patch
 Jörg<vlc-ml at aab.noctis dot de> - VLM seek/show media functions
 Johannes Buchner <buchner.johannes at gmx dot at> - Hotkeys for zoom
 Johen Michael Zorko <zorko at att.net> - fix for delay issues in udp sout

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 18ad44d04b2331c7a98b6cdb7d34f70c32a7697c..9fa05aa8f5dd7bf0ff7e99c02b41636b97d8ba1e 100644 (file)
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -218,6 +218,9 @@ static int Open( vlc_object_t *p_this )
     int i_aspect;
     int result = 0;
 
+    if( strncmp(p_demux->psz_access, "dc1394", 6) != 0 )
+        return VLC_EGENERIC;
+
     /* Set up p_demux */
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
@@ -834,9 +837,6 @@ static int process_options( demux_t *p_demux )
     char *state = NULL;
     float rate_f;
 
-    if( strncmp(p_demux->psz_access, "dc1394", 6) != 0 )
-        return VLC_EGENERIC;
-
     psz_dup = strdup( p_demux->psz_path );
     psz_parser = psz_dup;
     for( token = strtok_r( psz_parser,":",&state); token;