[vlc-commits] commit: Removed one vlc_object_find(INPUT, PARENT) in subtitle_asa. ( Laurent Aimar )

git at videolan.org git at videolan.org
Tue May 25 22:56:00 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May 25 22:53:50 2010 +0200| [097ab8521c7fe1f4804221685eedcf2720170bf8] | committer: Laurent Aimar 

Removed one vlc_object_find(INPUT, PARENT) in subtitle_asa.

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

 modules/demux/subtitle_asa.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index b9f6a37..63bf9f7 100644
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -117,7 +117,6 @@ static int Open ( vlc_object_t *p_this )
     demux_t        *p_demux = (demux_t*)p_this;
     demux_sys_t    *p_sys;
     es_format_t    fmt;
-    input_thread_t *p_input;
     float          f_fps;
     char           *psz_type;
     int64_t        i_ssize;
@@ -142,16 +141,11 @@ static int Open ( vlc_object_t *p_this )
     p_sys->i_microsecperframe = 40000;
 
     /* Get the FPS */
-    p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( p_input )
-    {
-        f_fps = var_GetFloat( p_input, "sub-original-fps" );
-        if( f_fps >= 1.0 )
-            p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps );
+    f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" );
+    if( f_fps >= 1.0 )
+        p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps );
 
-        msg_Dbg( p_demux, "Movie fps: %f", f_fps );
-        vlc_object_release( p_input );
-    }
+    msg_Dbg( p_demux, "Movie fps: %f", f_fps );
 
     /* Check for override of the fps */
     f_fps = var_CreateGetFloat( p_demux, "sub-fps" );



More information about the vlc-commits mailing list