Merge branch 'master' into featurePelFormatsApi

Conflicts:
	source/app/ViewArea.cpp
	source/lib/PlaYUVerFrame.cpp
This commit is contained in:
jfmcarreira committed 2014-11-05 23:35:17 +00:00
commit d5766d1ec1
3 files changed
+36 -24

No files matched your search

+2 -2
View File
@@ -390,12 +390,12 @@ Void PlaYUVerFrame::FrametoRGB8()
for( UInt y = 0; y < m_uiHeight; y++ )
for( UInt x = 0; x < m_uiWidth; x++ )
{
iY = *pInputPelY++;
//yuvToRgb( iY, iY, iY, iR, iG, iB );
iY = *pInputPelY;
iR = iG = iB = iY;
*pcRGBPelInterlaced++ = iR;
*pcRGBPelInterlaced++ = iG;
*pcRGBPelInterlaced++ = iB;
pInputPelY++;
}
break;
case RGB8: