Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
58e40fc8
Commit
58e40fc8
authored
Nov 25, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc1394: factorize.
parent
7bb31a1f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
12 deletions
+5
-12
modules/access/dc1394.c
modules/access/dc1394.c
+5
-12
No files found.
modules/access/dc1394.c
View file @
58e40fc8
...
...
@@ -132,9 +132,6 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
{
msg_Err(p_demux, "Can not ennumerate cameras");
dc1394_camera_free_list (list);
dc1394_free( sys->p_dccontext );
free( sys );
p_demux->p_sys = NULL;
return VLC_EGENERIC;
}
...
...
@@ -142,9 +139,6 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
{
msg_Err(p_demux, "Can not find cameras");
dc1394_camera_free_list (list);
dc1394_free( sys->p_dccontext );
free( sys );
p_demux->p_sys = NULL;
return VLC_EGENERIC;
}
...
...
@@ -169,9 +163,6 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
msg_Err( p_demux, "Can't find camera with uid : 0x%llx.",
sys->selected_uid );
dc1394_camera_free_list (list);
dc1394_free( sys->p_dccontext );
free( sys );
p_demux->p_sys = NULL;
return VLC_EGENERIC;
}
}
...
...
@@ -180,9 +171,6 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
msg_Err( p_demux, "There are not this many cameras. (%d/%d)",
sys->selected_camera, sys->num_cameras );
dc1394_camera_free_list (list);
dc1394_free( sys->p_dccontext );
free( sys );
p_demux->p_sys = NULL;
return VLC_EGENERIC;
}
else if( sys->selected_camera >= 0 )
...
...
@@ -263,7 +251,12 @@ static int Open( vlc_object_t *p_this )
}
if( FindCamera( p_sys, p_demux ) != VLC_SUCCESS )
{
dc1394_free( p_sys->p_dccontext );
free( p_sys );
p_demux->p_sys = NULL;
return VLC_EGENERIC;
}
if( !p_sys->camera )
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment