Merge with master

This commit is contained in:
jfmcarreira committed 2014-06-14 21:11:18 +01:00
1 parent 7e92064584
commit 5b7f931b83
4 files changed
+41 -22

No files matched your search

+1 -1
View File
@@ -79,7 +79,7 @@ private:
UInt m_uiHeight;
UInt m_uiFrameRate;
UInt64 m_uiTotalFrameNum;
Int m_iCurrFrameNum;
Int64 m_iCurrFrameNum;
public:
InputStream();