[vlc-devel] [PATCH] webvtt: remove empty close callback
Steve Lhomme
robux4 at ycbcr.xyz
Tue Jan 12 16:41:46 UTC 2021
---
modules/codec/webvtt/encvtt.c | 5 -----
modules/codec/webvtt/webvtt.c | 2 +-
modules/codec/webvtt/webvtt.h | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/modules/codec/webvtt/encvtt.c b/modules/codec/webvtt/encvtt.c
index 056be393a7c..e5c2b5dd91e 100644
--- a/modules/codec/webvtt/encvtt.c
+++ b/modules/codec/webvtt/encvtt.c
@@ -46,11 +46,6 @@ int webvtt_OpenEncoder( vlc_object_t *p_this )
}
-void webvtt_CloseEncoder( vlc_object_t *p_this )
-{
- (void)p_this;
-}
-
static void WriteText( const char *psz, bo_t *box, char *c_last )
{
/* We need to break any double newline sequence
diff --git a/modules/codec/webvtt/webvtt.c b/modules/codec/webvtt/webvtt.c
index 7793d1e61b8..9583d7b4ee6 100644
--- a/modules/codec/webvtt/webvtt.c
+++ b/modules/codec/webvtt/webvtt.c
@@ -63,7 +63,7 @@ vlc_module_begin ()
set_description( "WEBVTT text encoder" )
set_capability( "encoder", 101 )
set_subcategory( SUBCAT_INPUT_SCODEC )
- set_callbacks( webvtt_OpenEncoder, webvtt_CloseEncoder )
+ set_callback( webvtt_OpenEncoder )
#endif
vlc_module_end ()
diff --git a/modules/codec/webvtt/webvtt.h b/modules/codec/webvtt/webvtt.h
index 3b5bb176b01..5c78051e712 100644
--- a/modules/codec/webvtt/webvtt.h
+++ b/modules/codec/webvtt/webvtt.h
@@ -29,7 +29,6 @@ void webvtt_CloseDemux ( vlc_object_t * );
#ifdef ENABLE_SOUT
int webvtt_OpenEncoder ( vlc_object_t * );
-void webvtt_CloseEncoder ( vlc_object_t * );
#endif
typedef struct webvtt_text_parser_t webvtt_text_parser_t;
--
2.29.2
More information about the vlc-devel
mailing list