[vlc-devel] [PATCH 12/18] sout: remove read-only sout_instance_t.i_out_pace_nocontrol
Rémi Denis-Courmont
remi at remlab.net
Sat Oct 10 14:10:55 CEST 2020
---
include/vlc_sout.h | 2 --
src/stream_output/stream_output.c | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index c4a4ee5b35..5b8e0bc9a5 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -50,8 +50,6 @@ struct sout_instance_t
char *psz_sout;
- /** count of output that can't control the space */
- int i_out_pace_nocontrol;
bool b_wants_substreams;
vlc_mutex_t lock;
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index cf0ffe5bea..44c85b35ee 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -108,7 +108,6 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
- p_sout->i_out_pace_nocontrol = 0;
p_sout->b_wants_substreams = false;
vlc_mutex_init( &p_sout->lock );
@@ -152,11 +151,10 @@ void sout_DeleteInstance( sout_instance_t * p_sout )
bool sout_instance_ControlsPace( sout_instance_t *sout )
{
- bool ret = false;
+ bool ret;
vlc_mutex_lock( &sout->lock );
- if (!sout_StreamIsSynchronous(sout->p_stream))
- ret = sout->i_out_pace_nocontrol <= 0;
+ ret = !sout_StreamIsSynchronous(sout->p_stream);
vlc_mutex_unlock( &sout->lock );
return ret;
}
--
2.28.0
More information about the vlc-devel
mailing list