Merge branch 'jc-dev' with OpenCV function into branch 'dev_MultiFrameModules'

This commit is contained in:
jfmcarreira committed 2014-05-17 14:41:40 +01:00
commit 1fcd74de72
3 files changed
+81 -13

No files matched your search

-9
View File
@@ -387,15 +387,6 @@ PlaYUVerFrame* InputStream::getCurrFrame()
return m_pcCurrFrame;
}
#ifdef USE_OPENCV
cv::Mat InputStream::getFrameCvMat()
{
cv::Mat cvMat( m_uiHeight, m_uiWidth, CV_8UC3 );
return cvMat;
}
#endif
Void InputStream::seekInput( UInt64 new_frame_num )
{
if( !m_pFile )