Skip to content

V
vlc-2-2
Commit a8e7b700 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* all : fix compilation.

parent 453d866a
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
modules/mux/avi.c
View file @ a8e7b700
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* avi.c * avi.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * 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 <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( 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 AddStream( sout_instance_t *, sout_input_t * );
static int DelStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * );
static int Mux ( sout_instance_t * ); static int Mux ( sout_instance_t * );
...@@ -238,7 +238,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -238,7 +238,7 @@ static void Close( vlc_object_t * p_this )
sout_AccessOutWrite( p_sout->p_access, p_hdr ); 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 ) switch( i_query )
{ {
......
modules/mux/dummy.c
View file @ a8e7b700
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dummy.c * dummy.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * 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 <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( 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 AddStream( sout_instance_t *, sout_input_t * );
static int DelStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * );
static int Mux ( sout_instance_t * ); static int Mux ( sout_instance_t * );
...@@ -92,7 +92,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -92,7 +92,7 @@ static void Close( vlc_object_t * p_this )
msg_Info( p_sout, "Close" ); 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 ) switch( i_query )
{ {
......
modules/mux/mpeg/ps.c
View file @ a8e7b700
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ps.c * ps.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * 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 <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( 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 AddStream( sout_instance_t *, sout_input_t * );
static int DelStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * );
static int Mux ( sout_instance_t * ); static int Mux ( sout_instance_t * );
...@@ -157,7 +157,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -157,7 +157,7 @@ static void Close( vlc_object_t * p_this )
p_sout->p_mux_data = NULL; 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 ) switch( i_query )
{ {
......
modules/mux/mpeg/ts.c
View file @ a8e7b700
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ts.c * ts.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * 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 <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -115,7 +115,8 @@ typedef struct sout_mux_s ...@@ -115,7 +115,8 @@ typedef struct sout_mux_s
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( 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 AddStream( sout_instance_t *, sout_input_t * );
static int DelStream( sout_instance_t *, sout_input_t * ); static int DelStream( sout_instance_t *, sout_input_t * );
static int Mux ( sout_instance_t * ); static int Mux ( sout_instance_t * );
...@@ -206,7 +207,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -206,7 +207,7 @@ static void Close( vlc_object_t * p_this )
p_sout->p_mux_data = NULL; 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 ) switch( i_query )
{ {
......
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