Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.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/FFmpegDecoder.cpp (modified) (13 diffs)

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

@@ -62 +62 @@
         {
             avdevice_register_all();
-        
+
             OSG_NOTICE<<"Attempting to stream "<<filename<<std::endl;
 
@@ -77 +77 @@
             formatParams.width = 640;
             formatParams.height = 480;
-#endif            
+#endif
             formatParams.time_base.num = 1;
             formatParams.time_base.den = 30;
@@ -83 +83 @@
             std::string format = "video4linux2";
             iformat = av_find_input_format(format.c_str());
-            
+
             if (iformat)
             {
@@ -121 +121 @@
                 throw std::runtime_error("av_open_input_file() failed");
         }
-        
+
         m_format_context.reset(p_format_context);
 
@@ -160 +160 @@
         return false;
     }
-    
+
     return true;
 }
@@ -170 +170 @@
     flushAudioQueue();
     flushVideoQueue();
-    
+
     m_audio_decoder.close(waitForThreadToExit);
     m_video_decoder.close(waitForThreadToExit);
@@ -213 +213 @@
 }
 
-void FFmpegDecoder::seek(double time) 
+void FFmpegDecoder::seek(double time)
 {
     m_pending_packet.clear();
@@ -222 +222 @@
 }
 
-void FFmpegDecoder::pause() 
+void FFmpegDecoder::pause()
 {
     m_pending_packet.clear();
@@ -318 +318 @@
                 throw std::runtime_error("av_dup_packet() failed");
 
-            m_pending_packet = FFmpegPacket(packet);            
+            m_pending_packet = FFmpegPacket(packet);
         }
     }
@@ -360 +360 @@
     return false;
 }
-    
+
 
 
@@ -389 +389 @@
 }
 
-bool FFmpegDecoder::readNextPacketSeeking() 
+bool FFmpegDecoder::readNextPacketSeeking()
 {
     const FFmpegPacket packet(FFmpegPacket::PACKET_FLUSH);
@@ -396 +396 @@
         m_state = NORMAL;
 
-    return false;    
+    return false;
 }
 
@@ -412 +412 @@
 
     m_clocks.seek(time);
-    m_state = SEEKING;    
+    m_state = SEEKING;
 }