Skip to content

V
vlc-2-2
Commit 095f0837 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Remove useless code.

parent e1fd82bb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
modules/access/v4l2.c
View file @ 095f0837
...@@ -1739,7 +1739,6 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux ) ...@@ -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; enum v4l2_buf_type buf_type;
const char *psz_device = p_sys->psz_device; const char *psz_device = p_sys->psz_device;
es_format_t es_fmt; es_format_t es_fmt;
int libv4l2_fd;
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) 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 ) ...@@ -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. */ device is not a v4l2 device. */
if( p_sys->b_libv4l2 ) if( p_sys->b_libv4l2 )
{ {
int libv4l2_fd;
libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION ); libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
if( libv4l2_fd != -1 ) if( libv4l2_fd != -1 )
i_fd = libv4l2_fd; i_fd = libv4l2_fd;
} }
else
#else
libv4l2_fd = i_fd;
#endif #endif
/* Tune the tuner */ /* Tune the tuner */
...@@ -2195,7 +2192,6 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, ...@@ -2195,7 +2192,6 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
int i_standard; int i_standard;
int i_fd; int i_fd;
int libv4l2_fd;
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 ) 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, ...@@ -2212,13 +2208,11 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
device is not a v4l2 device. */ device is not a v4l2 device. */
if( p_sys->b_libv4l2 ) if( p_sys->b_libv4l2 )
{ {
int libv4l2_fd;
libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION ); libv4l2_fd = v4l2_fd_open( i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION );
if( libv4l2_fd != -1 ) if( libv4l2_fd != -1 )
i_fd = libv4l2_fd; i_fd = libv4l2_fd;
} }
else
#else
libv4l2_fd = i_fd;
#endif #endif
/* Get device capabilites */ /* Get device capabilites */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment