* Various little fixes - BeOS interface compilation fix by Rene Gollent. - DirectX plugin compilation fix by Gildas Bazin. - removed %ebx spill in the iMDCT plugins.

f42dc782 · Sam Hocevar · 348b0e6f · f42dc782 · f42dc782 · f42dc782
Commit f42dc782 authored Jun 03, 2001 by Sam Hocevar
54 changed files
--- a/Makefile
+++ b/Makefile
@@ -36,13 +36,13 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx \
 #
 # C Objects
 # 
-INTERFACE =	src/interface/main.o \
+INTERFACE :=	src/interface/main.o \
 		src/interface/interface.o \
 		src/interface/intf_msg.o \
 		src/interface/intf_playlist.o \
 		src/interface/intf_channels.o
-INPUT =		src/input/input.o \
+INPUT :=	src/input/input.o \
 		src/input/input_ext-dec.o \
 		src/input/input_ext-intf.o \
 		src/input/input_dec.o \
@@ -51,7 +51,7 @@ INPUT =		src/input/input.o \
 		src/input/input_clock.o \
 		src/input/mpeg_system.o
-AUDIO_OUTPUT = 	src/audio_output/audio_output.o \
+AUDIO_OUTPUT :=	src/audio_output/audio_output.o \
 		src/audio_output/aout_ext-dec.o \
 		src/audio_output/aout_u8.o \
 		src/audio_output/aout_s8.o \
@@ -59,12 +59,12 @@ AUDIO_OUTPUT = 	src/audio_output/audio_output.o \
 		src/audio_output/aout_s16.o \
 	        src/audio_output/aout_spdif.o
-VIDEO_OUTPUT = 	src/video_output/video_output.o \
+VIDEO_OUTPUT :=	src/video_output/video_output.o \
 		src/video_output/video_text.o \
 		src/video_output/video_spu.o \
 		src/video_output/video_yuv.o
-AC3_DECODER =	src/ac3_decoder/ac3_decoder_thread.o \
+AC3_DECODER :=	src/ac3_decoder/ac3_decoder_thread.o \
 		src/ac3_decoder/ac3_decoder.o \
 		src/ac3_decoder/ac3_parse.o \
 		src/ac3_decoder/ac3_exponent.o \
@@ -73,36 +73,36 @@ AC3_DECODER =	src/ac3_decoder/ac3_decoder_thread.o \
 		src/ac3_decoder/ac3_rematrix.o \
 		src/ac3_decoder/ac3_imdct.o
-AC3_SPDIF =	src/ac3_spdif/ac3_spdif.o \
+AC3_SPDIF :=	src/ac3_spdif/ac3_spdif.o \
 		src/ac3_spdif/ac3_iec958.o
-LPCM_DECODER =	src/lpcm_decoder/lpcm_decoder_thread.o \
+LPCM_DECODER :=	src/lpcm_decoder/lpcm_decoder_thread.o \
 		src/lpcm_decoder/lpcm_decoder.o
-AUDIO_DECODER =	src/audio_decoder/audio_decoder.o \
+AUDIO_DECODER :=	src/audio_decoder/audio_decoder.o \
 			src/audio_decoder/adec_generic.o \
 			src/audio_decoder/adec_layer1.o \
 			src/audio_decoder/adec_layer2.o \
 			src/audio_decoder/adec_math.o
-SPU_DECODER =	src/spu_decoder/spu_decoder.o
+SPU_DECODER :=	src/spu_decoder/spu_decoder.o
-#GEN_DECODER =	src/generic_decoder/generic_decoder.o
+#GEN_DECODER :=	src/generic_decoder/generic_decoder.o
-VIDEO_PARSER = 	src/video_parser/video_parser.o \
+VIDEO_PARSER :=	src/video_parser/video_parser.o \
 		src/video_parser/vpar_headers.o \
 		src/video_parser/vpar_blocks.o \
 		src/video_parser/vpar_synchro.o \
 		src/video_parser/video_fifo.o
-VIDEO_DECODER =	src/video_decoder/video_decoder.o
+VIDEO_DECODER :=	src/video_decoder/video_decoder.o
-MISC =		src/misc/mtime.o \
+MISC :=		src/misc/mtime.o \
 		src/misc/tests.o \
 		src/misc/modules.o \
 		src/misc/netutils.o
-C_OBJ =		$(INTERFACE) \
+C_OBJ :=	$(INTERFACE) \
 		$(INPUT) \
 		$(VIDEO_OUTPUT) \
 		$(AUDIO_OUTPUT) \
@@ -124,7 +124,7 @@ C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
 endif
 ifeq ($(SYS),beos)
-CPP_OBJ =	src/misc/beos_specific.o
+CPP_OBJ :=	src/misc/beos_specific.o
 endif
 ifneq (,$(findstring darwin,$(SYS)))
@@ -134,7 +134,7 @@ endif
 #
 # Generated header
 #
-H_OBJ =		src/misc/modules_builtin.h
+H_OBJ :=	src/misc/modules_builtin.h
 #
 # Other lists of files
@@ -305,14 +305,14 @@ ifneq (,$(BUILTINS))
 		echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
 	done
 endif
+ifneq (,$(BUILTINS))
 	echo "" >> $@ ;
 	printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
-ifneq (,$(BUILTINS))
 	for i in $(BUILTINS) ; do \
 		printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
 	done
-endif
 	echo "} while( 0 );" >> $@ ;
+endif
 	echo "" >> $@ ;
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile

--- a/Makefile.dep
+++ b/Makefile.dep
 ################################################################################
-# vlc (VideoLAN Client) dependancies makefile
+# vlc (VideoLAN Client) dependencies makefile
 # (c)1998 VideoLAN
 ################################################################################
 # This Makefile is dedicated to build of .d files. It should not be called
@@ -7,23 +7,23 @@
 ################################################################################
 ###############################################################################
-# Note on generic rules and dependancies
+# Note on generic rules and dependencies
 ###############################################################################
-# Note on dependancies: each .c file is associated with a .d file, which
+# Note on dependencies: each .c file is associated with a .d file, which
 # depends of it. The .o file associated with a .c file depends of the .d, of the
 # .c itself, and of Makefile. The .d files are stored in a separate .dep/
 # directory.
 # The dep directory should be ignored by CVS.
-# Note on inclusions: depending of the target, the dependancies files must
+# Note on inclusions: depending of the target, the dependencies files must
 # or must not be included. The problem is that if we ask make to include a file,
 # and this file does not exist, it is made before it can be included. In a
 # general way, a .d file should be included if and only if the corresponding .o
 # needs to be re-made.
 # The object Makefile knows how to make a .o from a .c, and includes
-# dependancies for the target, but only those required.
+# dependencies for the target, but only those required.
 # All settings and options are passed through main Makefile
@@ -36,18 +36,18 @@ default:
 	@echo "see notes at end of main Makefile."
 ################################################################################
-# Dependancies creation
+# Dependencies creation
 ################################################################################
-# A dependancies file needs to be rebuilt if the .c  changed or if one of the 
+# A dependencies file needs to be rebuilt if the .c  changed or if one of the 
-# dependancies files have been changed. In other words, it depends from the
+# dependencies files have been changed. In other words, it depends from the
 # .c and from itself.
 -include $(MAKECMDGOALS)
 $(C_DEP): .dep/%.d: %.c
 	@test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
-	#@echo "generating dependancies for $*.c"
+	@echo "regenerating dependencies for $*.c"
 	@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
 	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
 	.dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
@@ -55,7 +55,7 @@ $(C_DEP): .dep/%.d: %.c
 $(CPP_DEP): .dep/%.dpp: %.cpp
 	@test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
-	#@echo "generating dependancies for $*.c"
+	@echo "regenerating dependencies for $*.c"
 	@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
 	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
 	.dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \

--- a/Makefile.modules
+++ b/Makefile.modules
@@ -10,24 +10,6 @@
 #
 CFLAGS := -I../../include -I../../extras $(CFLAGS)
