Mercurial > mplayer.hg
changeset 30551:36818ea5ce95
Add header file for sis_init_video_bridge() instead of forward declaring it.
author | diego |
---|---|
date | Tue, 16 Feb 2010 13:10:24 +0000 |
parents | ddab7b946042 |
children | 8d2b4cef28d3 |
files | vidix/sis_bridge.c vidix/sis_bridge.h vidix/sis_vid.c |
diffstat | 3 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/sis_bridge.c Tue Feb 16 13:07:00 2010 +0000 +++ b/vidix/sis_bridge.c Tue Feb 16 13:10:24 2010 +0000 @@ -28,6 +28,7 @@ #include <unistd.h> #include "dha.h" +#include "sis_bridge.h" #include "sis_regs.h" #include "sis_defs.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vidix/sis_bridge.h Tue Feb 16 13:10:24 2010 +0000 @@ -0,0 +1,26 @@ +/* + * VIDIX - VIDeo Interface for *niX. + * + * 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_SIS_BRIDGE_H +#define MPLAYER_SIS_BRIDGE_H + +void sis_init_video_bridge(void); + +#endif /* MPLAYER_SIS_BRIDGE_H */
--- a/vidix/sis_vid.c Tue Feb 16 13:07:00 2010 +0000 +++ b/vidix/sis_vid.c Tue Feb 16 13:10:24 2010 +0000 @@ -37,6 +37,7 @@ #include "pci_ids.h" #include "pci_names.h" +#include "sis_bridge.h" #include "sis_regs.h" #include "sis_defs.h" @@ -167,9 +168,6 @@ /** function declarations **/ -void sis_init_video_bridge(void); - - static void set_overlay(SISOverlayPtr pOverlay, int index); static void close_overlay(void); static void calc_scale_factor(SISOverlayPtr pOverlay,