[vlc-commits] subtitle: fix var inheritance

Thomas Guillem git at videolan.org
Thu Mar 22 11:28:34 CET 2018


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Mar 22 11:13:34 2018 +0100| [f6c53b2823f59fc2207559eec834c29bca78a425] | committer: Thomas Guillem

subtitle: fix var inheritance

"sub-original-fps" is not a config and is only created from the input_thread_t.

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

 modules/demux/subtitle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index ea73c5fe56..35f6e81ec2 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -335,7 +335,7 @@ static int Open ( vlc_object_t *p_this )
     p_sys->props.sami.psz_start     = NULL;
 
     /* Get the FPS */
-    f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" ); /* FIXME */
+    f_fps = p_demux->p_input ? var_GetFloat( p_demux->p_input, "sub-original-fps" ) : 0.0f;
     if( f_fps >= 1.f )
         p_sys->props.i_microsecperframe = llroundf( 1000000.f / f_fps );
 



More information about the vlc-commits mailing list