Commit b71fdec3 authored by hartman's avatar hartman

* const and a few other casting fixes

parent 0ed4ebdf
......@@ -481,7 +481,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
return VLC_EGENERIC;
}
p_sys->i_handle_udp = net_ListenUDP1( p_access, p_sys->sz_bind_addr,
p_sys->i_handle_udp = net_ListenUDP1( (vlc_object_t *)p_access, p_sys->sz_bind_addr,
7000 );
if( p_sys->i_handle_udp < 0 )
{
......
......@@ -34,7 +34,7 @@ extern "C" {
/***************************************************************************
* Internal creation and destruction functions
***************************************************************************/
libvlc_int_t *libvlc_InternalCreate();
libvlc_int_t *libvlc_InternalCreate( void );
int libvlc_InternalInit( libvlc_int_t *, int, char *ppsz_argv[] );
int libvlc_InternalCleanup( libvlc_int_t * );
int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t );
......
......@@ -401,19 +401,19 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
text.psz_string = _("Deinterlace");
var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
val.psz_string = ""; text.psz_string = _("Disable");
val.psz_string = (char *)""; text.psz_string = _("Disable");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "discard"; text.psz_string = _("Discard");
val.psz_string = (char *)"discard"; text.psz_string = _("Discard");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "blend"; text.psz_string = _("Blend");
val.psz_string = (char *)"blend"; text.psz_string = _("Blend");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "mean"; text.psz_string = _("Mean");
val.psz_string = (char *)"mean"; text.psz_string = _("Mean");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "bob"; text.psz_string = _("Bob");
val.psz_string = (char *)"bob"; text.psz_string = _("Bob");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "linear"; text.psz_string = _("Linear");
val.psz_string = (char *)"linear"; text.psz_string = _("Linear");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "x"; text.psz_string = "X";
val.psz_string = (char *)"x"; text.psz_string = (char *)"X";
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
......
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