summaryrefslogtreecommitdiffstats
path: root/libvo/vo_x11.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-11 15:22:10 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-11 15:22:10 +0000
commit6811f963587915918875b21b93927784a8680dc9 (patch)
treedc0d9fd36677fbf99fe15ebc73dc313eec47b610 /libvo/vo_x11.c
parent35dc94a7925de590af7e5db55e3b07becfbbe049 (diff)
downloadmpv-6811f963587915918875b21b93927784a8680dc9.tar.bz2
mpv-6811f963587915918875b21b93927784a8680dc9.tar.xz
removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r--libvo/vo_x11.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 2ef8a871e7..a5e0dc311e 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -8,7 +8,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN( x11 )
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -33,7 +32,7 @@ LIBVO_EXTERN( x11 )
#include "../mplayer.h"
#endif
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11 ( XImage/Shm )",
"x11",
@@ -41,6 +40,8 @@ static vo_info_t vo_info =
""
};
+LIBVO_EXTERN( x11 )
+
/* private prototypes */
static void Display_Image ( XImage * myximage,unsigned char *ImageData );
static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
@@ -432,9 +433,6 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
return 0;
}
-static const vo_info_t* get_info( void )
-{ return &vo_info; }
-
static void Display_Image( XImage *myximage,uint8_t *ImageData )
{
#ifdef HAVE_SHM