Removes trailing spaces. Removes tabs.

[vlc] / modules / video_output / x11 / xvmc.c

diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index eed65e2952c61fdf70d87a75021a8760b82fa4d8..153de41716812599ed4417972ddef4467c29d867 100644 (file)
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -28,12 +28,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                            /* strerror() */
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc_interface.h>
+#include <vlc_vout.h>
 #include <vlc_keys.h>
 
 #ifdef HAVE_MACHINE_PARAM_H
@@ -212,9 +210,9 @@ void xvmc_context_writer_unlock( context_lock_t *c )
 
 void clear_xx44_palette( xx44_palette_t *p )
 {
-    register int i;
-    register uint32_t *cluts = p->cluts;
-    register int *ids = p->lookup_cache;
+    int i;
+    uint32_t *cluts = p->cluts;
+    int *ids = p->lookup_cache;
 
     i= p->size;
     while(i--)
@@ -571,7 +569,7 @@ static void xxmc_xvmc_surface_handler_construct( vout_thread_t *p_vout )
 {
     int i;
     xvmc_surface_handler_t *handler = &p_vout->p_sys->xvmc_surf_handler;
-    
+ 
     pthread_mutex_init( &handler->mutex, NULL );
     for( i=0; i<XVMC_MAX_SURFACES; ++i )
     {
@@ -774,7 +772,7 @@ int checkXvMCCap( vout_thread_t *p_vout )
         xvmc_context_writer_unlock( &p_vout->p_sys->xvmc_lock );
         return VLC_SUCCESS;
     }
-    XVMCLOCKDISPLAY( p_vout->p_sys->p_display );  
+    XVMCLOCKDISPLAY( p_vout->p_sys->p_display );
     XvMCDestroyContext( p_vout->p_sys->p_display, &c );
     xxmc_xvmc_surface_handler_construct(p_vout );
     /*  p_vout->p_sys->capabilities |= VO_CAP_XXMC; */