-#
-# C compiler flags: plugin compilation
-#
-PCFLAGS += -fPIC
-#
-# C compiler flags: plugin linking
-#
-ifneq (,$(findstring darwin,$(SYS)))
-PLCFLAGS += -bundle -undefined suppress
-else
-ifeq ($(SYS),beos)
-PLCFLAGS += -nostart ../../lib/_APP_
-else
-PLCFLAGS += -shared
-endif
-endif
 # 
 # Standard dependencies
 #

--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -170,6 +170,10 @@ ifneq (,$(findstring darwin,$(SYS)))
 CFLAGS += -traditional-cpp
 endif
+ifneq (,$(findstring mingw32,$(SYS)))                                                                     
+CFLAGS += -fnative-struct
+endif
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
 CFLAGS += -O3
@@ -217,6 +221,20 @@ ifneq (,$(findstring mingw32,$(SYS)))
 LCFLAGS += -Xlinker --force-exe-suffix
 endif
+#
+# C compiler flags: plugin compilation
+#
+ifneq (,$(findstring mingw32,$(SYS)))
+PCFLAGS += -fPIC -fnative-struct
+else
+PCFLAGS += -fPIC
+endif
+#
+# C compiler flags: plugin linking
+#
+PLCFLAGS += @PLCFLAGS@
 #
 # Debugging and profiling support
 #

