[vlc-devel] commit: Remove useless code. (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Mar 29 13:25:36 2009 +0200| [095f08372ac1cec34f5c44307d23d5793d5d17e4] | committer: Antoine Cellerier 

Remove useless code.

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

 modules/access/v4l2.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 821f926..a9b982b 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -1739,7 +1739,6 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
     enum v4l2_buf_type buf_type;
     const char *psz_device = p_sys->psz_device;
     es_format_t es_fmt;
-    int libv4l2_fd;
 
     if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
     {
@@ -1756,13 +1755,11 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
        device is not a v4l2 device. */
     if( p_sys->b_libv4l2 )
     {
+        int libv4l2_fd;
         libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
         if( libv4l2_fd != -1 )
             i_fd = libv4l2_fd;
     }
-    else
-#else
-    libv4l2_fd = i_fd;
 #endif
 
     /* Tune the tuner */
@@ -2195,7 +2192,6 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
     int i_standard;
 
     int i_fd;
-    int libv4l2_fd;
 
     if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
     {
@@ -2212,13 +2208,11 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
        device is not a v4l2 device. */
     if( p_sys->b_libv4l2 )
     {
+        int libv4l2_fd;
         libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
         if( libv4l2_fd != -1 )
             i_fd = libv4l2_fd;
     }
-    else
-#else
-    libv4l2_fd = i_fd;
 #endif
 
     /* Get device capabilites */