Merge branch 'master' into featureSession
Conflicts: app/plaYUVerApp.h
This commit is contained in:
commit
88c9e4ed5f
3 files changed
+14
-11
No files matched your search
+1
-1
@@ -53,7 +53,7 @@ Q_OBJECT
|
||||
public:
|
||||
plaYUVerApp();
|
||||
Void parseArgs( Int argc, Char *argv[] );
|
||||
Void loadFile( QString fileName, PlaYUVerStreamInfo* streamInfo = NULL );
|
||||
Void loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo = NULL );
|
||||
|
||||
protected:
|
||||
Void closeEvent( QCloseEvent *event );
|
||||
|
||||
Reference in new issue
Block a user