Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-04-27 17:15:29 +01:00
commit f07ab78939
3 files changed
+8 -6

No files matched your search

+5 -5
View File
@@ -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 )
{