diff --git a/source/InputStream.cpp b/source/InputStream.cpp index 75e0dd2..07f36d4 100755 --- a/source/InputStream.cpp +++ b/source/InputStream.cpp @@ -130,7 +130,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for m_iPixelFormat = input_format; #ifdef USE_FFMPEG - Bool avStatus = m_cLibAvContext.initAvFormat( filename, width, height ); + Bool avStatus = m_cLibAvContext.initAvFormat( filename, width, height, input_format ); #endif if( m_uiWidth <= 0 || m_uiHeight <= 0 ) diff --git a/source/LibAvContextHandle.cpp b/source/LibAvContextHandle.cpp index e08404c..73e08ed 100755 --- a/source/LibAvContextHandle.cpp +++ b/source/LibAvContextHandle.cpp @@ -82,7 +82,7 @@ Void LibAvContextHandle::closeAvFormat() av_free( video_dst_data[0] ); } -Bool LibAvContextHandle::initAvFormat( QString filename, UInt width, UInt height ) +Bool LibAvContextHandle::initAvFormat( QString filename, UInt& width, UInt& height, Int& pixel_format ) { Bool bRet = true; int ret = 0; diff --git a/source/LibAvContextHandle.h b/source/LibAvContextHandle.h index 7b44c26..b2460b4 100755 --- a/source/LibAvContextHandle.h +++ b/source/LibAvContextHandle.h @@ -46,7 +46,7 @@ namespace plaYUVer class LibAvContextHandle { public: - Bool initAvFormat( QString filename, UInt width, UInt height ); + Bool initAvFormat( QString filename, UInt& width, UInt& height, Int& pixel_format ); Void closeAvFormat(); Bool decodeAvFormat(); diff --git a/source/SubWindowHandle.cpp b/source/SubWindowHandle.cpp index 19ade75..2c5393e 100644 --- a/source/SubWindowHandle.cpp +++ b/source/SubWindowHandle.cpp @@ -73,9 +73,8 @@ bool SubWindowHandle::loadFile( const QString &fileName ) { m_currStream.init( fileName, 0, 0, 0 ); } - QApplication::setOverrideCursor( Qt::WaitCursor ); - + QApplication::restoreOverrideCursor(); if( m_currStream.getStatus() == 0 ) { return false;