--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -102,13 +102,27 @@ dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 dnl Check for ntohl, etc.
-CFLAGS="${CFLAGS} -Wall -Werror"
+CFLAGS="${save_CFLAGS} -Wall -Werror"
 AC_MSG_CHECKING([for ntohl in sys/param.h])
 AC_TRY_COMPILE([#include <sys/param.h>
 void foo() { int meuh; ntohl(meuh); }],,
 AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
 AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+dnl Check for Darwin plugin linking flags
+CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
+AC_MSG_CHECKING([if \$CC compiles plugins with -bundle -undefined suppress])
+AC_TRY_COMPILE([],,
+ PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+dnl Check for standard plugin linking flags
+CFLAGS="${save_CFLAGS} -shared"
+AC_MSG_CHECKING([if \$CC compiles plugins with -shared])
+AC_TRY_COMPILE([],,
+ PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"
@@ -292,6 +306,7 @@ dnl special case for BeOS
 if test x$host_os = xbeos; then
    BUILTINS="${BUILTINS} beos"
    LIB_BEOS="-lbe -lgame -lroot -ltracker"
+    PLCFLAGS="${PLCFLAGS} -nostart"
 dnl default case
 else
@@ -570,6 +585,7 @@ AC_SUBST(CSS)
 AC_SUBST(MOC)
 AC_SUBST(LCFLAGS)
+AC_SUBST(PLCFLAGS)
 AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)

--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
 * Collection of useful common types and macros definitions
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.34 2001/05/31 03:12:49 sam Exp $
+ * $Id: common.h,v 1.35 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@via.ecp.fr>
 *          Vincent Seguin <seguin@via.ecp.fr>
@@ -136,6 +136,7 @@ typedef struct video_parser_s *         p_video_parser_t;
 struct macroblock_s;
 struct data_packet_s;
 struct es_descriptor_s;
+struct pgrm_descriptor_s;
 /*****************************************************************************
 * Macros and inline functions

--- a/include/modules_export.h
+++ b/include/modules_export.h
@@ -67,6 +67,54 @@ typedef struct module_symbols_s
                                      struct es_descriptor_s *, boolean_t );
    int  ( * input_ChangeArea )     ( struct input_thread_s *,
                                      struct input_area_s * );
+    struct es_descriptor_s * ( * input_FindES ) ( struct input_thread_s *,
+                                                  u16 );
+    struct es_descriptor_s * ( * input_AddES ) ( struct input_thread_s *,
+                                      struct pgrm_descriptor_s *, u16, size_t );
+    void ( * input_DelES )          ( struct input_thread_s *,
+                                      struct es_descriptor_s * );
+    int  ( * input_SelectES )       ( struct input_thread_s *,
+                                      struct es_descriptor_s * );
+    int  ( * input_UnselectES )     ( struct input_thread_s *,
+                                      struct es_descriptor_s * );
+    struct pgrm_descriptor_s* ( * input_AddProgram ) ( struct input_thread_s *,
+                                                       u16, size_t );
+    void ( * input_DelProgram )     ( struct input_thread_s *,
+                                      struct pgrm_descriptor_s * );
+    struct input_area_s * ( * input_AddArea ) ( struct input_thread_s * );
+    void ( * input_DelArea )        ( struct input_thread_s *,
+                                      struct input_area_s * );
+    int  ( * input_InitStream )     ( struct input_thread_s *, size_t );
+    void ( * input_EndStream )      ( struct input_thread_s * );
+    void ( * input_ParsePES )       ( struct input_thread_s *,
+                                      struct es_descriptor_s * );
+    void ( * input_GatherPES )      ( struct input_thread_s *,
+                                      struct data_packet_s *,
+                                      struct es_descriptor_s *,
+                                      boolean_t, boolean_t );
+    struct es_descriptor_s * ( * input_ParsePS ) ( struct input_thread_s *,
+                                                   struct data_packet_s * );
+    void ( * input_DemuxPS )        ( struct input_thread_s *,
+                                      struct data_packet_s * );
+    void ( * input_DemuxTS )        ( struct input_thread_s *,
+                                      struct data_packet_s * );
+    void ( * input_DemuxPSI )       ( struct input_thread_s *,
+                                      struct data_packet_s *,
+                                      struct es_descriptor_s *, 
+                                      boolean_t, boolean_t );
+    int ( * input_NetlistInit )          ( struct input_thread_s *,
+                                           int, int, size_t, int );
+    struct iovec * ( * input_NetlistGetiovec ) ( void * p_method_data );
+    void ( * input_NetlistMviovec )      ( void * , size_t,
+                                           struct data_packet_s **);
+    struct data_packet_s * ( * input_NetlistNewPacket ) ( void *, size_t );
+    struct pes_packet_s * ( * input_NetlistNewPES ) ( void * );
+    void ( * input_NetlistDeletePacket ) ( void *, struct data_packet_s * );
+    void ( * input_NetlistDeletePES )    ( void *, struct pes_packet_s * );
+    void ( * input_NetlistEnd )          ( struct input_thread_s * );
 } module_symbols_t;
@@ -104,7 +152,32 @@ typedef struct module_symbols_s
    (p_symbols)->input_OffsetToTime = input_OffsetToTime; \
    (p_symbols)->input_ChangeES = input_ChangeES; \
    (p_symbols)->input_ToggleES = input_ToggleES; \
-    (p_symbols)->input_ChangeArea = input_ChangeArea;
+    (p_symbols)->input_ChangeArea = input_ChangeArea; \
+    (p_symbols)->input_FindES = input_FindES; \
+    (p_symbols)->input_AddES = input_AddES; \
+    (p_symbols)->input_DelES = input_DelES; \
+    (p_symbols)->input_SelectES = input_SelectES; \
+    (p_symbols)->input_UnselectES = input_UnselectES; \
+    (p_symbols)->input_AddProgram = input_AddProgram; \
+    (p_symbols)->input_DelProgram = input_DelProgram; \
+    (p_symbols)->input_AddArea = input_AddArea; \
+    (p_symbols)->input_DelArea = input_DelArea; \
+    (p_symbols)->input_InitStream = input_InitStream; \
+    (p_symbols)->input_EndStream = input_EndStream; \
+    (p_symbols)->input_ParsePES = input_ParsePES; \
+    (p_symbols)->input_GatherPES = input_GatherPES; \
+    (p_symbols)->input_ParsePS = input_ParsePS; \
+    (p_symbols)->input_DemuxPS = input_DemuxPS; \
+    (p_symbols)->input_DemuxTS = input_DemuxTS; \
+    (p_symbols)->input_DemuxPSI = input_DemuxPSI; \
+    (p_symbols)->input_NetlistInit = input_NetlistInit; \
+    (p_symbols)->input_NetlistGetiovec = input_NetlistGetiovec; \
+    (p_symbols)->input_NetlistMviovec = input_NetlistMviovec; \
+    (p_symbols)->input_NetlistNewPacket = input_NetlistNewPacket; \
+    (p_symbols)->input_NetlistNewPES = input_NetlistNewPES; \
+    (p_symbols)->input_NetlistDeletePacket = input_NetlistDeletePacket; \
+    (p_symbols)->input_NetlistDeletePES = input_NetlistDeletePES; \
+    (p_symbols)->input_NetlistEnd = input_NetlistEnd;
 #ifdef PLUGIN
 extern module_symbols_t* p_symbols;
@@ -120,7 +193,7 @@ extern module_symbols_t* p_symbols;
 #   define TestProgram(a) p_symbols->TestProgram(a)
 #   define TestMethod(a,b) p_symbols->TestMethod(a,b)
-#   define TestCPU(a,b) p_symbols->TestCPU(a)
+#   define TestCPU(a) p_symbols->TestCPU(a)
 #   define intf_AssignKey(a,b,c,d) p_symbols->intf_AssignKey(a,b,c,d)
 #   define intf_ProcessKey(a,b) p_symbols->intf_ProcessKey(a,b)
@@ -151,6 +224,34 @@ extern module_symbols_t* p_symbols;
 #   define input_ChangeES(a,b,c) p_symbols->input_ChangeES(a,b,c)
 #   define input_ToggleES(a,b,c) p_symbols->input_ToggleES(a,b,c)
 #   define input_ChangeArea(a,b) p_symbols->input_ChangeArea(a,b)
+#   define input_FindES p_symbols->input_FindES
+#   define input_AddES p_symbols->input_AddES
+#   define input_DelES p_symbols->input_DelES
+#   define input_SelectES p_symbols->input_SelectES
+#   define input_UnselectES p_symbols->input_UnselectES
+#   define input_AddProgram p_symbols->input_AddProgram
+#   define input_DelProgram p_symbols->input_DelProgram
+#   define input_AddArea p_symbols->input_AddArea
+#   define input_DelArea p_symbols->input_DelArea
+#   define input_InitStream p_symbols->input_InitStream
+#   define input_EndStream p_symbols->input_EndStream
+#   define input_ParsePES p_symbols->input_ParsePES
+#   define input_GatherPES p_symbols->input_GatherPES
+#   define input_ParsePS p_symbols->input_ParsePS
+#   define input_DemuxPS p_symbols->input_DemuxPS
+#   define input_DemuxTS p_symbols->input_DemuxTS
+#   define input_DemuxPSI p_symbols->input_DemuxPSI
+#   define input_NetlistInit p_symbols->input_NetlistInit
+#   define input_NetlistGetiovec p_symbols->input_NetlistGetiovec
+#   define input_NetlistMviovec p_symbols->input_NetlistMviovec
+#   define input_NetlistNewPacket p_symbols->input_NetlistNewPacket
+#   define input_NetlistNewPES p_symbols->input_NetlistNewPES
+#   define input_NetlistDeletePacket p_symbols->input_NetlistDeletePacket
+#   define input_NetlistDeletePES p_symbols->input_NetlistDeletePES
+#   define input_NetlistEnd p_symbols->input_NetlistEnd
 #endif
--- a/include/mpeg_system.h
+++ b/include/mpeg_system.h
@@ -3,7 +3,7 @@
 * and TS system layers
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: mpeg_system.h,v 1.3 2001/03/21 13:42:33 sam Exp $
+ * $Id: mpeg_system.h,v 1.4 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -115,12 +115,13 @@ typedef struct stream_ps_data_s
 /*****************************************************************************
 * Prototypes
 *****************************************************************************/
-void input_ParsePES( struct input_thread_s *, struct es_descriptor_s * );
+void input_ParsePES  ( struct input_thread_s *, struct es_descriptor_s * );
-void input_GatherPES( struct input_thread_s *, struct data_packet_s *,
+void input_GatherPES ( struct input_thread_s *, struct data_packet_s *,
                       struct es_descriptor_s *, boolean_t, boolean_t );
 es_descriptor_t * input_ParsePS( struct input_thread_s *,
                                 struct data_packet_s * );
-void input_DemuxPS( struct input_thread_s *, struct data_packet_s * );
+void input_DemuxPS   ( struct input_thread_s *, struct data_packet_s * );
-void input_DemuxTS( struct input_thread_s *, struct data_packet_s * );
+void input_DemuxTS   ( struct input_thread_s *, struct data_packet_s * );
-void input_DemuxPSI( input_thread_t *, data_packet_t *, es_descriptor_t *, 
+void input_DemuxPSI  ( struct input_thread_s *, struct data_packet_s *,
-                     boolean_t, boolean_t );
+                       struct es_descriptor_s *, boolean_t, boolean_t );
--- a/include/video_fifo.h
+++ b/include/video_fifo.h
@@ -2,7 +2,7 @@
 * video_fifo.h : FIFO for the pool of video_decoders
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_fifo.h,v 1.18 2001/05/06 04:32:02 sam Exp $
+ * $Id: video_fifo.h,v 1.19 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -111,26 +111,6 @@ static __inline__ macroblock_t * vpar_NewMacroblock( video_fifo_t * p_fifo )
 #endif
 }
-/*****************************************************************************
- * vpar_DecodeMacroblock : put a macroblock in the video fifo
- *****************************************************************************/
-static __inline__ void vpar_DecodeMacroblock( video_fifo_t * p_fifo,
-                                              macroblock_t * p_mb )
-{
-#ifdef VDEC_SMP
-    /* Place picture in the video FIFO */
-    vlc_mutex_lock( &p_fifo->lock );
-    /* By construction, the video FIFO cannot be full */
-    VIDEO_FIFO_END( *p_fifo ) = p_mb;
-    VIDEO_FIFO_INCEND( *p_fifo );
-    vlc_mutex_unlock( &p_fifo->lock );
-#else
-    p_fifo->p_vpar->pf_decode_mb_c( p_fifo->p_vpar->pp_vdec[0], p_mb );
-#endif
-}
 /*****************************************************************************
 * vpar_ReleaseMacroblock : release a macroblock and put the picture in the
 *                          video output heap, if it is finished
@@ -188,6 +168,27 @@ static __inline__ void vpar_ReleaseMacroblock( video_fifo_t * p_fifo,
 #endif
 }
+/*****************************************************************************
+ * vpar_DecodeMacroblock : put a macroblock in the video fifo
+ *****************************************************************************/
+static __inline__ void vpar_DecodeMacroblock( video_fifo_t * p_fifo,
+                                              macroblock_t * p_mb )
+{
+#ifdef VDEC_SMP
+    /* Place picture in the video FIFO */
+    vlc_mutex_lock( &p_fifo->lock );
+    /* By construction, the video FIFO cannot be full */
+    VIDEO_FIFO_END( *p_fifo ) = p_mb;
+    VIDEO_FIFO_INCEND( *p_fifo );
+    vlc_mutex_unlock( &p_fifo->lock );
+#else
+    p_fifo->p_vpar->pf_decode_mb_c( p_fifo->p_vpar->pp_vdec[0], p_mb );
+    vpar_ReleaseMacroblock( &p_fifo->p_vpar->vfifo, p_mb );
+#endif
+}
 /*****************************************************************************
 * vpar_DestroyMacroblock : destroy a macroblock in case of error
 *****************************************************************************/

--- a/plugins/beos/InterfaceWindow.h
+++ b/plugins/beos/InterfaceWindow.h
@@ -2,7 +2,7 @@
 * InterfaceWindow.h: BeOS interface window class prototype
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.h,v 1.9 2001/03/25 17:09:14 richards Exp $
+ * $Id: InterfaceWindow.h,v 1.10 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
 *          Tony Castley <tcastley@mail.powerup.com.au>
@@ -57,6 +57,7 @@ public:
    // standard window member
    virtual bool    QuitRequested();
    virtual void    MessageReceived(BMessage *message);
+	void 			updateInterface();
 	SeekSlider * p_seek;
 	sem_id	fScrubSem;

--- a/plugins/directx/aout_directx.c
+++ b/plugins/directx/aout_directx.c
@@ -2,7 +2,7 @@
 * aout_directx.c: Windows DirectX audio output method
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: aout_directx.c,v 1.1 2001/06/02 01:09:03 sam Exp $
+ * $Id: aout_directx.c,v 1.2 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -57,6 +57,7 @@
 #include "main.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * aout_sys_t: directx audio output method descriptor

--- a/plugins/directx/vout_directx.c
+++ b/plugins/directx/vout_directx.c
@@ -2,7 +2,7 @@
 * vout_directx.c: Windows DirectX video output display method
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_directx.c,v 1.1 2001/06/02 01:09:03 sam Exp $
+ * $Id: vout_directx.c,v 1.2 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -864,7 +864,7 @@ static int WinDXCreateDisplay( vout_thread_t *p_vout )
                                             ddsd.lpSurface );
        /* FIXME: palette in 8bpp ?? */
        /* Set and initialize buffers */
-        vout_SetBuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
+        p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
                                 p_vout->p_sys->p_windx_buf[ 1 ] );
    }
    else
