[vlc-devel] commit: Removed now useless es_out_t::b_sout field. (Laurent Aimar )
git version control
git at videolan.org
Sun Jan 31 01:41:56 CET 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jan 31 00:48:34 2010 +0100| [878a2399dc2400ac63ebfb73b62a00298211a1da] | committer: Laurent Aimar
Removed now useless es_out_t::b_sout field.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=878a2399dc2400ac63ebfb73b62a00298211a1da
---
include/vlc_es_out.h | 2 --
modules/access/bd/bd.c | 1 -
src/input/es_out.c | 2 --
src/input/es_out_timeshift.c | 1 -
4 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 78d3168..3d25e40 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -101,8 +101,6 @@ struct es_out_t
int (*pf_control)( es_out_t *, int i_query, va_list );
void (*pf_destroy)( es_out_t * );
- bool b_sout;
-
es_out_sys_t *p_sys;
};
diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
index 7eb17bf..5c61970 100644
--- a/modules/access/bd/bd.c
+++ b/modules/access/bd/bd.c
@@ -1343,7 +1343,6 @@ static es_out_t *EsOutNew( demux_t *p_demux )
p_out->pf_del = EsOutDel;
p_out->pf_control = EsOutControl;
p_out->pf_destroy = EsOutDestroy;
- p_out->b_sout = false;
p_out->p_sys = p_sys = malloc( sizeof(*p_sys) );
if( !p_sys )
diff --git a/src/input/es_out.c b/src/input/es_out.c
index b76e276..8e7419a 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -237,8 +237,6 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int i_rate )
out->pf_control = EsOutControl;
out->pf_destroy = EsOutDelete;
out->p_sys = p_sys;
- out->b_sout = false; /* It has no meaning here, and p_input->p->p_sout is not yet valid */
-
vlc_mutex_init_recursive( &p_sys->lock );
p_sys->p_input = p_input;
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index a63256e..d650234 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -307,7 +307,6 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out
p_out->pf_control = Control;
p_out->pf_destroy = Destroy;
p_out->p_sys = p_sys;
- p_out->b_sout = p_input->p->p_sout != NULL;
/* */
p_sys->b_input_paused = false;
More information about the vlc-devel
mailing list