Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 2bdab523e5
Author: martii <you@example.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-08-16 22:05:33 +02:00
13 changed files with 59 additions and 12 deletions

View File

@@ -2,6 +2,7 @@
#define _VIDEO_TD_H
#include <linux/dvb/video.h>
#include "../common/cs_types.h"
typedef enum {
ANALOG_SD_RGB_CINCH = 0x00,
@@ -169,7 +170,6 @@ class cVideo
/* set video_system */
int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE mode);
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; };