[vlc-commits] src: use CLOCK_FREQ

Ilkka Ollakka git at videolan.org
Tue Jul 15 15:09:30 CEST 2014


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Thu May  1 22:05:00 2014 +0300| [78db874b43077654309f32c63922958ecf43ff3e] | committer: Ilkka Ollakka

src: use CLOCK_FREQ

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

 src/input/input.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index a51d3a2..be6780e 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -429,7 +429,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
                      else if( !strncmp( psz_start, "time=", 5 ) )
                      {
                          p_seekpoint->i_time_offset = atoll(psz_start + 5) *
-                                                        1000000;
+                                                        CLOCK_FREQ;
                      }
                      psz_start = psz_end + 1;
                 }
@@ -801,7 +801,7 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
             if( i_statistic_update < i_current )
             {
                 MainLoopStatistic( p_input );
-                i_statistic_update = i_current + INT64_C(1000000);
+                i_statistic_update = i_current + CLOCK_FREQ;
             }
 
             /* Update the wakeup time */
@@ -939,7 +939,7 @@ static void StartTitle( input_thread_t * p_input )
         vlc_value_t s;
 
         msg_Dbg( p_input, "starting at time: %ds",
-                 (int)( p_input->p->i_start / INT64_C(1000000) ) );
+                 (int)( p_input->p->i_start / CLOCK_FREQ ) );
 
         s.i_time = p_input->p->i_start;
         input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
@@ -975,7 +975,7 @@ static void LoadSubtitles( input_thread_t *p_input )
 
     const int i_delay = var_CreateGetInteger( p_input, "sub-delay" );
     if( i_delay != 0 )
-        var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
+        var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * CLOCK_FREQ );
 
     /* Look for and add subtitle files */
     unsigned i_flags = SUB_FORCED;



More information about the vlc-commits mailing list