From 08a834225603113bbeafec176014426217c7f8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Sat, 10 Oct 2020 14:34:47 +0300 Subject: [PATCH] sout: remove read-only sout_stream_t.pace_nocontrol --- include/vlc_sout.h | 1 - src/stream_output/stream_output.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 7ccd635ada13..c4a4ee5b3574 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -219,7 +219,6 @@ struct sout_stream_t void (*pf_flush)( sout_stream_t *, void * ); void *p_sys; - bool pace_nocontrol; }; VLC_API void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last ); diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 2d6c6764ba33..cf0ffe5beaea 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -754,12 +754,8 @@ static void mrl_Clean( mrl_t *p_mrl ) /* Destroy a "stream_out" module */ static void sout_StreamDelete( sout_stream_t *p_stream ) { - sout_instance_t *p_sout = (sout_instance_t *)vlc_object_parent(p_stream); - msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); - p_sout->i_out_pace_nocontrol -= p_stream->pace_nocontrol; - if( p_stream->p_module != NULL ) module_unneed( p_stream, p_stream->p_module ); @@ -814,7 +810,6 @@ static sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_name, p_stream->ops = NULL; p_stream->pf_flush = NULL; p_stream->pf_control = NULL; - p_stream->pace_nocontrol = false; p_stream->p_sys = NULL; msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name ); @@ -831,7 +826,6 @@ static sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_name, return NULL; } - p_sout->i_out_pace_nocontrol += p_stream->pace_nocontrol; return p_stream; } -- GitLab