Skip to content

V
vlc-2-2
Commit 9f151876 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

Fix prototypes of threaded functions.

parent 4208297d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/demux/live555.cpp
View file @ 9f151876
...@@ -1702,8 +1702,9 @@ static void TaskInterrupt( void *p_private ) ...@@ -1702,8 +1702,9 @@ static void TaskInterrupt( void *p_private )
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static void TimeoutPrevention( timeout_thread_t *p_timeout ) static void * TimeoutPrevention( vlc_object_t * p_this )
{ {
timeout_thread_t *p_timeout = (timeout_thread_t *)p_this;
p_timeout->b_die = false; p_timeout->b_die = false;
p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2; p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
p_timeout->i_remain *= 1000000; p_timeout->i_remain *= 1000000;
......
modules/demux/mkv.cpp
View file @ 9f151876
...@@ -1406,7 +1406,7 @@ public: ...@@ -1406,7 +1406,7 @@ public:
/* event */ /* event */
event_thread_t *p_ev; event_thread_t *p_ev;
static int EventThread( vlc_object_t *p_this ); static void * EventThread( vlc_object_t *p_this );
static int EventMouse( vlc_object_t *p_this, char const *psz_var, static int EventMouse( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data ); vlc_value_t oldval, vlc_value_t newval, void *p_data );
static int EventKey( vlc_object_t *p_this, char const *psz_var, static int EventKey( vlc_object_t *p_this, char const *psz_var,
...@@ -2797,7 +2797,7 @@ int demux_sys_t::EventKey( vlc_object_t *p_this, char const *, ...@@ -2797,7 +2797,7 @@ int demux_sys_t::EventKey( vlc_object_t *p_this, char const *,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int demux_sys_t::EventThread( vlc_object_t *p_this ) void * demux_sys_t::EventThread( vlc_object_t *p_this )
{ {
event_thread_t *p_ev = (event_thread_t*)p_this; event_thread_t *p_ev = (event_thread_t*)p_this;
demux_sys_t *p_sys = p_ev->p_demux->p_sys; demux_sys_t *p_sys = p_ev->p_demux->p_sys;
......
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