Fix load file in order to handle format button

This commit is contained in:
jfmcarreira committed 2015-01-05 23:38:04 +00:00
1 parent 0c4034b629
commit cfe4436ca9
1 file changed
+11 -10
+11 -10
View File
@@ -130,16 +130,7 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
Int InputFormat = -1;
if( !m_pCurrStream )
{
m_pCurrStream = new PlaYUVerStream;
}
else
{
delete m_pCurrStream;
m_pCurrStream = new PlaYUVerStream;
}
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
if( m_pCurrStream->guessFormat( cFilename, Width, Height, InputFormat, FrameRate ) || bForceDialog )
{
@@ -152,6 +143,16 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
QApplication::setOverrideCursor( Qt::WaitCursor );
QApplication::restoreOverrideCursor();
if( !m_pCurrStream )
{
m_pCurrStream = new PlaYUVerStream;
}
else
{
delete m_pCurrStream;
m_pCurrStream = new PlaYUVerStream;
}
m_pCurrStream->open( cFilename, Width, Height, InputFormat, FrameRate );
m_sStreamInfo.m_cFilename = cFilename;