Merge branch 'master' into dev_properties_side_bar

This commit is contained in:
jfmcarreira committed 2014-03-28 23:55:08 +00:00
commit 96fb5fc036
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -185,7 +185,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
m_uiTotalFrameNum = ftell( m_pFile ) / ( frame_bytes_input );
fseek( m_pFile, 0, SEEK_SET );
m_cFormatName = QString::fromUtf8("rawvideo ");
m_cFormatName = QString::fromUtf8("Raw Video");
}
if( !getMem1D<Pel>( &m_pInputBuffer, m_pcCurrFrame->getBytesPerFrame() ) )
@@ -196,7 +196,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
m_cStreamInformationString = QString( "[" );
m_cStreamInformationString.append( m_cFormatName );
m_cStreamInformationString.append( QString("/ "));
m_cStreamInformationString.append( QString(" / "));
m_cStreamInformationString.append( PlaYUVerFrame::supportedPixelFormatList().at( m_iPixelFormat ) );
m_cStreamInformationString.append( "] " );
m_cStreamInformationString.append( QFileInfo( m_cFilename ).fileName() );
+1 -1
View File
@@ -153,7 +153,7 @@ Bool LibAvContextHandle::initAvFormat( char* filename, UInt& width, UInt& height
const char *codec_name = avcodec_get_name(video_dec_ctx->codec_id);
sprintf(m_acCodecName, "%s ", codec_name);
sprintf(m_acCodecName, "%s", codec_name);
Double fr = 30;
if( video_stream->avg_frame_rate.den && video_stream->avg_frame_rate.num )