diff --git a/modules/mux/avi.c b/modules/mux/avi.c index bb60e2238e..356870ee20 100644 --- a/modules/mux/avi.c +++ b/modules/mux/avi.c @@ -2,7 +2,7 @@ * avi.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: avi.c,v 1.7 2003/02/24 12:34:29 fenrir Exp $ + * $Id: avi.c,v 1.8 2003/02/24 14:14:43 fenrir Exp $ * * Authors: Laurent Aimar * @@ -65,7 +65,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Capability( int , void *, void * ); +static int Capability(sout_instance_t *, int , void *, void * ); static int AddStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * ); static int Mux ( sout_instance_t * ); @@ -238,7 +238,7 @@ static void Close( vlc_object_t * p_this ) sout_AccessOutWrite( p_sout->p_access, p_hdr ); } -static int Capability( int i_query, void *p_args, void *p_answer ) +static int Capability( sout_instance_t *p_sout, int i_query, void *p_args, void *p_answer ) { switch( i_query ) { diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c index 1900c46f4c..6eda7145d4 100644 --- a/modules/mux/dummy.c +++ b/modules/mux/dummy.c @@ -2,7 +2,7 @@ * dummy.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: dummy.c,v 1.4 2003/02/24 12:34:29 fenrir Exp $ + * $Id: dummy.c,v 1.5 2003/02/24 14:14:43 fenrir Exp $ * * Authors: Laurent Aimar * Eric Petit @@ -50,7 +50,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Capability( int, void *, void * ); +static int Capability(sout_instance_t *, int, void *, void * ); static int AddStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * ); static int Mux ( sout_instance_t * ); @@ -92,7 +92,7 @@ static void Close( vlc_object_t * p_this ) msg_Info( p_sout, "Close" ); } -static int Capability( int i_query, void *p_args, void *p_answer ) +static int Capability( sout_instance_t *p_sout, int i_query, void *p_args, void *p_answer ) { switch( i_query ) { diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c index 7b4ec3ff62..eee5a5f8c0 100644 --- a/modules/mux/mpeg/ps.c +++ b/modules/mux/mpeg/ps.c @@ -2,7 +2,7 @@ * ps.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: ps.c,v 1.8 2003/02/24 12:34:29 fenrir Exp $ + * $Id: ps.c,v 1.9 2003/02/24 14:14:43 fenrir Exp $ * * Authors: Laurent Aimar * Eric Petit @@ -53,7 +53,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Capability( int , void *, void * ); +static int Capability(sout_instance_t *, int, void *, void * ); static int AddStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * ); static int Mux ( sout_instance_t * ); @@ -157,7 +157,7 @@ static void Close( vlc_object_t * p_this ) p_sout->p_mux_data = NULL; } -static int Capability( int i_query, void *p_args, void *p_answer ) +static int Capability( sout_instance_t *p_sout, int i_query, void *p_args, void *p_answer ) { switch( i_query ) { diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index ffb639f5bb..e808afb4d1 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -2,7 +2,7 @@ * ts.c ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: ts.c,v 1.11 2003/02/24 12:34:29 fenrir Exp $ + * $Id: ts.c,v 1.12 2003/02/24 14:14:43 fenrir Exp $ * * Authors: Laurent Aimar * Eric Petit @@ -115,7 +115,8 @@ typedef struct sout_mux_s static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Capability( int , void *, void * ); + +static int Capability(sout_instance_t *, int, void *, void * ); static int AddStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * ); static int Mux ( sout_instance_t * ); @@ -206,7 +207,7 @@ static void Close( vlc_object_t * p_this ) p_sout->p_mux_data = NULL; } -static int Capability( int i_query, void *p_args, void *p_answer ) +static int Capability( sout_instance_t *p_sout, int i_query, void *p_args, void *p_answer ) { switch( i_query ) {