Remove wrong parent definition in ConfigureFormatDialog
This commit is contained in:
1 parent
47c29306dc
commit
d1c771daf0
2 files changed
+6
-5
No files matched your search
@@ -75,7 +75,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
|||||||
verticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
verticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
||||||
MainLayout->addItem( verticalSpacer );
|
MainLayout->addItem( verticalSpacer );
|
||||||
|
|
||||||
standardResolutionLayout = new QHBoxLayout( this );
|
standardResolutionLayout = new QHBoxLayout();
|
||||||
standardResolutionLayout->setObjectName( QStringLiteral( "standardResolutionLayout" ) );
|
standardResolutionLayout->setObjectName( QStringLiteral( "standardResolutionLayout" ) );
|
||||||
standardResolutionLabel = new QLabel();
|
standardResolutionLabel = new QLabel();
|
||||||
standardResolutionLabel->setObjectName( QStringLiteral( "standardResolutionLabel" ) );
|
standardResolutionLabel->setObjectName( QStringLiteral( "standardResolutionLabel" ) );
|
||||||
@@ -107,7 +107,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
|||||||
resolutionGridVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
resolutionGridVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
||||||
MainLayout->addItem( resolutionGridVerticalSpacer );
|
MainLayout->addItem( resolutionGridVerticalSpacer );
|
||||||
|
|
||||||
resolutionGrid = new QGridLayout( this );
|
resolutionGrid = new QGridLayout();
|
||||||
resolutionGrid->setObjectName( QStringLiteral( "resolutionGrid" ) );
|
resolutionGrid->setObjectName( QStringLiteral( "resolutionGrid" ) );
|
||||||
|
|
||||||
resolutionLabel = new QLabel();
|
resolutionLabel = new QLabel();
|
||||||
@@ -150,7 +150,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
|||||||
pixelFormatVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
pixelFormatVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
||||||
MainLayout->addItem( pixelFormatVerticalSpacer );
|
MainLayout->addItem( pixelFormatVerticalSpacer );
|
||||||
|
|
||||||
pixelFormatLayout = new QHBoxLayout( this );
|
pixelFormatLayout = new QHBoxLayout();
|
||||||
pixelFormatLayout->setObjectName( QStringLiteral( "pixelFormatLayout" ) );
|
pixelFormatLayout->setObjectName( QStringLiteral( "pixelFormatLayout" ) );
|
||||||
|
|
||||||
pixelFormatLabel = new QLabel();
|
pixelFormatLabel = new QLabel();
|
||||||
@@ -182,7 +182,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
|||||||
framerateFormatVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
framerateFormatVerticalSpacer = new QSpacerItem( 10, 20, QSizePolicy::Minimum );
|
||||||
MainLayout->addItem( framerateFormatVerticalSpacer );
|
MainLayout->addItem( framerateFormatVerticalSpacer );
|
||||||
|
|
||||||
framerateFormatLayout = new QHBoxLayout( this );
|
framerateFormatLayout = new QHBoxLayout();
|
||||||
framerateFormatLayout->setObjectName( QStringLiteral( "framerateFormatLayout" ) );
|
framerateFormatLayout->setObjectName( QStringLiteral( "framerateFormatLayout" ) );
|
||||||
|
|
||||||
framerateFormatLabel = new QLabel();
|
framerateFormatLabel = new QLabel();
|
||||||
@@ -207,7 +207,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
|||||||
verticalSpacerConfirmation = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
verticalSpacerConfirmation = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
|
||||||
MainLayout->addItem( verticalSpacerConfirmation );
|
MainLayout->addItem( verticalSpacerConfirmation );
|
||||||
|
|
||||||
dialogButtonOkCancel = new QDialogButtonBox( this );
|
dialogButtonOkCancel = new QDialogButtonBox();
|
||||||
dialogButtonOkCancel->setObjectName( QString::fromUtf8( "dialogButtonBox" ) );
|
dialogButtonOkCancel->setObjectName( QString::fromUtf8( "dialogButtonBox" ) );
|
||||||
dialogButtonOkCancel->setStandardButtons( QDialogButtonBox::Cancel | QDialogButtonBox::Ok );
|
dialogButtonOkCancel->setStandardButtons( QDialogButtonBox::Cancel | QDialogButtonBox::Ok );
|
||||||
dialogButtonOkCancel->setCenterButtons( false );
|
dialogButtonOkCancel->setCenterButtons( false );
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
|
|||||||
|
|
||||||
#ifdef USE_FFMPEG
|
#ifdef USE_FFMPEG
|
||||||
avStatus = m_cLibAvContext.initAvFormat( filename.toLocal8Bit().data(), m_uiWidth, m_uiHeight, m_iPixelFormat, m_uiFrameRate );
|
avStatus = m_cLibAvContext.initAvFormat( filename.toLocal8Bit().data(), m_uiWidth, m_uiHeight, m_iPixelFormat, m_uiFrameRate );
|
||||||
|
m_uiTotalFrameNum = 100;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( m_uiWidth <= 0 || m_uiHeight <= 0 )
|
if( m_uiWidth <= 0 || m_uiHeight <= 0 )
|
||||||
|
|||||||
Reference in new issue
Block a user