Commit d27ab781 authored by Laurent Aimar's avatar Laurent Aimar

Fixed compilation warnings.

parent 462d2be6
...@@ -159,7 +159,7 @@ static void ButtonUpdate( demux_t *, vlc_bool_t ); ...@@ -159,7 +159,7 @@ static void ButtonUpdate( demux_t *, vlc_bool_t );
static void ESNew( demux_t *, int ); static void ESNew( demux_t *, int );
static int ProbeDVD( demux_t *, char * ); static int ProbeDVD( demux_t *, char * );
static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var ); static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var );
/***************************************************************************** /*****************************************************************************
* DemuxOpen: * DemuxOpen:
...@@ -815,7 +815,7 @@ static int Demux( demux_t *p_demux ) ...@@ -815,7 +815,7 @@ static int Demux( demux_t *p_demux )
/* Get a 2 char code /* Get a 2 char code
* FIXME: partiallyy duplicated from src/input/es_out.c * FIXME: partiallyy duplicated from src/input/es_out.c
*/ */
static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var ) static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var )
{ {
const iso639_lang_t *pl; const iso639_lang_t *pl;
char *psz_lang; char *psz_lang;
......
...@@ -87,8 +87,6 @@ static int Control( demux_t *, int, va_list ); ...@@ -87,8 +87,6 @@ static int Control( demux_t *, int, va_list );
static int ProbeDev( demux_t * ); static int ProbeDev( demux_t * );
static int OpenVideoDev( demux_t * ); static int OpenVideoDev( demux_t * );
static block_t *GrabVideo( demux_t * );
struct demux_sys_t struct demux_sys_t
{ {
char *psz_device; char *psz_device;
...@@ -123,7 +121,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -123,7 +121,6 @@ static int Open( vlc_object_t *p_this )
{ {
demux_t *p_demux = (demux_t*)p_this; demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys; demux_sys_t *p_sys;
demux_sys_t sys;
/* Only when selected */ /* Only when selected */
if( *p_demux->psz_access == '\0' ) if( *p_demux->psz_access == '\0' )
...@@ -171,6 +168,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -171,6 +168,7 @@ static void Close( vlc_object_t *p_this )
*****************************************************************************/ *****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args ) static int Control( demux_t *p_demux, int i_query, va_list args )
{ {
return VLC_EGENERIC;
} }
/***************************************************************************** /*****************************************************************************
...@@ -178,6 +176,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -178,6 +176,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*****************************************************************************/ *****************************************************************************/
static int DemuxMMAP( demux_t *p_demux ) static int DemuxMMAP( demux_t *p_demux )
{ {
msleep( 40000 );
return 1;
} }
...@@ -196,9 +196,9 @@ int OpenVideoDev( demux_t *p_demux ) ...@@ -196,9 +196,9 @@ int OpenVideoDev( demux_t *p_demux )
} }
p_sys->i_fd_video = i_fd; p_sys->i_fd_video = i_fd;
p_sys->i_selected_input = var_CreateGetInteger( p_demux, "v4l2-input" );
if( p_sys->i_selected_input = var_CreateGetInteger( p_demux, "v4l2-input" ) if( p_sys->i_selected_input > p_sys->i_input )
> p_sys->i_input )
{ {
msg_Warn( p_demux, "invalid input. Using the default one" ); msg_Warn( p_demux, "invalid input. Using the default one" );
p_sys->i_selected_input = 0; p_sys->i_selected_input = 0;
...@@ -355,8 +355,9 @@ int ProbeDev( demux_t *p_demux ) ...@@ -355,8 +355,9 @@ int ProbeDev( demux_t *p_demux )
if( p_sys->dev_cap.capabilities & V4L2_CAP_TUNER ) if( p_sys->dev_cap.capabilities & V4L2_CAP_TUNER )
{ {
struct v4l2_tuner tuner = {}; struct v4l2_tuner tuner;
memset( &tuner, 0, sizeof(tuner) );
while( ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) >= 0 ) while( ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) >= 0 )
{ {
p_sys->i_tuner++; p_sys->i_tuner++;
...@@ -398,9 +399,10 @@ int ProbeDev( demux_t *p_demux ) ...@@ -398,9 +399,10 @@ int ProbeDev( demux_t *p_demux )
/* Probe for available chromas */ /* Probe for available chromas */
if( p_sys->dev_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE ) if( p_sys->dev_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE )
{ {
struct v4l2_fmtdesc codec = {}; struct v4l2_fmtdesc codec;
i_index = 0; i_index = 0;
memset( &codec, 0, sizeof(codec) );
codec.index = i_index; codec.index = i_index;
codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
......
...@@ -492,7 +492,7 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -492,7 +492,7 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000, div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000,
10000000 ); 10000000 );
sprintf( psz_newbands, "%s "I64Fd".%07u", psz_newbands, sprintf( psz_newbands, "%s "I64Fd".%07u", psz_newbands,
div.quot, (unsigned int) div.rem ); (int64_t)div.quot, (unsigned int) div.rem );
} }
if( p_sys->b_first == VLC_FALSE ) if( p_sys->b_first == VLC_FALSE )
{ {
......
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