[vlc-devel] commit: dc1394: factorize. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Nov 25 15:32:10 2009 +0100| [58e40fc82f349bec83f6dedeb14b0ece91b048b7] | committer: Rémi Duraffort 

dc1394: factorize.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=58e40fc82f349bec83f6dedeb14b0ece91b048b7
---

 modules/access/dc1394.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 75a1146..e7dcfbb 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -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 )
     {