Corrected screwed up merge, removed debug

src/Workflow/MainWorkflow.cpp

@@ -228,16 +228,13 @@ MainWorkflow::OutputBuffers*  MainWorkflow::getSynchroneOutput( MainWorkflow::Tr
 //    qDebug() << "Waiting for sync output";
     m_synchroneRenderWaitCondition->wait( m_synchroneRenderWaitConditionMutex );
 //    qDebug() << "Got it";
-    m_effectEngine->render();
-    if ( m_effectEngine->getOutputFrame( 0 )->nboctets == 0 )
-        m_outputBuffers->video = MainWorkflow::blackOutput;
-    else
-        m_outputBuffers->video = &( m_effectEngine->getOutputFrame( 0 ) );
-
     if ( trackType == BothTrackType || trackType == VideoTrack )
     {
         m_effectEngine->render();
-        m_outputBuffers->video = &( m_effectEngine->getOutputFrame( 0 ) );
+        if ( m_effectEngine->getOutputFrame( 0 )->nboctets == 0 )
+            m_outputBuffers->video = MainWorkflow::blackOutput;
+        else
+            m_outputBuffers->video = &( m_effectEngine->getOutputFrame( 0 ) );
     }
     if ( trackType == BothTrackType || trackType == AudioTrack )
         m_outputBuffers->audio = m_tracks[MainWorkflow::AudioTrack]->getTmpAudioBuffer();

src/Workflow/VideoClipWorkflow.cpp

@@ -97,7 +97,6 @@ void*    VideoClipWorkflow::getOutput()
 
 void    VideoClipWorkflow::lock( VideoClipWorkflow* cw, void** pp_ret, int size )
 {
-    qDebug() << "Outputing video buffers. Size:" << size;
     Q_UNUSED( size );
     cw->m_renderLock->lock();
     *pp_ret = (*(cw->m_buffer))->frame.pixels;
@@ -105,7 +104,6 @@ void    VideoClipWorkflow::lock( VideoClipWorkflow* cw, void** pp_ret, int size
 
 void    VideoClipWorkflow::unlock( VideoClipWorkflow* cw, void* buffer, int width, int height, int bpp, int size )
 {
-    qDebug() << "size on unlock:" << size;
     Q_UNUSED( buffer );
     Q_UNUSED( width );
     Q_UNUSED( height );