From b20380781875b603bf84efb161ecdbf8cbd3c950 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 6 Sep 2008 14:49:19 +0200
Subject: [PATCH] Removed unneeded include files <linux/dvb/dmx.h> und <time.h>
 from remux.h

---
 CONTRIBUTORS | 1 +
 HISTORY      | 4 ++++
 remux.h      | 4 +---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea685058..acab6b22 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2126,6 +2126,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for making the non-breaking space symbol be rendered as a blank
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
+ for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
diff --git a/HISTORY b/HISTORY
index f25deb8a..0994e1b0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5811,6 +5811,8 @@ Video Disk Recorder Revision History
 - Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried Köhler).
 - Errors in config files no longer keep VDR from starting.
+- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+  (reported by Tobias Grimm).
 
 2008-09-06: Version 1.6.0-2
 
@@ -5827,3 +5829,5 @@ Video Disk Recorder Revision History
   to Udo Richter).
 - Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried Köhler).
+- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+  (reported by Tobias Grimm).
diff --git a/remux.h b/remux.h
index 2f6d7d31..fe792ebf 100644
--- a/remux.h
+++ b/remux.h
@@ -4,14 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.1 2008/08/15 14:09:16 kls Exp $
+ * $Id: remux.h 2.2 2008/09/06 14:48:28 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
-#include <linux/dvb/dmx.h>
 #include "channels.h"
 #include "ringbuffer.h"
 #include "tools.h"