mirror of
https://code.videolan.org/videolan/vlc
synced 2024-07-21 07:24:15 +02:00
test if access dc1394 is right earlier in the probing process to avoid side effect (irrelevant errors) for others.
Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>
This commit is contained in:
parent
0eb6f1bfe7
commit
950a8cc261
1
THANKS
1
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
|
Jérôme Guilbaud - Update of the WinAmp 5 VLC skin
|
||||||
Joel Arvidsson <dogai at privat.utfors.se> - Swedish translation
|
Joel Arvidsson <dogai at privat.utfors.se> - Swedish translation
|
||||||
Joeri van Dooren <joeri at van.dooren.be> - OS X icon (v0.4.0)
|
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
|
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
|
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
|
Johen Michael Zorko <zorko at att.net> - fix for delay issues in udp sout
|
||||||
|
@ -218,6 +218,9 @@ static int Open( vlc_object_t *p_this )
|
|||||||
int i_aspect;
|
int i_aspect;
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
|
||||||
|
if( strncmp(p_demux->psz_access, "dc1394", 6) != 0 )
|
||||||
|
return VLC_EGENERIC;
|
||||||
|
|
||||||
/* Set up p_demux */
|
/* Set up p_demux */
|
||||||
p_demux->pf_demux = Demux;
|
p_demux->pf_demux = Demux;
|
||||||
p_demux->pf_control = Control;
|
p_demux->pf_control = Control;
|
||||||
@ -834,9 +837,6 @@ static int process_options( demux_t *p_demux )
|
|||||||
char *state = NULL;
|
char *state = NULL;
|
||||||
float rate_f;
|
float rate_f;
|
||||||
|
|
||||||
if( strncmp(p_demux->psz_access, "dc1394", 6) != 0 )
|
|
||||||
return VLC_EGENERIC;
|
|
||||||
|
|
||||||
psz_dup = strdup( p_demux->psz_path );
|
psz_dup = strdup( p_demux->psz_path );
|
||||||
psz_parser = psz_dup;
|
psz_parser = psz_dup;
|
||||||
for( token = strtok_r( psz_parser,":",&state); token;
|
for( token = strtok_r( psz_parser,":",&state); token;
|
||||||
|
Loading…
Reference in New Issue
Block a user