Merge changes.

6 files changed, 38 insertions, 8 deletions

diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 3ba75644e..5722a536f 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: input_vdr.c,v 1.51 2003/05/02 15:02:11 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/vdr/input_vdr.h b/src/vdr/input_vdr.h
index a6bb6791f..41c96d741 100644
--- a/src/vdr/input_vdr.h
+++ b/src/vdr/input_vdr.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
 
 #ifndef __INPUT_VDR_H
 #define __INPUT_VDR_H
diff --git a/src/vdr/post_vdr.c b/src/vdr/post_vdr.c
index 7e01854e0..58386d344 100644
--- a/src/vdr/post_vdr.c
+++ b/src/vdr/post_vdr.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
  */
  
 /*
diff --git a/src/vdr/post_vdr.h b/src/vdr/post_vdr.h
index 7684727eb..b16a2d2df 100644
--- a/src/vdr/post_vdr.h
+++ b/src/vdr/post_vdr.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
 
 #ifndef __POST_VDR_H
 #define __POST_VDR_H
diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c
index ddac6c3da..9248e9c45 100644
--- a/src/vdr/post_vdr_audio.c
+++ b/src/vdr/post_vdr_audio.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
  */
  
 /*
diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c
index 949af5716..85536819a 100644
--- a/src/vdr/post_vdr_video.c
+++ b/src/vdr/post_vdr_video.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
  */
  
 /*