Merge branch 'master' of https://github.com/pixlra/playuver
This commit is contained in:
commit
21a628b66d
2 files changed
+7
-5
No files matched your search
@@ -415,11 +415,11 @@ Void VideoSubWindow::updateVideoWindowInfo()
|
||||
QString m_cCodedName = QString::fromStdString( m_pCurrStream->getCodecName() );
|
||||
m_cStreamInformation = m_cFormatName + " | " + m_cCodedName;
|
||||
}
|
||||
// if( m_pcCurrFrame )
|
||||
// {
|
||||
// QString m_cPelFmtName = QString::fromStdString( m_pcCurrFrame->getPelFmtName() );
|
||||
// m_cStreamInformation += " | " + m_cPelFmtName;
|
||||
// }
|
||||
if( m_pcCurrFrame )
|
||||
{
|
||||
QString m_cPelFmtName = QString::fromStdString( m_pcCurrFrame->getPelFmtName() );
|
||||
m_cStreamInformation += " | " + m_cPelFmtName;
|
||||
}
|
||||
if( m_cStreamInformation.isEmpty() )
|
||||
{
|
||||
m_cStreamInformation = " ";
|
||||
|
||||
@@ -51,6 +51,8 @@ Bool FrameShift::create( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
m_pcProcessedFrame = NULL;
|
||||
m_pcProcessedFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), apcFrameList[0]->getPelFormat(),
|
||||
apcFrameList[0]->getBitsPel() );
|
||||
|
||||
m_iShiftHor = ( ( m_iShiftHor + 1 ) >> 1 ) << 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user