Zip: use !/ as separator instead of |

[vlc] / modules / access / dc1394.c

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index abd1bed29540a3e9bbcea3944346ae675510d62c..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;
@@ -225,10 +228,9 @@ static int Open( vlc_object_t *p_this )
     p_demux->info.i_title = 0;
     p_demux->info.i_seekpoint = 0;
 
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
-    memset( p_sys, 0, sizeof( demux_sys_t ) );
     memset( &fmt, 0, sizeof( es_format_t ) );
 
     /* DEFAULTS */
@@ -835,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;