Merge branch 'remove_old_demuxers'

The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.

Conflicts:
	stream/stream.c

1 files changed, 1 insertions, 0 deletions

diff --git a/stream/dvbin.h b/stream/dvbin.h
index 8f7ff28d40..ccaf0db66c 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -76,6 +76,7 @@ typedef struct {
 } dvb_config_t;
 
 typedef struct {
+        int fd;
 	int card;
 	int fe_fd;
 	int sec_fd;