From a03f440f3e5f129278825d3b98fa9ae0009ac2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sat, 10 Oct 2020 15:17:09 +0300
Subject: [PATCH] sout: privatise sout_instance_t
---
include/vlc_sout.h | 14 --------------
src/stream_output/stream_output.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 977d5f76c27b..5e96451b33cd 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -42,20 +42,6 @@ extern "C" {
* Stream output modules interface
*/
-/** Stream output instance (FIXME: should be private to src/ to avoid
- * invalid unsynchronized access) */
-struct sout_instance_t
-{
- struct vlc_object_t obj;
-
- char *psz_sout;
-
- bool b_wants_substreams;
-
- vlc_mutex_t lock;
- sout_stream_t *p_stream;
-};
-
/**
* \defgroup sout_access Access output
* Raw output byte streams
diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 5a3ddb5cd161..f878af0f539d 100644
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -29,6 +29,19 @@
# include <vlc_sout.h>
# include <vlc_network.h>
+/** Stream output instance */
+struct sout_instance_t
+{
+ struct vlc_object_t obj;
+
+ char *psz_sout;
+
+ bool b_wants_substreams;
+
+ vlc_mutex_t lock;
+ sout_stream_t *p_stream;
+};
+
/****************************************************************************
* sout_packetizer_input_t: p_sout <-> p_packetizer
****************************************************************************/
--
GitLab