Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.cpp

@@ -61 +61 @@
     m_pause_time = 0;
     m_seek_time = 0;
-    
+
     m_audio_buffer_end_pts = start_time;
     m_audio_timer.setStartTick();
@@ -85 +85 @@
     m_pause_time = 0;
     m_seek_time = 0;
-    
+
     m_audio_buffer_end_pts = m_start_time;
     m_audio_timer.setStartTick();
@@ -95 +95 @@
         return;
 
-    m_video_clock = m_start_time;    
+    m_video_clock = m_start_time;
 }
 
@@ -101 +101 @@
 {
     ScopedLock lock(m_mutex);
-    
+
     m_video_clock = seek_time;
     m_last_frame_delay = 0.040;
@@ -184 +184 @@
 
     // If incorrect delay, use previous one
-    
+
     if (delay <= 0.0 || delay >= 1.0)
     {
@@ -190 +190 @@
         if(!m_audio_disabled) m_frame_time = pts - delay;
     }
-    
+
 
     // Save for next time
@@ -250 +250 @@
     if(!m_paused)
         m_last_current_time = getAudioTime();
-    
-    return m_last_current_time;  
+
+    return m_last_current_time;
 }