From: Rémi Duraffort Date: Tue, 25 Aug 2009 10:25:09 +0000 (+0200) Subject: Xvmc: fix compilation. X-Git-Tag: 1.1.0-ff~3929 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=80d9437bc1727f335eec03f923a78df1d0dae0ef;hp=9a8c70115c489481c00ba16bbc46a9560e67a5cb Xvmc: fix compilation. --- diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index bcabaaf62f..3e4fc42ed4 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -116,8 +116,8 @@ static void ToggleCursor ( vout_thread_t * ); #if defined(MODULE_NAME_IS_xvmc) static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, picture_heap_t * ); static void RenderVideo ( vout_thread_t *, picture_t * ); -static int xvmc_check_yv12( Display *display, XvPortID port ); -static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ); +//static int xvmc_check_yv12( Display *display, XvPortID port ); +//static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ); #endif static int X11ErrorHandler( Display *, XErrorEvent * ); @@ -480,6 +480,7 @@ void Deactivate ( vlc_object_t *p_this ) #define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y') /* called xlocked */ +#if 0 static int xvmc_check_yv12( Display *display, XvPortID port ) { XvImageFormatValues *formatValues; @@ -501,12 +502,16 @@ static int xvmc_check_yv12( Display *display, XvPortID port ) XFree (formatValues); return 1; } +#endif +#if 0 static void xvmc_sync_surface( vout_thread_t *p_vout, XvMCSurface * srf ) { XvMCSyncSurface( p_vout->p_sys->p_display, srf ); } +#endif +#if 0 static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ) { Atom atom; @@ -525,6 +530,7 @@ static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ) //xprintf(this->xine, XINE_VERBOSITY_DEBUG, // "video_out_xxmc: double buffering mode = %d\n", xv_double_buffer); } +#endif static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic ) { diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c index 89cd4789ca..98f31af1e3 100644 --- a/modules/video_output/x11/xvmc.c +++ b/modules/video_output/x11/xvmc.c @@ -260,6 +260,7 @@ void xx44_to_xvmc_palette( const xx44_palette_t *p,unsigned char *xvmc_palette, } } +#if 0 static int xx44_paletteIndex( xx44_palette_t *p, int color, uint32_t clut ) { unsigned int i; @@ -288,7 +289,9 @@ static int xx44_paletteIndex( xx44_palette_t *p, int color, uint32_t clut ) p->lookup_cache[color] = p->max_used++; return p->lookup_cache[color]; } +#endif +#if 0 static void memblend_xx44( uint8_t *mem, uint8_t val, size_t size, uint8_t mask ) { @@ -305,6 +308,7 @@ static void memblend_xx44( uint8_t *mem, uint8_t val, mem++; } } +#endif void blend_xx44( uint8_t *dst_img, subpicture_t *sub_img, int dst_width, int dst_height, int dst_pitch, @@ -476,6 +480,7 @@ int xxmc_xvmc_surface_valid( vout_thread_t *p_vout, XvMCSurface *surf ) return ret; } +#if 0 static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout ) { int i; @@ -488,6 +493,7 @@ static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout ) handler->subValid[i]); } } +#endif XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout, XvMCContext *context, unsigned short width,