X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fxvmc%2Fdecode.c;h=c781c16830e75a8380803014660a974f46b69589;hb=1172bcd38c3382983662782040e49fdada1f6cef;hp=4ac08dcdc6001b630e8cc806604a37998a148798;hpb=3f8b63067e9a8eb55f436b7a79bcc43136b9a71c;p=vlc

diff --git a/modules/codec/xvmc/decode.c b/modules/codec/xvmc/decode.c
index 4ac08dcdc6..c781c16830 100644
--- a/modules/codec/xvmc/decode.c
+++ b/modules/codec/xvmc/decode.c
@@ -1,4 +1,4 @@
-/* $Id:$
+/* $Id$
  * decode.c
  * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
@@ -21,15 +21,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.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;
 
@@ -173,7 +179,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 +209,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;