diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix/mach64_vid.c | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix/mach64_vid.c')
| -rw-r--r-- | vidix/mach64_vid.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index 1c7935a35a..0163deb4c3 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -476,7 +476,6 @@ static int mach64_init(void) printf("[mach64] Driver was not probed but is being initializing\n"); return EINTR; } - if(verbosity > 0) printf("[mach64] version %d\n", VIDIX_VERSION); if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM; mach64_wait_for_idle(); |