@@ -902,7 +902,7 @@ static int WinDXCreateDisplay( vout_thread_t *p_vout )
        dxresult = IDirectDrawSurface_Unlock(p_vout->p_sys->p_overlay,
                                             ddsd.lpSurface );
-        vout_SetBuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
+        p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_windx_buf[ 0 ],
                                 p_vout->p_sys->p_windx_buf[ 1 ] );
    }

--- a/plugins/downmix/ac3_downmix_3dn.c
+++ b/plugins/downmix/ac3_downmix_3dn.c
@@ -2,7 +2,7 @@
 * ac3_downmix_3dn.c: accelerated 3D Now! ac3 downmix functions
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_3dn.c,v 1.1 2001/05/15 16:19:42 sam Exp $
+ * $Id: ac3_downmix_3dn.c,v 1.2 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Renaud Dartus <reno@videolan.org>
 *
@@ -45,16 +45,16 @@ void sqrt2_3dn (void)
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl  $128,  %%ecx\n"            /* loop counter */
+    "movl  $128,  %%ebx\n"            /* loop counter */
-    "movd    (%%ebx), %%mm5\n"        /* unit */
+    "movd    (%%ecx), %%mm5\n"        /* unit */
    "punpckldq %%mm5, %%mm5\n"        /* unit | unit */
-    "movd    4(%%ebx), %%mm6\n"        /* clev */
+    "movd    4(%%ecx), %%mm6\n"        /* clev */
    "punpckldq %%mm6, %%mm6\n"        /* clev | clev */
-    "movd    8(%%ebx), %%mm7\n"        /* slev */
+    "movd    8(%%ecx), %%mm7\n"        /* slev */
    "punpckldq %%mm7, %%mm7\n"        /* slev | slev */
 ".loop:\n"
@@ -77,25 +77,25 @@ void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
    "movq    %%mm1, 1024(%%eax)\n"
    "addl    $8, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop\n"
-    "popl   %%ecx\n"
+    "popl   %%ebx\n"
    "femms\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_2f_2r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl  $128, %%ecx\n"       /* loop counter */
+    "movl  $128, %%ebx\n"       /* loop counter */
-    "movd  (%%ebx), %%mm5\n"    /* unit */
+    "movd  (%%ecx), %%mm5\n"    /* unit */
    "punpckldq %%mm5, %%mm5\n"  /* unit | unit */
-    "movd    8(%%ebx), %%mm7\n"    /* slev */
+    "movd    8(%%ecx), %%mm7\n"    /* slev */
    "punpckldq %%mm7, %%mm7\n"    /* slev | slev */
 ".loop3:\n"
@@ -114,29 +114,29 @@ void _M( downmix_2f_2r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movq    %%mm1, 1024(%%eax)\n"
    "addl    $8, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop3\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    "femms\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_3f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $128, %%ecx\n"            /* loop counter */
+    "movl    $128, %%ebx\n"            /* loop counter */
-    "movd    (%%ebx), %%mm5\n"        /* unit */
+    "movd    (%%ecx), %%mm5\n"        /* unit */
    "punpckldq %%mm5, %%mm5\n"        /* unit | unit */
-    "movd    4(%%ebx), %%mm6\n"        /* clev */
+    "movd    4(%%ecx), %%mm6\n"        /* clev */
    "punpckldq %%mm6, %%mm6\n"        /* clev | clev */
-    "movd    8(%%ebx), %%mm7\n"        /* slev */
+    "movd    8(%%ecx), %%mm7\n"        /* slev */
    "punpckldq %%mm7, %%mm7\n"      /* slev | slev */
 ".loop4:\n"
@@ -157,25 +157,25 @@ void _M( downmix_3f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movq    %%mm1, 1024(%%eax)\n"
    "addl    $8, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop4\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    "femms\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $128, %%ecx\n"            /* loop counter */
+    "movl    $128, %%ebx\n"            /* loop counter */
-    "movd    (%%ebx), %%mm5\n"        /* unit */
+    "movd    (%%ecx), %%mm5\n"        /* unit */
    "punpckldq %%mm5, %%mm5\n"        /* unit | unit */
-    "movd    8(%%ebx), %%mm7\n"        /* slev */
+    "movd    8(%%ecx), %%mm7\n"        /* slev */
    "punpckldq %%mm7, %%mm7\n"      /* slev | slev */
 ".loop5:\n"
@@ -192,25 +192,25 @@ void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movq    %%mm1, 1024(%%eax)\n"
    "addl    $8, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop5\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    "femms\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_3f_0r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $128, %%ecx\n"            /* loop counter */
+    "movl    $128, %%ebx\n"            /* loop counter */
-    "movd    (%%ebx), %%mm5\n"        /* unit */
+    "movd    (%%ecx), %%mm5\n"        /* unit */
    "punpckldq %%mm5, %%mm5\n"        /* unit | unit */
-    "movd    4(%%ebx), %%mm6\n"        /* clev */
+    "movd    4(%%ecx), %%mm6\n"        /* clev */
    "punpckldq %%mm6, %%mm6\n"      /* clev | clev */
 ".loop6:\n"
@@ -227,28 +227,28 @@ void _M( downmix_3f_0r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movq    %%mm1, 1024(%%eax)\n"
    "addl    $8, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop6\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    "femms\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( stream_sample_1ch_to_s16 ) (s16 *s16_samples, float *left)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
    "pushl %%edx\n"
    "movl   $sqrt2_3dn, %%edx\n"
    "movd  (%%edx), %%mm7\n"
    "punpckldq %%mm7, %%mm7\n"   /* sqrt2 | sqrt2 */
-    "movl $128, %%ecx\n"
+    "movl $128, %%ebx\n"
 ".loop2:\n"
-    "movq (%%ebx), %%mm0\n"        /* c1 | c0 */
+    "movq (%%ecx), %%mm0\n"        /* c1 | c0 */
    "pfmul   %%mm7, %%mm0\n"
    "pf2id %%mm0, %%mm0\n"        /* c1 c0 --> mm0, int_32 */
@@ -257,27 +257,27 @@ void _M( stream_sample_1ch_to_s16 ) (s16 *s16_samples, float *left)
    "movq %%mm0, (%%eax)\n"
    "addl $8, %%eax\n"
-    "addl $8, %%ebx\n"
+    "addl $8, %%ecx\n"
-    "decl %%ecx\n"
+    "decl %%ebx\n"
    "jnz .loop2\n"
    "popl %%edx\n"
-    "popl %%ecx\n"
+    "popl %%ebx\n"
    "femms\n"
-    : "=a" (s16_samples), "=b" (left)
+    : "=a" (s16_samples), "=c" (left)
-    : "a" (s16_samples), "b" (left));
+    : "a" (s16_samples), "c" (left));
 }
 void _M( stream_sample_2ch_to_s16 ) (s16 *s16_samples, float *left, float *right)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl $128, %%ecx\n"
+    "movl $128, %%ebx\n"
 ".loop1:\n"
-    "movq  (%%ebx), %%mm0\n"    /* l1 | l0 */
+    "movq  (%%ecx), %%mm0\n"    /* l1 | l0 */
    "movq  (%%edx), %%mm1\n"    /* r1 | r0 */
    "movq   %%mm0,  %%mm2\n"    /* l1 | l0 */
    "punpckldq %%mm1, %%mm0\n"    /* r0 | l0 */
