Merge branch 'master' into dev_modules_api

Conflicts:
	source/SubWindowHandle.cpp
	source/SubWindowHandle.h
This commit is contained in:
jfmcarreira committed 2014-03-07 12:25:12 +00:00
commit 06b80cee03
3 files changed
+5 -1

No files matched your search

+1
View File
@@ -74,6 +74,7 @@ public:
Void seekEvent( UInt new_frame_num );
QImage* FrameToQImage( PlaYUVerFrame* curr_frame );
Void refreshFrame();
InputStream* getInputStream()
+2
View File
@@ -66,7 +66,9 @@ plaYUVerApp::plaYUVerApp()
setUnifiedTitleAndToolBarOnMac( true );
playingTimer = new QTimer;
#if( QT_VERSION_PLAYUVER == 5 )
playingTimer->setTimerType( Qt::CoarseTimer );
#endif
connect( playingTimer, SIGNAL( timeout() ), this, SLOT( playEvent() ) );
setAcceptDrops( true );