Commit 0432a0e5 authored by Laurent Aimar's avatar Laurent Aimar

Cosmetics.

parent de1eb83f
......@@ -36,9 +36,9 @@
/* stream_t *s could be null and then it mean a access+demux in one */
#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
demux_t *__demux_New( vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
void demux_Delete(demux_t *);
void demux_Delete( demux_t * );
static inline int demux_Demux( demux_t *p_demux )
{
......
......@@ -560,7 +560,7 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p
( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
i_ret = 0; /* EOF */
else
i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
i_ret = demux_Demux( p_input->p->input.p_demux );
if( i_ret > 0 )
{
......@@ -2650,13 +2650,13 @@ static void SlaveDemux( input_thread_t *p_input )
if( i_stime >= i_time )
break;
if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
break;
}
}
else
{
i_ret = in->p_demux->pf_demux( in->p_demux );
i_ret = demux_Demux( in->p_demux );
}
if( i_ret <= 0 )
......
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