# HG changeset patch
# User ben
# Date 1213992994 0
# Node ID df448e1248b24258bb946e80858ccd31ff8e5921
# Parent  7f6bec0700aaedb7d8e1fcb782ad1be80de0a95d
remove now useless vidixlib.h file

diff -r 7f6bec0700aa -r df448e1248b2 libvo/vo_cvidix.c
--- a/libvo/vo_cvidix.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/libvo/vo_cvidix.c	Fri Jun 20 20:16:34 2008 +0000
@@ -23,7 +23,7 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 
 static const vo_info_t info = {
diff -r 7f6bec0700aa -r df448e1248b2 libvo/vo_winvidix.c
--- a/libvo/vo_winvidix.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/libvo/vo_winvidix.c	Fri Jun 20 20:16:34 2008 +0000
@@ -25,7 +25,7 @@
 #include "mp_fifo.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 
 static const vo_info_t info = 
diff -r 7f6bec0700aa -r df448e1248b2 libvo/vo_xvidix.c
--- a/libvo/vo_xvidix.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/libvo/vo_xvidix.c	Fri Jun 20 20:16:34 2008 +0000
@@ -31,7 +31,7 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 
 #ifdef HAVE_NEW_GUI
 #include "gui/interface.h"
diff -r 7f6bec0700aa -r df448e1248b2 libvo/vosub_vidix.c
--- a/libvo/vosub_vidix.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/libvo/vosub_vidix.c	Fri Jun 20 20:16:34 2008 +0000
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "vidix/vidixlib.h"
+#include "vidix/vidix.h"
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/cyberblade_vid.c
--- a/vidix/cyberblade_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/cyberblade_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -40,7 +40,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/drivers.c
--- a/vidix/drivers.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/drivers.c	Fri Jun 20 20:16:34 2008 +0000
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "vidixlib.h"
+#include "vidix.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "config.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/drivers.h
--- a/vidix/drivers.h	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/drivers.h	Fri Jun 20 20:16:34 2008 +0000
@@ -22,7 +22,7 @@
 #ifndef MPLAYER_DRIVERS_H
 #define MPLAYER_DRIVERS_H
 
-#include "vidixlib.h"
+#include "vidix.h"
 
 void vidix_register_all_drivers (void);
 
diff -r 7f6bec0700aa -r df448e1248b2 vidix/ivtv_vid.c
--- a/vidix/ivtv_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/ivtv_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -39,7 +39,6 @@
 #include <linux/fb.h>
 
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/mach64_vid.c
--- a/vidix/mach64_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/mach64_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -34,7 +34,6 @@
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/mga_vid.c
--- a/vidix/mga_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/mga_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -54,7 +54,6 @@
 #include <inttypes.h>
 
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/nvidia_vid.c
--- a/vidix/nvidia_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/nvidia_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -33,7 +33,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/pm2_vid.c
--- a/vidix/pm2_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/pm2_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/pm3_vid.c
--- a/vidix/pm3_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/pm3_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -28,7 +28,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/radeon_vid.c
--- a/vidix/radeon_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/radeon_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -37,7 +37,6 @@
 #include "pci_ids.h"
 #include "pci_names.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "radeon.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/s3_vid.c
--- a/vidix/s3_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/s3_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -32,7 +32,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/sis_vid.c
--- a/vidix/sis_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/sis_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -32,7 +32,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/unichrome_vid.c
--- a/vidix/unichrome_vid.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/unichrome_vid.c	Fri Jun 20 20:16:34 2008 +0000
@@ -32,7 +32,6 @@
 
 #include "config.h"
 #include "vidix.h"
-#include "vidixlib.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/vidixlib.c
--- a/vidix/vidixlib.c	Fri Jun 20 20:11:57 2008 +0000
+++ b/vidix/vidixlib.c	Fri Jun 20 20:16:34 2008 +0000
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "vidixlib.h"
+#include "vidix.h"
 #include "drivers.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
diff -r 7f6bec0700aa -r df448e1248b2 vidix/vidixlib.h
--- a/vidix/vidixlib.h	Fri Jun 20 20:11:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * VIDIX - VIDeo Interface for *niX.
- *
- * This interface is introduced as universal one to MPEG decoder,
- * Back End Scaler (BES) and YUV2RGB hw accelerators.
- *
- * In the future it may be expanded up to capturing and audio things.
- * Main goal of this this interface imlpementation is providing DGA
- * everywhere where it's possible (unlike X11 and other).
- *
- * This interface is based on v4l2, fbvid.h, mga_vid.h projects
- * and personally my ideas.
- *
- * NOTE: This interface is introduced as driver interface.
- *
- * Copyright (C) 2002 Nick Kurshev
- * Copyright (C) 2007 Benjamin Zores <ben@geexbox.org>
- *
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_VIDIXLIB_H
-#define MPLAYER_VIDIXLIB_H
-
-#include "vidix.h"
-
-#endif /* MPLAYER_VIDIXLIB_H */