More clean up...

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

diff --git a/modules/codec/xvmc/slice_xvmc_vld.c b/modules/codec/xvmc/slice_xvmc_vld.c
index ab0640f167e94633337eaa74f4697fe163c94fba..ce2bf749440731289be57142f7e144e5f957d38e 100644 (file)
--- a/modules/codec/xvmc/slice_xvmc_vld.c
+++ b/modules/codec/xvmc/slice_xvmc_vld.c
@@ -17,7 +17,11 @@
  *
  */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
 
@@ -105,7 +109,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
         /*
          * Check that first field went through OK. Otherwise,
          * indicate bad frame.
-         */
+         */ 
         if (decoder->second_field)
         {
             mpeg2dec->xvmc_last_slice_code = (xxmc->decoded) ? 0 : -1;
@@ -220,7 +224,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
 
     if( ((code == mpeg2dec->xvmc_last_slice_code + 1 ||
         code == mpeg2dec->xvmc_last_slice_code)) &&
-        code <= mpeg2dec->xxmc_mb_pic_height )
+        (unsigned int)code <= mpeg2dec->xxmc_mb_pic_height )
     {
         /*
          * Send this slice to the output plugin. May stall for a long
@@ -238,11 +242,11 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
         if (xxmc->result != 0)
         {
             //xxmc->proc_xxmc_flushsync( picture );
-            xxmc->proc_xxmc_flush( picture );    
+            xxmc->proc_xxmc_flush( picture );  
             mpeg2dec->xvmc_last_slice_code=-1;
             return;
         }
-        if (code == mpeg2dec->xxmc_mb_pic_height)
+        if ( (unsigned int)code == mpeg2dec->xxmc_mb_pic_height)
         {
             /*
              * We've encountered the last slice of this frame.
@@ -266,7 +270,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
     else
     {
         /*
-         * An error has occured.
+         * An error has occurred.
          */
 
         //printf("VLD XvMC: Slice error: code=%d\tlast slice code=%d\tmb_pic_height=%d\n", code, mpeg2dec->xvmc_last_slice_code,mpeg2dec->xxmc_mb_pic_height);
@@ -276,7 +280,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
     }
 }
 
-void mpeg2_xxmc_vld_frame_complete(mpeg2dec_t *mpeg2dec, picture_t *picture, int code)
+void mpeg2_xxmc_vld_frame_complete(mpeg2dec_t *mpeg2dec, picture_t *picture, int code) 
 {
     vlc_xxmc_t *xxmc = (vlc_xxmc_t *) picture->p_data;
     vlc_vld_frame_t *vft = &xxmc->vld_frame;