@@ -291,16 +291,16 @@ void _M( stream_sample_2ch_to_s16 ) (s16 *s16_samples, float *left, float *right
    "movq %%mm0, (%%eax)\n"
    "movq %%mm2, 8(%%eax)\n"
    "addl $8, %%eax\n"
-    "addl $8, %%ebx\n"
+    "addl $8, %%ecx\n"
    "addl $8, %%edx\n"
-    "decl %%ecx\n"
+    "decl %%ebx\n"
    "jnz .loop1\n"
-    "popl %%ecx\n"
+    "popl %%ebx\n"
    "femms\n"
-    : "=a" (s16_samples), "=b" (left), "=d" (right)
+    : "=a" (s16_samples), "=c" (left), "=d" (right)
-    : "a" (s16_samples), "b" (left), "d" (right));
+    : "a" (s16_samples), "c" (left), "d" (right));
 }
--- a/plugins/downmix/ac3_downmix_sse.c
+++ b/plugins/downmix/ac3_downmix_sse.c
@@ -2,7 +2,7 @@
 * ac3_downmix_sse.c: accelerated SSE ac3 downmix functions
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_sse.c,v 1.1 2001/05/15 16:19:42 sam Exp $
+ * $Id: ac3_downmix_sse.c,v 1.2 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Renaud Dartus <reno@videolan.org>
 *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -46,16 +46,16 @@ void sqrt2_sse (void)
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl  $64,  %%ecx\n"            /* loop counter */
+    "movl  $64,  %%ebx\n"            /* loop counter */
-    "movss    (%%ebx), %%xmm5\n"        /* unit */
+    "movss    (%%ecx), %%xmm5\n"        /* unit */
    "shufps    $0, %%xmm5, %%xmm5\n"    /* unit | unit | unit | unit */
-    "movss    4(%%ebx), %%xmm6\n"        /* clev */
+    "movss    4(%%ecx), %%xmm6\n"        /* clev */
    "shufps    $0, %%xmm6, %%xmm6\n"    /* clev | clev | clev | clev */
-    "movss    8(%%ebx), %%xmm7\n"        /* slev */
+    "movss    8(%%ecx), %%xmm7\n"        /* slev */
    "shufps    $0, %%xmm7, %%xmm7\n"    /* slev | slev | slev | slev */
 ".loop:\n"
@@ -78,24 +78,24 @@ void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
    "movups    %%xmm1, 1024(%%eax)\n"
    "addl    $16, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop\n"
-    "popl   %%ecx\n"
+    "popl   %%ebx\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_2f_2r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl  $64, %%ecx\n"            /* loop counter */
+    "movl  $64, %%ebx\n"            /* loop counter */
-    "movss  (%%ebx), %%xmm5\n"        /* unit */
+    "movss  (%%ecx), %%xmm5\n"        /* unit */
    "shufps $0, %%xmm5, %%xmm5\n"   /* unit | unit | unit | unit */
-    "movss    8(%%ebx), %%xmm7\n"        /* slev */
+    "movss    8(%%ecx), %%xmm7\n"        /* slev */
    "shufps    $0, %%xmm7, %%xmm7\n"    /* slev | slev | slev | slev */
 ".loop3:\n"
@@ -114,28 +114,28 @@ void _M( downmix_2f_2r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movups    %%xmm1, 1024(%%eax)\n"
    "addl    $16, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop3\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_3f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $64, %%ecx\n"            /* loop counter */
+    "movl    $64, %%ebx\n"            /* loop counter */
-    "movss    (%%ebx), %%xmm5\n"        /* unit */
+    "movss    (%%ecx), %%xmm5\n"        /* unit */
    "shufps    $0, %%xmm5, %%xmm5\n"    /* unit | unit | unit | unit */
-    "movss    4(%%ebx), %%xmm6\n"        /* clev */
+    "movss    4(%%ecx), %%xmm6\n"        /* clev */
    "shufps    $0, %%xmm6, %%xmm6\n"    /* clev | clev | clev | clev */
-    "movss    8(%%ebx), %%xmm7\n"        /* slev */
+    "movss    8(%%ecx), %%xmm7\n"        /* slev */
    "shufps    $0, %%xmm7, %%xmm7\n"    /* slev | slev | slev | slev */
 ".loop4:\n"
@@ -156,25 +156,25 @@ void _M( downmix_3f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movups    %%xmm1, 1024(%%eax)\n"
    "addl    $16, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop4\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $64, %%ecx\n"            /* loop counter */
+    "movl    $64, %%ebx\n"            /* loop counter */
-    "movss    (%%ebx), %%xmm5\n"        /* unit */
+    "movss    (%%ecx), %%xmm5\n"        /* unit */
    "shufps    $0, %%xmm5, %%xmm5\n"    /* unit | unit | unit | unit */
-    "movss    8(%%ebx), %%xmm7\n"        /* slev */
+    "movss    8(%%ecx), %%xmm7\n"        /* slev */
    "shufps    $0, %%xmm7, %%xmm7\n"    /* slev | slev | slev | slev */
 ".loop5:\n"
@@ -191,12 +191,12 @@ void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movups    %%xmm1, 1024(%%eax)\n"
    "addl    $16, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop5\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
@@ -204,13 +204,13 @@ void _M( downmix_2f_1r_to_2ch ) (float *samples, dm_par_t * dm_par)
 void _M( downmix_3f_0r_to_2ch ) (float *samples, dm_par_t * dm_par)
 {
    __asm__ __volatile__ (
-    "pushl    %%ecx\n"
+    "pushl    %%ebx\n"
-    "movl    $64, %%ecx\n"            /* loop counter */
+    "movl    $64, %%ebx\n"            /* loop counter */
-    "movss    (%%ebx), %%xmm5\n"        /* unit */
+    "movss    (%%ecx), %%xmm5\n"        /* unit */
    "shufps    $0, %%xmm5, %%xmm5\n"    /* unit | unit | unit | unit */
-    "movss    4(%%ebx), %%xmm6\n"        /* clev */
+    "movss    4(%%ecx), %%xmm6\n"        /* clev */
    "shufps    $0, %%xmm6, %%xmm6\n"    /* clev | clev | clev | clev */
 ".loop6:\n"
@@ -227,27 +227,27 @@ void _M( downmix_3f_0r_to_2ch ) (float *samples, dm_par_t * dm_par)
    "movups    %%xmm1, 1024(%%eax)\n"
    "addl    $16, %%eax\n"
-    "decl     %%ecx\n"
+    "decl     %%ebx\n"
    "jnz    .loop6\n"
-    "popl    %%ecx\n"
+    "popl    %%ebx\n"
    : "=a" (samples)
-    : "a" (samples), "b" (dm_par));
+    : "a" (samples), "c" (dm_par));
 }
 void _M( stream_sample_1ch_to_s16 ) (s16 *s16_samples, float *left)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
    "pushl %%edx\n"
    "movl   $sqrt2_sse, %%edx\n"
    "movss (%%edx), %%xmm7\n"
    "shufps $0, %%xmm7, %%xmm7\n"   /* sqrt2 | sqrt2 | sqrt2 | sqrt2 */
-    "movl $64, %%ecx\n"
+    "movl $64, %%ebx\n"
 ".loop2:\n"
-    "movups (%%ebx), %%xmm0\n"        /* c3 | c2 | c1 | c0 */
+    "movups (%%ecx), %%xmm0\n"        /* c3 | c2 | c1 | c0 */
    "mulps   %%xmm7, %%xmm0\n"
    "movhlps %%xmm0, %%xmm2\n"        /* c3 | c2 */
@@ -260,27 +260,27 @@ void _M( stream_sample_1ch_to_s16 ) (s16 *s16_samples, float *left)
    "movq %%mm0, (%%eax)\n"
    "movq %%mm1, 8(%%eax)\n"
    "addl $16, %%eax\n"
-    "addl $16, %%ebx\n"
+    "addl $16, %%ecx\n"
-    "decl %%ecx\n"
+    "decl %%ebx\n"
    "jnz .loop2\n"
    "popl %%edx\n"
-    "popl %%ecx\n"
+    "popl %%ebx\n"
    "emms\n"
-    : "=a" (s16_samples), "=b" (left)
+    : "=a" (s16_samples), "=c" (left)
-    : "a" (s16_samples), "b" (left));
+    : "a" (s16_samples), "c" (left));
 }
 void _M( stream_sample_2ch_to_s16 ) (s16 *s16_samples, float *left, float *right)
 {
    __asm__ __volatile__ (
-    "pushl %%ecx\n"
+    "pushl %%ebx\n"
-    "movl $64, %%ecx\n"
+    "movl $64, %%ebx\n"
 ".loop1:\n"
-    "movups  (%%ebx), %%xmm0\n"    /* l3 | l2 | l1 | l0 */
+    "movups  (%%ecx), %%xmm0\n"    /* l3 | l2 | l1 | l0 */
    "movups  (%%edx), %%xmm1\n"    /* r3 | r2 | r1 | r0 */
    "movhlps  %%xmm0, %%xmm2\n"    /* l3 | l2 */
    "movhlps  %%xmm1, %%xmm3\n"    /* r3 | r2 */
@@ -300,16 +300,16 @@ void _M( stream_sample_2ch_to_s16 ) (s16 *s16_samples, float *left, float *right
    "movq %%mm0, (%%eax)\n"
    "movq %%mm2, 8(%%eax)\n"
    "addl $16, %%eax\n"
-    "addl $16, %%ebx\n"
+    "addl $16, %%ecx\n"
    "addl $16, %%edx\n"
-    "decl %%ecx\n"
+    "decl %%ebx\n"
    "jnz .loop1\n"
-    "popl %%ecx\n"
+    "popl %%ebx\n"
    "emms\n"
-    : "=a" (s16_samples), "=b" (left), "=d" (right)
+    : "=a" (s16_samples), "=c" (left), "=d" (right)
-    : "a" (s16_samples), "b" (left), "d" (right));
+    : "a" (s16_samples), "c" (left), "d" (right));
 }
