[vlc-commits] codec: webvtt: missing ifdef for sout

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jan 25 17:12:40 2018 +0100| [c7412bad548d899fb0da916fab8f49852bb2ea16] | committer: Francois Cartegnie

codec: webvtt: missing ifdef for sout

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

 modules/codec/Makefile.am     | 4 +++-
 modules/codec/webvtt/webvtt.c | 2 ++
 modules/codec/webvtt/webvtt.h | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 2d9add96d7..d4df5a7a90 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -231,9 +231,11 @@ codec_LTLIBRARIES += libttml_plugin.la
 libwebvtt_plugin_la_SOURCES = codec/webvtt/subsvtt.c \
                               codec/webvtt/webvtt.c \
                               codec/webvtt/webvtt.h \
-                              codec/webvtt/encvtt.c \
                               demux/webvtt.c \
                               demux/mp4/minibox.h
+if ENABLE_SOUT
+libwebvtt_plugin_la_SOURCES += codec/webvtt/encvtt.c
+endif
 codec_LTLIBRARIES += libwebvtt_plugin.la
 if ENABLE_CSS
 # dependency: we need grammar build first
diff --git a/modules/codec/webvtt/webvtt.c b/modules/codec/webvtt/webvtt.c
index db07a8ecf1..adf22adacc 100644
--- a/modules/codec/webvtt/webvtt.c
+++ b/modules/codec/webvtt/webvtt.c
@@ -58,11 +58,13 @@ vlc_module_begin ()
         set_subcategory( SUBCAT_INPUT_DEMUX )
         set_callbacks( OpenDemuxStream, CloseDemux )
         add_shortcut( "webvttstream" )
+#ifdef ENABLE_SOUT
     add_submodule()
         set_description( "WEBVTT text encoder" )
         set_capability( "encoder", 101 )
         set_subcategory( SUBCAT_INPUT_SCODEC )
         set_callbacks( OpenEncoder, CloseEncoder )
+#endif
 vlc_module_end ()
 
 struct webvtt_text_parser_t
diff --git a/modules/codec/webvtt/webvtt.h b/modules/codec/webvtt/webvtt.h
index 7002fd7f0d..7c5d84df1d 100644
--- a/modules/codec/webvtt/webvtt.h
+++ b/modules/codec/webvtt/webvtt.h
@@ -27,8 +27,10 @@ int  OpenDemux     ( vlc_object_t * );
 int  OpenDemuxStream (vlc_object_t *);
 void CloseDemux    ( vlc_object_t * );
 
+#ifdef ENABLE_SOUT
 int  OpenEncoder   ( vlc_object_t * );
 void CloseEncoder  ( vlc_object_t * );
+#endif
 
 typedef struct webvtt_text_parser_t webvtt_text_parser_t;