Commit 9922031c authored by Rémi Duraffort's avatar Rémi Duraffort

v4l2: compute strchr only one time.

parent e3f06b2e
...@@ -719,9 +719,9 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj ) ...@@ -719,9 +719,9 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
p_sys->psz_set_ctrls = var_CreateGetString( p_obj, "v4l2-set-ctrls" ); p_sys->psz_set_ctrls = var_CreateGetString( p_obj, "v4l2-set-ctrls" );
char *psz_aspect = var_CreateGetString( p_obj, "v4l2-aspect-ratio" ); char *psz_aspect = var_CreateGetString( p_obj, "v4l2-aspect-ratio" );
if( psz_aspect && *psz_aspect && strchr( psz_aspect, ':' ) ) char *psz_delim = !EMPTY_STR(psz_aspect) ? strchr( psz_aspect, ':' ) : NULL;
if( psz_delim )
{ {
char *psz_delim = strchr( psz_aspect, ':' );
p_sys->i_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR / atoi( psz_delim + 1 ); p_sys->i_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR / atoi( psz_delim + 1 );
} }
else else
...@@ -2453,7 +2453,6 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, ...@@ -2453,7 +2453,6 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
if( p_sys->dev_cap.capabilities & V4L2_CAP_HW_FREQ_SEEK ) if( p_sys->dev_cap.capabilities & V4L2_CAP_HW_FREQ_SEEK )
msg_Dbg( p_obj, "device supports hardware frequency seeking" ); msg_Dbg( p_obj, "device supports hardware frequency seeking" );
#endif #endif
if( p_sys->dev_cap.capabilities & V4L2_CAP_VBI_CAPTURE ) if( p_sys->dev_cap.capabilities & V4L2_CAP_VBI_CAPTURE )
msg_Dbg( p_obj, "device support raw VBI capture" ); msg_Dbg( p_obj, "device support raw VBI capture" );
......
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