Merge remote-tracking branch 'tangocash/master'

Origin commit data
------------------
Branch: master
Commit: 754e529714
Author: max_10 <max_10@gmx.de>
Date: 2017-10-06 (Fri, 06 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-10-06 22:38:51 +02:00
2 changed files with 6 additions and 6 deletions

View File

@@ -158,14 +158,14 @@ class cVideo
int64_t GetPTS(void);
int brightness, contrast, saturation, hue;
void openDevice(void);
void closeDevice(void);
public:
/* constructor & destructor */
cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void);
void openDevice(void);
void closeDevice(void);
void * GetTVEnc() { return NULL; };
void * GetTVEncSD() { return NULL; };