The motion compensation routines are now modules as well ; choose your

[vlc] / src / video_parser / video_fifo.c

diff --git a/src/video_parser/video_fifo.c b/src/video_parser/video_fifo.c
index 575d142011beced5997a6667e1639b483e2f3eab..c42aa1647b0ce9fa947aaded43768efa328393f0 100644 (file)
--- a/src/video_parser/video_fifo.c
+++ b/src/video_parser/video_fifo.c
@@ -2,7 +2,7 @@
  * video_fifo.c : video FIFO management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_fifo.c,v 1.24 2000/12/21 17:19:54 massiot Exp $
+ * $Id: video_fifo.c,v 1.28 2001/01/18 05:13:23 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,9 +26,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                             /* "input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"
@@ -43,11 +40,11 @@
 #include "video.h"
 #include "video_output.h"
 
+#include "video_decoder.h"
+#include "vdec_motion.h"
 #include "../video_decoder/vdec_idct.h"
-#include "../video_decoder/video_decoder.h"
-#include "../video_decoder/vdec_motion.h"
 
-#include "../video_decoder/vpar_blocks.h"
+#include "vpar_blocks.h"
 #include "../video_decoder/vpar_headers.h"
 #include "../video_decoder/vpar_synchro.h"
 #include "../video_decoder/video_parser.h"
@@ -65,6 +62,7 @@ void vpar_InitFIFO( vpar_thread_t * p_vpar )
     p_vpar->vfifo.p_vpar = p_vpar;
 
 #ifdef VDEC_SMP
+
     /* Initialize mutex and cond */
     vlc_mutex_init( &p_vpar->vfifo.lock );
     vlc_cond_init( &p_vpar->vfifo.wait );