[vlc-commits] sout: sdi: fix compilation

Francois Cartegnie git at videolan.org
Tue Oct 13 20:14:48 CEST 2020


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Oct 13 10:20:42 2020 +0200| [10054f99537910ce61b00030dd70121490b7a908] | committer: Francois Cartegnie

sout: sdi: fix compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10054f99537910ce61b00030dd70121490b7a908
---

 modules/stream_out/sdi/SDIOutput.cpp | 12 ++++++------
 modules/stream_out/sdi/SDIOutput.hpp |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/stream_out/sdi/SDIOutput.cpp b/modules/stream_out/sdi/SDIOutput.cpp
index 11873030e0..d14a2d919a 100644
--- a/modules/stream_out/sdi/SDIOutput.cpp
+++ b/modules/stream_out/sdi/SDIOutput.cpp
@@ -34,12 +34,12 @@ using namespace sdi_sout;
 SDIOutput::SDIOutput(sout_stream_t *p_stream_)
 {
     p_stream = p_stream_;
-    p_stream->pf_add     = SoutCallback_Add;
-    p_stream->pf_del     = SoutCallback_Del;
-    p_stream->pf_send    = SoutCallback_Send;
-    p_stream->pf_flush   = SoutCallback_Flush;
-    p_stream->pf_control = SoutCallback_Control;
-    p_stream->pace_nocontrol = true;
+    ops.add     = SoutCallback_Add;
+    ops.del     = SoutCallback_Del;
+    ops.send    = SoutCallback_Send;
+    ops.flush   = SoutCallback_Flush;
+    ops.control = SoutCallback_Control;
+    p_stream->ops = &ops;
 
     es_format_Init(&video.configuredfmt, VIDEO_ES, 0);
     video.tenbits = var_InheritBool(p_stream, CFG_PREFIX "tenbits");
diff --git a/modules/stream_out/sdi/SDIOutput.hpp b/modules/stream_out/sdi/SDIOutput.hpp
index 5b4be98129..764b1d88b3 100644
--- a/modules/stream_out/sdi/SDIOutput.hpp
+++ b/modules/stream_out/sdi/SDIOutput.hpp
@@ -22,6 +22,7 @@
 
 #include "SDIStream.hpp"
 #include <vlc_common.h>
+#include <vlc_sout.h>
 #include <list>
 
 namespace sdi_sout
@@ -85,6 +86,7 @@ namespace sdi_sout
             static int   SoutCallback_Send(sout_stream_t *, void *, block_t*);
             static int   SoutCallback_Control(sout_stream_t *, int, va_list);
             static void  SoutCallback_Flush(sout_stream_t *, void *);
+            struct sout_stream_operations ops;
     };
 }
 



More information about the vlc-commits mailing list