sync with seife

Origin commit data
------------------
Branch: master
Commit: bb86b78aad
Author: martii <m4rtii@gmx.de>
Date: 2013-06-19 (Wed, 19 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-06-19 12:41:13 +02:00
20 changed files with 129 additions and 34 deletions

View File

@@ -122,6 +122,7 @@ typedef enum
class cVideo : public OpenThreads::Thread
{
friend class GLFramebuffer;
friend class cDemux;
private:
/* called from GL thread */
class SWFramebuffer : public std::vector<unsigned char>
@@ -143,6 +144,7 @@ class cVideo : public OpenThreads::Thread
AVRational mAR;
};
int buf_in, buf_out, buf_num;
int64_t GetPTS(void);
public:
/* constructor & destructor */
cVideo(int mode, void *, void *);