diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /vidix/sis_vid.c | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'vidix/sis_vid.c')
| -rw-r--r-- | vidix/sis_vid.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c index 0f5960cf54..4d82755bdf 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -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 @@ static unsigned short sis_card_ids[] = { /** 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, |