Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / xvmc / decode.c

diff --git a/modules/codec/xvmc/decode.c b/modules/codec/xvmc/decode.c
index a180a3e8215c6f25924e33b10d6ecd0eb43381a2..1ee1affff1efda7e2a48bed05aebe2b7bbb61a6d 100644 (file)
--- a/modules/codec/xvmc/decode.c
+++ b/modules/codec/xvmc/decode.c
@@ -21,15 +21,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+
 #include "xxmc-config.h"
 
-#include <string.h>    /* memcmp/memset, try to remove */
-#include <stdlib.h>
 #include <inttypes.h>
 
 #include "mpeg2.h"
 #include "attributes.h"
 #include "mpeg2_internal.h"
+#include "xvmc_vld.h"
 
 static int mpeg2_accels = 0;
 
@@ -97,7 +99,7 @@ static inline int copy_chunk( mpeg2dec_t * mpeg2dec, int bytes )
 
             mpeg2dec->shift = 0xffffff00;
             mpeg2dec->chunk_size = chunk_ptr - mpeg2dec->chunk_start - 3;
-            mpeg2dec->chunk_ptr = chunk_ptr + 1;   
+            mpeg2dec->chunk_ptr = chunk_ptr + 1;
             copied = current - mpeg2dec->buf_start;
             mpeg2dec->buf_start = current;
             return copied;
@@ -173,7 +175,7 @@ mpeg2_state_t mpeg2_parse( mpeg2dec_t * mpeg2dec )
 
     while(1)
     {
-        while( (unsignedint) (mpeg2dec->code - mpeg2dec->first_decode_slice)
+        while( (unsigned int) (mpeg2dec->code - mpeg2dec->first_decode_slice)
                  < mpeg2dec->nb_decode_slices )
         {
             size_buffer = mpeg2dec->buf_end - mpeg2dec->buf_start;
@@ -203,7 +205,7 @@ mpeg2_state_t mpeg2_parse( mpeg2dec_t * mpeg2dec )
                 }
             }
             mpeg2dec->bytes_since_tag += copied;
-            mpeg2_xxmc_slice( &(mpeg2dec->decoder), NULL,
+            mpeg2_xxmc_slice( mpeg2dec, NULL,
                               mpeg2dec->code,mpeg2dec->chunk_start,
                               mpeg2dec->chunk_size);
             mpeg2dec->prev_code = mpeg2dec->code;