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.h | |
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.h')
-rw-r--r-- | vidix/vidixlib.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index f75fc8b287..08ca9639da 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_VIDIXLIB_H #define MPLAYER_VIDIXLIB_H -#ifdef __cplusplus -extern "C" { -#endif - #include "vidix.h" typedef struct VDXDriver { @@ -74,9 +70,6 @@ typedef struct VDXContext { typedef VDXContext * VDL_HANDLE; - /* returns library version */ -unsigned vdlGetVersion( void ); - /* Opens corresponded video driver and returns handle of associated stream. path - specifies path where drivers are located. @@ -85,7 +78,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); @@ -138,8 +131,4 @@ int vdlSetOemEffect(VDL_HANDLE, const vidix_oem_fx_t * ); /* Returns 0 if ok else errno */ int vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * ); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIXLIB_H */ |