Commit 80d9437b authored by Rémi Duraffort's avatar Rémi Duraffort

Xvmc: fix compilation.

parent 9a8c7011
...@@ -116,8 +116,8 @@ static void ToggleCursor ( vout_thread_t * ); ...@@ -116,8 +116,8 @@ static void ToggleCursor ( vout_thread_t * );
#if defined(MODULE_NAME_IS_xvmc) #if defined(MODULE_NAME_IS_xvmc)
static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, picture_heap_t * ); static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, picture_heap_t * );
static void RenderVideo ( vout_thread_t *, picture_t * ); static void RenderVideo ( vout_thread_t *, picture_t * );
static int xvmc_check_yv12( Display *display, XvPortID port ); //static int xvmc_check_yv12( Display *display, XvPortID port );
static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ); //static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout );
#endif #endif
static int X11ErrorHandler( Display *, XErrorEvent * ); static int X11ErrorHandler( Display *, XErrorEvent * );
...@@ -480,6 +480,7 @@ void Deactivate ( vlc_object_t *p_this ) ...@@ -480,6 +480,7 @@ void Deactivate ( vlc_object_t *p_this )
#define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y') #define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y')
/* called xlocked */ /* called xlocked */
#if 0
static int xvmc_check_yv12( Display *display, XvPortID port ) static int xvmc_check_yv12( Display *display, XvPortID port )
{ {
XvImageFormatValues *formatValues; XvImageFormatValues *formatValues;
...@@ -501,12 +502,16 @@ static int xvmc_check_yv12( Display *display, XvPortID port ) ...@@ -501,12 +502,16 @@ static int xvmc_check_yv12( Display *display, XvPortID port )
XFree (formatValues); XFree (formatValues);
return 1; return 1;
} }
#endif
#if 0
static void xvmc_sync_surface( vout_thread_t *p_vout, XvMCSurface * srf ) static void xvmc_sync_surface( vout_thread_t *p_vout, XvMCSurface * srf )
{ {
XvMCSyncSurface( p_vout->p_sys->p_display, srf ); XvMCSyncSurface( p_vout->p_sys->p_display, srf );
} }
#endif
#if 0
static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ) static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout )
{ {
Atom atom; Atom atom;
...@@ -525,6 +530,7 @@ static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ) ...@@ -525,6 +530,7 @@ static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout )
//xprintf(this->xine, XINE_VERBOSITY_DEBUG, //xprintf(this->xine, XINE_VERBOSITY_DEBUG,
// "video_out_xxmc: double buffering mode = %d\n", xv_double_buffer); // "video_out_xxmc: double buffering mode = %d\n", xv_double_buffer);
} }
#endif
static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic ) static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic )
{ {
......
...@@ -260,6 +260,7 @@ void xx44_to_xvmc_palette( const xx44_palette_t *p,unsigned char *xvmc_palette, ...@@ -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 ) static int xx44_paletteIndex( xx44_palette_t *p, int color, uint32_t clut )
{ {
unsigned int i; unsigned int i;
...@@ -288,7 +289,9 @@ static int xx44_paletteIndex( xx44_palette_t *p, int color, uint32_t clut ) ...@@ -288,7 +289,9 @@ static int xx44_paletteIndex( xx44_palette_t *p, int color, uint32_t clut )
p->lookup_cache[color] = p->max_used++; p->lookup_cache[color] = p->max_used++;
return p->lookup_cache[color]; return p->lookup_cache[color];
} }
#endif
#if 0
static void memblend_xx44( uint8_t *mem, uint8_t val, static void memblend_xx44( uint8_t *mem, uint8_t val,
size_t size, uint8_t mask ) size_t size, uint8_t mask )
{ {
...@@ -305,6 +308,7 @@ static void memblend_xx44( uint8_t *mem, uint8_t val, ...@@ -305,6 +308,7 @@ static void memblend_xx44( uint8_t *mem, uint8_t val,
mem++; mem++;
} }
} }
#endif
void blend_xx44( uint8_t *dst_img, subpicture_t *sub_img, void blend_xx44( uint8_t *dst_img, subpicture_t *sub_img,
int dst_width, int dst_height, int dst_pitch, 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 ) ...@@ -476,6 +480,7 @@ int xxmc_xvmc_surface_valid( vout_thread_t *p_vout, XvMCSurface *surf )
return ret; return ret;
} }
#if 0
static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout ) static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout )
{ {
int i; int i;
...@@ -488,6 +493,7 @@ static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout ) ...@@ -488,6 +493,7 @@ static void xxmc_xvmc_dump_subpictures( vout_thread_t *p_vout )
handler->subValid[i]); handler->subValid[i]);
} }
} }
#endif
XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout, XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout,
XvMCContext *context, unsigned short width, XvMCContext *context, unsigned short width,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment