Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: cde83d893d
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-05-25 12:38:21 +02:00
10 changed files with 215 additions and 28 deletions

View File

@@ -8,6 +8,8 @@
#include <linux/dvb/dmx.h>
#include "../common/cs_types.h"
#define MAX_DMX_UNITS 4
typedef enum
{
DMX_INVALID = 0,