--- a/plugins/downmix/downmix3dn.c
+++ b/plugins/downmix/downmix3dn.c
@@ -2,7 +2,7 @@
 * downmix3dn.c : accelerated 3D Now! AC3 downmix module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: downmix3dn.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: downmix3dn.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -41,6 +41,7 @@
 #include "ac3_downmix_common.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/downmix/downmixsse.c
+++ b/plugins/downmix/downmixsse.c
@@ -2,7 +2,7 @@
 * downmixsse.c : accelerated SSE AC3 downmix module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: downmixsse.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: downmixsse.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -41,6 +41,7 @@
 #include "ac3_downmix_common.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/dvd/dvd_css.c
+++ b/plugins/dvd/dvd_css.c
@@ -2,7 +2,7 @@
 * dvd_css.c: Functions for DVD authentification and unscrambling
 *****************************************************************************
 * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_css.c,v 1.31 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_css.c,v 1.32 2001/06/03 12:47:21 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -45,7 +45,10 @@
 #include <string.h>
+#include "config.h"
 #include "common.h"
+#include "threads.h"
+#include "mtime.h"
 #include "intf_msg.h"
@@ -59,6 +62,9 @@
 #include "input_dvd.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/dvd/dvd_ifo.c
+++ b/plugins/dvd/dvd_ifo.c
@@ -2,7 +2,7 @@
 * dvd_ifo.c: Functions for ifo parsing
 *****************************************************************************
 * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ifo.c,v 1.29 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_ifo.c,v 1.30 2001/06/03 12:47:21 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -44,13 +44,20 @@
 #include <string.h>
 #include <fcntl.h>
+#include "config.h"
 #include "common.h"
+#include "threads.h"
+#include "mtime.h"
 #include "intf_msg.h"
 #include "dvd_ifo.h"
 #include "dvd_udf.h"
 #include "input_dvd.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/dvd/dvd_ioctl.c
+++ b/plugins/dvd/dvd_ioctl.c
@@ -2,7 +2,7 @@
 * dvd_ioctl.c: DVD ioctl replacement function
 *****************************************************************************
 * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.c,v 1.16 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_ioctl.c,v 1.17 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
 *          Samuel Hocevar <sam@zoy.org>
@@ -53,7 +53,10 @@
 #   include <scsi.h>
 #endif
+#include "config.h"
 #include "common.h"
+#include "threads.h"
+#include "mtime.h"
 #include "intf_msg.h"
@@ -64,6 +67,9 @@
 #include "dvd_css.h"
 #include "dvd_ioctl.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes, BeOS specific
 *****************************************************************************/

--- a/plugins/dvd/dvd_netlist.c
+++ b/plugins/dvd/dvd_netlist.c
@@ -7,7 +7,7 @@
 * will only be given back to netlist when refcount is zero.
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: dvd_netlist.c,v 1.8 2001/05/31 03:57:54 sam Exp $
+ * $Id: dvd_netlist.c,v 1.9 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *          Stphane Borel <stef@videolan.org>
@@ -60,6 +60,9 @@
 #include "input.h"
 #include "dvd_netlist.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/dvd/dvd_summary.c
+++ b/plugins/dvd/dvd_summary.c
@@ -3,7 +3,7 @@
 * found in .ifo.
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_summary.c,v 1.2 2001/05/31 01:37:08 sam Exp $
+ * $Id: dvd_summary.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -70,6 +70,7 @@
 #include "debug.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local tables

--- a/plugins/dvd/dvd_udf.c
+++ b/plugins/dvd/dvd_udf.c
@@ -5,7 +5,7 @@
 * contains the basic udf handling functions
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_udf.c,v 1.8 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_udf.c,v 1.9 2001/06/03 12:47:21 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -55,12 +55,20 @@
 #   include <strings.h>
 #endif
+#include "config.h"
 #include "common.h"
+#include "threads.h"
+#include "mtime.h"
 #include "intf_msg.h"
 #include "dvd_css.h"
 #include "dvd_ifo.h"
 #include "input_dvd.h"
+#include "modules.h"
+#include "modules_export.h"
 #define UDFADshort      1
 #define UDFADlong       2
 #define UDFADext        4

--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
 *  -dvd_udf to find files
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.66 2001/05/31 16:10:05 stef Exp $
+ * $Id: input_dvd.c,v 1.67 2001/06/03 12:47:21 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -95,6 +95,7 @@
 #include "debug.h"
 #include "modules.h"
+#include "modules_export.h"
 /* how many blocks DVDRead will read in each loop */
 #define DVD_BLOCK_READ_ONCE 32

--- a/plugins/idct/idct.c
+++ b/plugins/idct/idct.c
@@ -2,7 +2,7 @@
 * idct.c : IDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idct.c,v 1.10 2001/05/30 17:03:12 sam Exp $
+ * $Id: idct.c,v 1.11 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -42,11 +42,12 @@
 #include "video_decoder.h"
-#include "modules.h"
 #include "vdec_block.h"
 #include "vdec_idct.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.
 *****************************************************************************/

--- a/plugins/idct/idctaltivec.c
+++ b/plugins/idct/idctaltivec.c
@@ -2,7 +2,7 @@
 * idctaltivec.c : Altivec IDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctaltivec.c,v 1.7 2001/05/30 17:03:12 sam Exp $
+ * $Id: idctaltivec.c,v 1.8 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -49,6 +49,8 @@
 #include "idctaltivec.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes.
 *****************************************************************************/

--- a/plugins/idct/idctclassic.c
+++ b/plugins/idct/idctclassic.c
@@ -2,7 +2,7 @@
 * idctclassic.c : Classic IDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctclassic.c,v 1.10 2001/05/30 17:03:12 sam Exp $
+ * $Id: idctclassic.c,v 1.11 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -47,6 +47,8 @@
 #include "vdec_block.h"
 #include "vdec_idct.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.
 *****************************************************************************/

--- a/plugins/idct/idctmmx.c
+++ b/plugins/idct/idctmmx.c
@@ -2,7 +2,7 @@
 * idctmmx.c : MMX IDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctmmx.c,v 1.12 2001/05/30 17:03:12 sam Exp $
+ * $Id: idctmmx.c,v 1.13 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 *          Michel Lespinasse <walken@zoy.org>
@@ -54,6 +54,8 @@
 #include "attributes.h"
 #include "mmx.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes.
 *****************************************************************************/

--- a/plugins/idct/idctmmxext.c
+++ b/plugins/idct/idctmmxext.c
@@ -2,7 +2,7 @@
 * idctmmxext.c : MMX EXT IDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idctmmxext.c,v 1.9 2001/05/30 17:03:12 sam Exp $
