summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-07 10:56:42 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-07 10:56:42 +0000
commitb7391dde399cd8a9557b7939a6965219ab4d3df2 (patch)
tree4cb099396e4b2cafdb9c58be6f916f06e4633133
parentde97a24d3fe00c9fef912f275b357a61a02b7396 (diff)
downloadmpv-b7391dde399cd8a9557b7939a6965219ab4d3df2.tar.bz2
mpv-b7391dde399cd8a9557b7939a6965219ab4d3df2.tar.xz
Drop some useless parameter from vidix init routine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vosub_vidix.c6
-rw-r--r--vidix/vidixlib.c2
-rw-r--r--vidix/vidixlib.h2
3 files changed, 4 insertions, 6 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 2b50e1c9da..6451bb5806 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -645,13 +645,11 @@ int vidix_preinit(const char *drvname,vo_functions_t *server)
return -1;
}
#ifndef __MINGW32__
- vidix_handler = vdlOpen(NULL,
- drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
+ vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
TYPE_OUTPUT,
verbose);
#else
- vidix_handler = vdlOpen(get_path("vidix/"),
- drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
+ vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
TYPE_OUTPUT,
verbose);
#endif
diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c
index c1758c7597..9f22aec849 100644
--- a/vidix/vidixlib.c
+++ b/vidix/vidixlib.c
@@ -49,7 +49,7 @@ 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;
diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h
index f75fc8b287..b0e3f7de96 100644
--- a/vidix/vidixlib.h
+++ b/vidix/vidixlib.h
@@ -85,7 +85,7 @@ unsigned vdlGetVersion( void );
verbose - specifies verbose level
returns !0 if ok else NULL.
*/
-VDL_HANDLE vdlOpen(const char *path,const char *name,unsigned cap,int verbose);
+VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose);
/* Closes stream and corresponded driver. */
void vdlClose(VDL_HANDLE ctx);