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/vidixlib.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/vidixlib.c')
| -rw-r--r-- | vidix/vidixlib.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c index c1758c7597..78dc703e77 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -44,12 +44,7 @@ #include "libavutil/common.h" #include "mpbswap.h" -extern unsigned int vdlGetVersion( void ) -{ - return VIDIX_VERSION; -} - -VDL_HANDLE vdlOpen(const char *path,const char *name,unsigned cap,int verbose) +VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose) { VDXContext *ctx; |