+ * $Id: idctmmxext.c,v 1.10 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 *          Michel Lespinasse <walken@zoy.org>
@@ -54,6 +54,8 @@
 #include "attributes.h"
 #include "mmx.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes.
 *****************************************************************************/

--- a/plugins/idct/vdec_block_c.c
+++ b/plugins/idct/vdec_block_c.c
@@ -2,7 +2,7 @@
 * vdec_block_c.c: Macroblock copy functions in C
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: vdec_block_c.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: vdec_block_c.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -57,6 +57,9 @@
 #include "vdec_block.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Static variables
 *****************************************************************************
@@ -150,12 +153,6 @@ void _M( vdec_DecodeMacroblockC ) ( vdec_thread_t *p_vdec, macroblock_t * p_mb )
    {
        DECODEBLOCKSC( CopyBlock )
    }
-    /*
-     * Decoding is finished, release the macroblock and free
-     * unneeded memory.
-     */
-    vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
 }
 void _M( vdec_DecodeMacroblockBW ) ( vdec_thread_t *p_vdec,
@@ -181,11 +178,5 @@ void _M( vdec_DecodeMacroblockBW ) ( vdec_thread_t *p_vdec,
    {
        DECODEBLOCKSBW( CopyBlock )
    }
-    /*
-     * Decoding is finished, release the macroblock and free
-     * unneeded memory.
-     */
-    vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
 }
--- a/plugins/idct/vdec_block_mmx.c
+++ b/plugins/idct/vdec_block_mmx.c
@@ -2,7 +2,7 @@
 * vdec_block_mmx.c: Macroblock copy functions in MMX assembly
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: vdec_block_mmx.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: vdec_block_mmx.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -57,6 +57,9 @@
 #include "vdec_block.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * vdec_InitDecode: initialize video decoder thread
 *****************************************************************************/
@@ -232,12 +235,6 @@ void _M( vdec_DecodeMacroblockC ) ( vdec_thread_t *p_vdec,
    {
        DECODEBLOCKSC( CopyBlock )
    }
-    /*
-     * Decoding is finished, release the macroblock and free
-     * unneeded memory.
-     */
-    vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
 }
 void _M( vdec_DecodeMacroblockBW ) ( vdec_thread_t *p_vdec,
@@ -263,11 +260,5 @@ void _M( vdec_DecodeMacroblockBW ) ( vdec_thread_t *p_vdec,
    {
        DECODEBLOCKSBW( CopyBlock )
    }
-    /*
-     * Decoding is finished, release the macroblock and free
-     * unneeded memory.
-     */
-    vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
 }
--- a/plugins/imdct/ac3_imdct_3dn.c
+++ b/plugins/imdct/ac3_imdct_3dn.c
@@ -2,7 +2,7 @@
 * ac3_imdct_3dn.c: accelerated 3D Now! ac3 DCT
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_imdct_3dn.c,v 1.3 2001/05/30 23:02:04 stef Exp $
+ * $Id: ac3_imdct_3dn.c,v 1.4 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Renaud Dartus <reno@videolan.org>
 *
@@ -59,7 +59,6 @@ void _M( imdct_init ) (imdct_t * p_imdct)
 	int i;
 	float scale = 181.019;
-    intf_WarnMsg( 6, "imct_init" );
 	for (i=0; i < 128; i++)
 	{
 		float xcos_i = cos(2.0f * M_PI * (8*i+1)/(8*N)) * scale;
@@ -69,7 +68,6 @@ void _M( imdct_init ) (imdct_t * p_imdct)
 		p_imdct->xcos_sin_sse[i * 4 + 2] = -xsin_i;
 		p_imdct->xcos_sin_sse[i * 4 + 3] = -xcos_i;
 	}
-    intf_WarnMsg( 6, "done imct_init" );
 }
 void _M( imdct_do_512 ) (imdct_t * p_imdct, float data[], float delay[])

--- a/plugins/imdct/imdct.c
+++ b/plugins/imdct/imdct.c
@@ -2,7 +2,7 @@
 * imdct.c : IMDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdct.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: imdct.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -41,6 +41,7 @@
 #include "ac3_imdct_common.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/imdct/imdct3dn.c
+++ b/plugins/imdct/imdct3dn.c
@@ -2,7 +2,7 @@
 * imdct3dn.c : accelerated 3D Now! IMDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdct3dn.c,v 1.3 2001/05/30 17:03:12 sam Exp $
+ * $Id: imdct3dn.c,v 1.4 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -41,6 +41,7 @@
 #include "ac3_imdct_common.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/imdct/imdctsse.c
+++ b/plugins/imdct/imdctsse.c
@@ -2,7 +2,7 @@
 * imdctsse.c : accelerated SSE IMDCT module
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: imdctsse.c,v 1.3 2001/05/30 17:03:12 sam Exp $
+ * $Id: imdctsse.c,v 1.4 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Gal Hendryckx <jimmy@via.ecp.fr>
 *
@@ -41,6 +41,7 @@
 #include "ac3_imdct_common.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/motion/motion.c
+++ b/plugins/motion/motion.c
@@ -2,7 +2,7 @@
 * motion.c : C motion compensation module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: motion.c,v 1.5 2001/05/30 17:03:12 sam Exp $
+ * $Id: motion.c,v 1.6 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -40,6 +40,7 @@
 #include "video.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/motion/motionmmx.c
+++ b/plugins/motion/motionmmx.c
@@ -2,7 +2,7 @@
 * motionmmx.c : MMX motion compensation module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: motionmmx.c,v 1.6 2001/05/30 17:03:12 sam Exp $
+ * $Id: motionmmx.c,v 1.7 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -40,6 +40,7 @@
 #include "video.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/motion/motionmmxext.c
+++ b/plugins/motion/motionmmxext.c
@@ -2,7 +2,7 @@
 * motionmmxext.c : MMX EXT motion compensation module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: motionmmxext.c,v 1.6 2001/05/30 17:03:12 sam Exp $
+ * $Id: motionmmxext.c,v 1.7 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -40,6 +40,7 @@
 #include "video.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/motion/vdec_motion_common.c
+++ b/plugins/motion/vdec_motion_common.c
@@ -2,7 +2,7 @@
 * vdec_motion_common.c : common motion compensation routines common
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion_common.c,v 1.6 2001/04/15 04:19:57 sam Exp $
+ * $Id: vdec_motion_common.c,v 1.7 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -39,7 +39,6 @@
 #include "common.h"
 #include "threads.h"
 #include "mtime.h"
-#include "modules.h"
 #include "intf_msg.h"
@@ -48,6 +47,9 @@
 #include "vdec_motion.h"
 #include "vpar_blocks.h"
+#include "modules.h"
+#include "modules_export.h"
 extern int _M( motion_Probe )( probedata_t *p_data );
 static void vdec_MotionFieldField420  ( macroblock_t * p_mb );

--- a/plugins/mpeg/es.c
+++ b/plugins/mpeg/es.c
@@ -2,7 +2,7 @@
 * es.c : Elementary Stream input module for vlc
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: es.c,v 1.2 2001/05/30 17:03:12 sam Exp $
+ * $Id: es.c,v 1.3 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: 
 *
@@ -38,6 +38,7 @@
 #include "mtime.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Capabilities defined in the other files.

--- a/plugins/mpeg/input_ps.c
+++ b/plugins/mpeg/input_ps.c
@@ -2,7 +2,7 @@
 * input_ps.c: PS demux and packet management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.27 2001/05/31 03:12:49 sam Exp $
+ * $Id: input_ps.c,v 1.28 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *          Cyril Deguet <asmax@via.ecp.fr>
@@ -71,6 +71,7 @@
 #include "debug.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes

--- a/plugins/mpeg/input_ts.c
+++ b/plugins/mpeg/input_ts.c
@@ -2,7 +2,7 @@
 * input_ts.c: TS demux and netlist management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ts.c,v 1.25 2001/06/02 01:09:03 sam Exp $
+ * $Id: input_ts.c,v 1.26 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *
@@ -67,7 +67,6 @@
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 #include "intf_msg.h"
@@ -81,6 +80,9 @@
 #include "mpeg_system.h"
 #include "input_netlist.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local prototypes
 *****************************************************************************/

--- a/plugins/mpeg/ts.c
+++ b/plugins/mpeg/ts.c
@@ -2,7 +2,7 @@
 * ts.c : Transport Stream input module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: ts.c,v 1.4 2001/05/30 17:03:12 sam Exp $
+ * $Id: ts.c,v 1.5 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Henri Fallon <henri@via.ecp.fr>
 *
@@ -38,6 +38,7 @@
 #include "mtime.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Capabilities defined in the other files.

--- a/plugins/null/null.c
+++ b/plugins/null/null.c
@@ -2,7 +2,7 @@
 * null.c : NULL module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: null.c,v 1.7 2001/05/30 17:03:12 sam Exp $
+ * $Id: null.c,v 1.8 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -38,6 +38,7 @@
 #include "modules.h"
 #include "modules_inner.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Build configuration tree.

--- a/plugins/text/intf_rc.c
+++ b/plugins/text/intf_rc.c
@@ -43,7 +43,6 @@
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
@@ -55,6 +54,9 @@
 #include "video.h"
 #include "video_output.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * intf_sys_t: description and status of rc interface
 *****************************************************************************/

--- a/plugins/text/rc.c
+++ b/plugins/text/rc.c
@@ -37,6 +37,7 @@
 #include "mtime.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Capabilities defined in the other files.

--- a/plugins/yuv/transforms_yuv.c
+++ b/plugins/yuv/transforms_yuv.c
@@ -5,7 +5,7 @@
 * certain cases by optimized functions.
 *****************************************************************************
 * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: transforms_yuv.c,v 1.5 2001/04/15 04:19:58 sam Exp $
+ * $Id: transforms_yuv.c,v 1.6 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Vincent Seguin <ptyx@via.ecp.fr>
 *          Samuel Hocevar <sam@zoy.org>
@@ -54,6 +54,9 @@
 #include "intf_msg.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * ConvertY4Gray8: grayscale YUV 4:x:x to RGB 8 bpp
 *****************************************************************************/

--- a/plugins/yuv/transforms_yuvmmx.c
+++ b/plugins/yuv/transforms_yuvmmx.c
@@ -3,7 +3,7 @@
 * Provides functions to perform the YUV conversion.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: transforms_yuvmmx.c,v 1.5 2001/04/15 04:19:58 sam Exp $
+ * $Id: transforms_yuvmmx.c,v 1.6 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -50,6 +50,9 @@
 #include "intf_msg.h"
+#include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * ConvertY4Gray8: grayscale YUV 4:x:x to RGB 8 bpp
 *****************************************************************************/

--- a/plugins/yuv/video_yuv.c
+++ b/plugins/yuv/video_yuv.c
@@ -5,7 +5,7 @@
 * case by optimized functions.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_yuv.c,v 1.13 2001/04/15 04:19:58 sam Exp $
+ * $Id: video_yuv.c,v 1.14 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *
@@ -43,7 +43,6 @@
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 #include "video.h"
 #include "video_output.h"
@@ -52,6 +51,9 @@
 #include "intf_msg.h"
+#include "modules.h"
+#include "modules_export.h"
 static int     yuv_Probe      ( probedata_t *p_data );
 static int     yuv_Init       ( vout_thread_t *p_vout );
 static int     yuv_Reset      ( vout_thread_t *p_vout );

--- a/plugins/yuv/video_yuvmmx.c
+++ b/plugins/yuv/video_yuvmmx.c
@@ -3,7 +3,7 @@
 * Provides functions to perform the YUV conversion.
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_yuvmmx.c,v 1.9 2001/05/15 16:19:42 sam Exp $
+ * $Id: video_yuvmmx.c,v 1.10 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -42,8 +42,6 @@
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 #include "video.h"
 #include "video_output.h"
@@ -51,6 +49,9 @@
 #include "intf_msg.h"
+#include "modules.h"
+#include "modules_export.h"
 static int     yuv_Probe      ( probedata_t *p_data );
 static int     yuv_Init       ( vout_thread_t *p_vout );
 static int     yuv_Reset      ( vout_thread_t *p_vout );

--- a/plugins/yuv/yuv.c
+++ b/plugins/yuv/yuv.c
@@ -2,7 +2,7 @@
 * yuv.c : C YUV module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: yuv.c,v 1.7 2001/05/30 17:03:12 sam Exp $
+ * $Id: yuv.c,v 1.8 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *
@@ -40,6 +40,7 @@
 #include "video_output.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/plugins/yuv/yuvmmx.c
+++ b/plugins/yuv/yuvmmx.c
@@ -2,7 +2,7 @@
 * yuvmmx.c : Accelerated MMX YUV module for vlc
 *****************************************************************************
 * Copyright (C) 2000 VideoLAN
- * $Id: yuvmmx.c,v 1.5 2001/05/30 17:03:12 sam Exp $
+ * $Id: yuvmmx.c,v 1.6 2001/06/03 12:47:21 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -40,6 +40,7 @@
 #include "video_output.h"
 #include "modules.h"
+#include "modules_export.h"
 /*****************************************************************************
 * Local and extern prototypes.

--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
 * modules.c : Built-in and plugin modules management functions
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.33 2001/05/31 12:45:39 sam Exp $
+ * $Id: modules.c,v 1.34 2001/06/03 12:47:22 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -66,18 +66,22 @@
 #include "netutils.h"
 #include "modules.h"
+#include "interface.h"
+#include "intf_msg.h"
+#include "intf_playlist.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"
+#include "input_ext-dec.h"
+#include "input.h"
+#include "input_netlist.h"
+#include "mpeg_system.h"
 #include "video.h"
 #include "video_output.h"
 #include "audio_output.h"
-#include "interface.h"
-#include "intf_msg.h"
-#include "intf_playlist.h"
 #ifdef HAVE_DYNAMIC_PLUGINS
 #   include "modules_core.h"
 #endif
@@ -92,9 +96,11 @@
 #ifdef HAVE_DYNAMIC_PLUGINS
 static int AllocatePluginModule ( char * );
 #endif
+#ifdef ALLOCATE_ALL_BUILTINS
 static int AllocateBuiltinModule( int ( * ) ( module_t * ),
                                  int ( * ) ( module_t * ),
                                  int ( * ) ( module_t * ) );
+#endif
 static int DeleteModule ( module_t * );
 static int LockModule   ( module_t * );
 static int UnlockModule ( module_t * );
@@ -139,9 +145,11 @@ void module_InitBank( void )
    /*
     * Check all the built-in modules
     */
+#ifdef ALLOCATE_ALL_BUILTINS
    intf_WarnMsg( 2, "module: checking built-in modules" );
    ALLOCATE_ALL_BUILTINS();
+#endif
    /*
     * Check all the plugin modules we can find
@@ -539,6 +547,7 @@ static int AllocatePluginModule( char * psz_filename )
 }
 #endif /* HAVE_DYNAMIC_PLUGINS */
+#ifdef ALLOCATE_ALL_BUILTINS
 /*****************************************************************************
 * AllocateBuiltinModule: initialize a built-in module.
 *****************************************************************************
@@ -639,6 +648,7 @@ static int AllocateBuiltinModule( int ( *pf_init ) ( module_t * ),
    return( 0 );
 }
+#endif /* ALLOCATE_ALL_BUILTINS */
 /*****************************************************************************
 * DeleteModule: delete a module and its structure.

--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -2,7 +2,7 @@
 * video_decoder.c : video decoder thread
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_decoder.c,v 1.51 2001/05/31 01:37:08 sam Exp $
+ * $Id: video_decoder.c,v 1.52 2001/06/03 12:47:22 sam Exp $
 *
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
 *          Gal Hendryckx <jimmy@via.ecp.fr>
@@ -237,6 +237,10 @@ static void RunThread( vdec_thread_t *p_vdec )
        if( (p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo )) != NULL )
        {
            p_vdec->pf_decode_mb_c( p_vdec, p_mb );
+            /* Decoding is finished, release the macroblock and free
+             * unneeded memory. */
+            vpar_ReleaseMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
        }
    }