Merge devel into master

This commit is contained in:
jfmcarreira committed 2014-06-15 13:07:15 +01:00
1 parent 7a5a965a29
commit b02072c585
13 files changed
+310 -87

No files matched your search

+3
View File
@@ -48,6 +48,7 @@ class InputStream
private:
Bool m_bInit;
Bool m_bLoadAll;
Int m_iErrorStatus;
#ifdef USE_FFMPEG
@@ -109,6 +110,8 @@ public:
Bool guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rFrameRate );
Void getFormat( UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rFrameRate );
Void loadAll();
Void readNextFrame();
Bool writeFrame( const QString& filename );