X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdc1394.c;h=9fa05aa8f5dd7bf0ff7e99c02b41636b97d8ba1e;hb=950a8cc26193f2512f5d1b5efd0a0ca49f5ca23d;hp=18ad44d04b2331c7a98b6cdb7d34f70c32a7697c;hpb=0eb6f1bfe7a9303e889c851d71db6589a3ff027f;p=vlc diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c index 18ad44d04b..9fa05aa8f5 100644 --- 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;