sync with seife

Origin commit data
------------------
Branch: master
Commit: 848730507b
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-06 10:16:33 +02:00
11 changed files with 115 additions and 89 deletions

View File

@@ -6,6 +6,7 @@
#include <vector>
#include <linux/dvb/video.h>
#include "../common/cs_types.h"
#include "dmx_lib.h"
extern "C" {
#include <libavutil/rational.h>
}
@@ -147,7 +148,7 @@ class cVideo : public OpenThreads::Thread
int64_t GetPTS(void);
public:
/* constructor & destructor */
cVideo(int mode, void *, void *);
cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void);
void * GetTVEnc() { return NULL; };
@@ -194,6 +195,7 @@ class cVideo : public OpenThreads::Thread
int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { return 0; };
void SetDemux(cDemux *dmx);
bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
SWFramebuffer *getDecBuf(void);
private: