Merge branch 'master' into devel
This commit is contained in:
commit
f07ab78939
3 files changed
+8
-6
No files matched your search
@@ -236,11 +236,11 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
|
||||
{
|
||||
m_pCurrStream = new PlaYUVerStream;
|
||||
}
|
||||
else
|
||||
{
|
||||
delete m_pCurrStream;
|
||||
m_pCurrStream = new PlaYUVerStream;
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// delete m_pCurrStream;
|
||||
// m_pCurrStream = new PlaYUVerStream;
|
||||
// }
|
||||
|
||||
if( guessFormat( cFilename, Width, Height, InputFormat, FrameRate ) || bForceDialog )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user