[vlc-devel] [PATCH 18/18] chromecast: do not clobber sout instance with private variable

Rémi Denis-Courmont remi at remlab.net
Sat Oct 10 14:46:06 CEST 2020


Le lauantaina 10. lokakuuta 2020, 15.11.01 EEST Rémi Denis-Courmont a écrit :
> This works because the stream output is not reentrant but it is ugly.
> ---
>  modules/stream_out/chromecast/cast.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/stream_out/chromecast/cast.cpp
> b/modules/stream_out/chromecast/cast.cpp index 944bde923f..55e1f44620
> 100644
> --- a/modules/stream_out/chromecast/cast.cpp
> +++ b/modules/stream_out/chromecast/cast.cpp
> @@ -434,7 +434,7 @@ void sout_access_out_sys_t::stop()
> 
>  void sout_access_out_sys_t::prepare(sout_stream_t *p_stream, const
> std::string &mime) {
> -    var_SetAddress(p_stream->p_sout, SOUT_CFG_PREFIX "access-out-sys",
> this); +    var_SetAddress(p_stream, SOUT_CFG_PREFIX "access-out-sys",
> this);
> 
>      vlc_fifo_Lock(m_fifo);
>      clearUnlocked();
> @@ -822,7 +822,7 @@ bool sout_stream_sys_t::startSoutChain(sout_stream_t
> *p_stream,
> 
>      access_out_live.prepare( p_stream, mime );
> 
> -    p_out = sout_StreamChainNew( p_stream->p_sout, sout.c_str(), NULL,
> NULL); +    p_out = sout_StreamChainNew(VLC_OBJECT(p_stream), sout.c_str(),
> NULL, NULL); if (p_out == NULL) {
>          msg_Dbg(p_stream, "could not create sout chain:%s", sout.c_str());
>          out_streams.clear();

Missing update to var_Create() in Open().

-- 
レミ・デニ-クールモン
http://www.remlab.net/





More information about the vlc-devel mailing list