Merge branch 'master' into devel

This commit is contained in:
2015-02-02 16:04:40 +00:00
+1 -1
View File
@@ -569,7 +569,7 @@ Void VideoSubWindow::updatePixelValueStatusBar( const QPoint& pos )
Int ColorSpace = m_pcCurrFrame->getColorSpace();
if( ColorSpace == PlaYUVerFrame::COLOR_GRAY )
{
sPixelValue = m_pcCurrFrame->getPixelValue( pos.x(), pos.y(), PlaYUVerFrame::COLOR_YUV );
sPixelValue = m_pcCurrFrame->getPixelValue( pos.x(), pos.y(), PlaYUVerFrame::COLOR_GRAY );
strStatus.append( QString( "Y: %1" ).arg( sPixelValue.Y() ) );
}
if( ColorSpace == PlaYUVerFrame::COLOR_YUV )