Commit 097ab852 authored by Laurent Aimar's avatar Laurent Aimar

Removed one vlc_object_find(INPUT, PARENT) in subtitle_asa.

parent 5a66939e
...@@ -117,7 +117,6 @@ static int Open ( vlc_object_t *p_this ) ...@@ -117,7 +117,6 @@ static int Open ( vlc_object_t *p_this )
demux_t *p_demux = (demux_t*)p_this; demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys; demux_sys_t *p_sys;
es_format_t fmt; es_format_t fmt;
input_thread_t *p_input;
float f_fps; float f_fps;
char *psz_type; char *psz_type;
int64_t i_ssize; int64_t i_ssize;
...@@ -142,16 +141,11 @@ static int Open ( vlc_object_t *p_this ) ...@@ -142,16 +141,11 @@ static int Open ( vlc_object_t *p_this )
p_sys->i_microsecperframe = 40000; p_sys->i_microsecperframe = 40000;
/* Get the FPS */ /* Get the FPS */
p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); f_fps = var_CreateGetFloat( p_demux, "sub-original-fps" );
if( p_input )
{
f_fps = var_GetFloat( p_input, "sub-original-fps" );
if( f_fps >= 1.0 ) if( f_fps >= 1.0 )
p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps ); p_sys->i_microsecperframe = (int64_t)( (float)1000000 / f_fps );
msg_Dbg( p_demux, "Movie fps: %f", f_fps ); msg_Dbg( p_demux, "Movie fps: %f", f_fps );
vlc_object_release( p_input );
}
/* Check for override of the fps */ /* Check for override of the fps */
f_fps = var_CreateGetFloat( p_demux, "sub-fps" ); f_fps = var_CreateGetFloat( p_demux, "sub-fps" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment