diff options
-rw-r--r-- | libvo/vo_cvidix.c | 2 | ||||
-rw-r--r-- | libvo/vo_winvidix.c | 2 | ||||
-rw-r--r-- | libvo/vo_xvidix.c | 2 | ||||
-rw-r--r-- | libvo/vosub_vidix.c | 2 | ||||
-rw-r--r-- | vidix/cyberblade_vid.c | 1 | ||||
-rw-r--r-- | vidix/drivers.c | 2 | ||||
-rw-r--r-- | vidix/drivers.h | 2 | ||||
-rw-r--r-- | vidix/ivtv_vid.c | 1 | ||||
-rw-r--r-- | vidix/mach64_vid.c | 1 | ||||
-rw-r--r-- | vidix/mga_vid.c | 1 | ||||
-rw-r--r-- | vidix/nvidia_vid.c | 1 | ||||
-rw-r--r-- | vidix/pm2_vid.c | 1 | ||||
-rw-r--r-- | vidix/pm3_vid.c | 1 | ||||
-rw-r--r-- | vidix/radeon_vid.c | 1 | ||||
-rw-r--r-- | vidix/s3_vid.c | 1 | ||||
-rw-r--r-- | vidix/sis_vid.c | 1 | ||||
-rw-r--r-- | vidix/unichrome_vid.c | 1 | ||||
-rw-r--r-- | vidix/vidixlib.c | 2 | ||||
-rw-r--r-- | vidix/vidixlib.h | 41 |
19 files changed, 7 insertions, 59 deletions
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index 0192b20264..0f7de905dc 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -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 --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index eb42f3d476..b03b1b2ded 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -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 --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index f330eb9521..c56e52d4cf 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -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 --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 4bebbb0000..fec1d9ce32 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -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 --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c index 5a323dd163..558d915acb 100644 --- a/vidix/cyberblade_vid.c +++ b/vidix/cyberblade_vid.c @@ -40,7 +40,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/drivers.c b/vidix/drivers.c index cf26cf94dc..483428ff3b 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -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 --git a/vidix/drivers.h b/vidix/drivers.h index 1dbe0b8417..157f918c4b 100644 --- a/vidix/drivers.h +++ b/vidix/drivers.h @@ -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 --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c index ca2d4aa046..15bf38d85c 100644 --- a/vidix/ivtv_vid.c +++ b/vidix/ivtv_vid.c @@ -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 --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index 0163deb4c3..dd6084d126 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -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 --git a/vidix/mga_vid.c b/vidix/mga_vid.c index b6504fa5df..fd414fa3bb 100644 --- a/vidix/mga_vid.c +++ b/vidix/mga_vid.c @@ -54,7 +54,6 @@ #include <inttypes.h> #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c index a895a084c8..c53fa93d64 100644 --- a/vidix/nvidia_vid.c +++ b/vidix/nvidia_vid.c @@ -33,7 +33,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/pm2_vid.c b/vidix/pm2_vid.c index a1058d6882..748a9fd884 100644 --- a/vidix/pm2_vid.c +++ b/vidix/pm2_vid.c @@ -29,7 +29,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c index 0ee01e0734..25b0a60988 100644 --- a/vidix/pm3_vid.c +++ b/vidix/pm3_vid.c @@ -28,7 +28,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index 5088a987fd..b72391b51d 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -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 --git a/vidix/s3_vid.c b/vidix/s3_vid.c index 98904cedd8..cecd39d955 100644 --- a/vidix/s3_vid.c +++ b/vidix/s3_vid.c @@ -32,7 +32,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c index 57e934c017..1028a6c5db 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -32,7 +32,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c index 15b86fc662..796b7e5885 100644 --- a/vidix/unichrome_vid.c +++ b/vidix/unichrome_vid.c @@ -32,7 +32,6 @@ #include "config.h" #include "vidix.h" -#include "vidixlib.h" #include "fourcc.h" #include "dha.h" #include "pci_ids.h" diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c index 78dc703e77..945318a804 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -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 --git a/vidix/vidixlib.h b/vidix/vidixlib.h deleted file mode 100644 index a02f9b1fb2..0000000000 --- a/vidix/vidixlib.h +++ /dev/null @@ -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 */ |