Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.cpp

    r12292 r13041  
    6161    m_pause_time = 0; 
    6262    m_seek_time = 0; 
    63      
     63 
    6464    m_audio_buffer_end_pts = start_time; 
    6565    m_audio_timer.setStartTick(); 
     
    8585    m_pause_time = 0; 
    8686    m_seek_time = 0; 
    87      
     87 
    8888    m_audio_buffer_end_pts = m_start_time; 
    8989    m_audio_timer.setStartTick(); 
     
    9595        return; 
    9696 
    97     m_video_clock = m_start_time;     
     97    m_video_clock = m_start_time; 
    9898} 
    9999 
     
    101101{ 
    102102    ScopedLock lock(m_mutex); 
    103      
     103 
    104104    m_video_clock = seek_time; 
    105105    m_last_frame_delay = 0.040; 
     
    184184 
    185185    // If incorrect delay, use previous one 
    186      
     186 
    187187    if (delay <= 0.0 || delay >= 1.0) 
    188188    { 
     
    190190        if(!m_audio_disabled) m_frame_time = pts - delay; 
    191191    } 
    192      
     192 
    193193 
    194194    // Save for next time 
     
    250250    if(!m_paused) 
    251251        m_last_current_time = getAudioTime(); 
    252      
    253     return m_last_current_time;   
     252 
     253    return m_last_current_time; 
    254254} 
    255255