* Fixed a total breakage of decoder plugins introduced by fast_memcpy.

  * Got rid of #include "main.h", included it in common.h instead ; got
    rid of #include "config.h" in most files as well.

diff --git a/include/common.h b/include/common.h
index ee18c48819afbbeafff5f1c933cf28ba5b278219..5a730aa8c701d517a7999c8991bd1f3d1e0e4c62 100644 (file)
--- 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.52 2001/12/03 16:18:37 sam Exp $
+ * $Id: common.h,v 1.53 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -24,16 +24,16 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * required headers:
- *  config.h
+ * Required headers
  *****************************************************************************/
 
+#include "config.h"
+#include "int_types.h"
+
 /*****************************************************************************
  * Basic types definitions
  *****************************************************************************/
 
-#include "int_types.h"
-
 typedef u8                  byte_t;
 
 /* Boolean type */
@@ -237,9 +237,6 @@ struct decoder_fifo_s;
 
 #define I64C(x)         x##LL
 
-/* Pointer to the fast memcpy plugin function */
-extern void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
-
 /* The win32 specific stuff was getting really big so it has been moved */
 #if defined( WIN32 )
 #   include "common_win32.h"
@@ -284,8 +281,6 @@ typedef struct module_symbols_s
     void ( * intf_PlaylistJumpto )  ( struct playlist_s *, int );
     void ( * intf_UrlDecode )       ( char * );
 
-    void*   ( * pf_fast_memcpy ) ( void *, const void *, size_t );
-
     void    ( * msleep )         ( mtime_t );
     mtime_t ( * mdate )          ( void );
 
@@ -401,3 +396,10 @@ typedef struct module_symbols_s
 #ifdef PLUGIN
 extern module_symbols_t* p_symbols;
 #endif
+
+/*****************************************************************************
+ * Global headers
+ *****************************************************************************/
+
+#include "main.h"
+

diff --git a/include/config.h.in b/include/config.h.in
index 83ad3565696050ad437eafa107b6ee3cc3c9e676..c50c2d90a4343fb45064af6e848c1cf803e9edd9 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -36,6 +36,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#else
+#define HAVE_CONFIG_H
+
 /*****************************************************************************
  * Program information
  *****************************************************************************/
@@ -514,3 +518,4 @@
 #define PLAYLIST_LOOP_VAR               "vlc_playlist_loop"
 #define PLAYLIST_LOOP_DEFAULT           0
 
+#endif

diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h
index a16260c4c3d5c5d4b177c62352750559b302ddef..d5283416ce40637cec9a17bb5f783bba3486381e 100644 (file)
--- a/include/input_ext-dec.h
+++ b/include/input_ext-dec.h
@@ -2,7 +2,7 @@
  * input_ext-dec.h: structures exported to the VideoLAN decoders
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.40 2001/12/03 16:18:37 sam Exp $
+ * $Id: input_ext-dec.h,v 1.41 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Kaempf <maxx@via.ecp.fr>
@@ -479,14 +479,14 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
     if( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte)
             >= i_buf_len )
     {
-        pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+        p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
         p_bit_stream->p_byte += i_buf_len;
     }
     else
     {
         do
         {
-            pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_available );
+            p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_available );
             p_bit_stream->p_byte = p_bit_stream->p_end;
             p_buffer += i_available;
             i_buf_len -= i_available;
@@ -497,7 +497,7 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
 
         if( i_buf_len )
         {
-            pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+            p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
             p_bit_stream->p_byte += i_buf_len;
         }
     }

diff --git a/include/main.h b/include/main.h
index 69d8533cf667e9bb80ff7dafd828b7cf88606f95..80793fc4df34ec3f429903dc1f8404d3e3344491 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -3,7 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.24 2001/12/06 10:53:42 massiot Exp $
+ * $Id: main.h,v 1.25 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -51,8 +51,9 @@ typedef struct main_s
     boolean_t              b_ac3;
     int                    i_desync;   /* relative desync of the audio ouput */
 
-    /* memcpy plugin used */
+    /* Fast memcpy plugin used */
     struct module_s *      p_memcpy_module;
+    void *             ( * fast_memcpy ) ( void *, const void *, size_t );
 
     /* Unique threads */
     p_intf_thread_t        p_intf;                  /* main interface thread */

diff --git a/include/modules.h b/include/modules.h
index f7b72a618d14bbe7afc47f883eca98ec9648474e..8065843b0421a5c29211d91e940e9d5c67053dcf 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -2,7 +2,7 @@
  * modules.h : Module management functions.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.h,v 1.34 2001/12/07 16:47:47 jobi Exp $
+ * $Id: modules.h,v 1.35 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -228,7 +228,7 @@ typedef struct function_list_s
         /* memcpy plugins */
         struct
         {
-            void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
+            void* ( * fast_memcpy ) ( void *, const void *, size_t );
         } memcpy;
 
     } functions;

diff --git a/include/modules_export.h b/include/modules_export.h
index 08cd54e1919c3564c72e008fdf8c9b6f45aa9bee..4317a3215f1dc1d211f64d7498f1ce1002f4a175 100644 (file)
--- a/include/modules_export.h
+++ b/include/modules_export.h
@@ -45,7 +45,6 @@
     (p_symbols)->intf_PlaylistDestroy = intf_PlaylistDestroy; \
     (p_symbols)->intf_PlaylistJumpto = intf_PlaylistJumpto; \
     (p_symbols)->intf_UrlDecode = intf_UrlDecode; \
-    (p_symbols)->pf_fast_memcpy = pf_fast_memcpy; \
     (p_symbols)->msleep = msleep; \
     (p_symbols)->mdate = mdate; \
     (p_symbols)->network_ChannelCreate = network_ChannelCreate; \
@@ -150,8 +149,6 @@
 #   define intf_PlaylistJumpto(a,b) p_symbols->intf_PlaylistJumpto(a,b)
 #   define intf_UrlDecode(a) p_symbols->intf_UrlDecode(a)
 
-#   define pf_fast_memcpy p_symbols->pf_fast_memcpy
-
 #   define msleep(a) p_symbols->msleep(a)
 #   define mdate() p_symbols->mdate()
 

diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c
index 9b7eecac0a84dd8413db63eac41b5dc4aed2c8e8..74974319a8d48bb28a316b19ee753df6b894a07a 100644 (file)
--- a/plugins/alsa/aout_alsa.c
+++ b/plugins/alsa/aout_alsa.c
@@ -2,7 +2,7 @@
  * aout_alsa.c : Alsa functions library
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: aout_alsa.c,v 1.21 2001/12/03 16:18:37 sam Exp $
+ * $Id: aout_alsa.c,v 1.22 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -38,7 +38,6 @@
 
 #include <alsa/asoundlib.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -47,8 +46,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/arts/aout_arts.c b/plugins/arts/aout_arts.c
index 6cf63fa6badaa20adef1017f939029a28fee77df..7da9ea29f9cc54e319c11b08b77a9abc0a7e926d 100644 (file)
--- a/plugins/arts/aout_arts.c
+++ b/plugins/arts/aout_arts.c
@@ -38,7 +38,6 @@
 
 #include <artsc.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"
 #include "threads.h"
@@ -47,8 +46,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/beos/InterfaceWindow.cpp b/plugins/beos/InterfaceWindow.cpp
index 03ad843a8d8ecd153b3e39a4ac52882ed579623a..f6b2048b1e6a840ef91047b3fe282b59805928fb 100644 (file)
--- a/plugins/beos/InterfaceWindow.cpp
+++ b/plugins/beos/InterfaceWindow.cpp
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.9 2001/12/06 10:29:40 tcastley Exp $
+ * $Id: InterfaceWindow.cpp,v 1.10 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -40,12 +40,10 @@
 /* VLC headers */
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
-#include "main.h"
 #include "tests.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"

diff --git a/plugins/beos/MediaControlView.cpp b/plugins/beos/MediaControlView.cpp
index b8349d3a14776d84de9e2eafc787fcd705ab496e..3a3ed7036a6f6899fd95ed6a4fcd43fe1eddddeb 100644 (file)
--- a/plugins/beos/MediaControlView.cpp
+++ b/plugins/beos/MediaControlView.cpp
@@ -2,7 +2,7 @@
  * MediaControlView.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MediaControlView.cpp,v 1.5 2001/11/30 09:49:04 tcastley Exp $
+ * $Id: MediaControlView.cpp,v 1.6 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *
@@ -31,12 +31,10 @@
 /* VLC headers */
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
-#include "main.h"
 #include "tests.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"

diff --git a/plugins/beos/PlayListWindow.cpp b/plugins/beos/PlayListWindow.cpp
index b3c2d04a2ea102443675ffcecfd5dc837f97bf03..4758b47e3ce5fc9f8e1875433ed95fa5b15b64bf 100644 (file)
--- a/plugins/beos/PlayListWindow.cpp
+++ b/plugins/beos/PlayListWindow.cpp
@@ -2,7 +2,7 @@
  * PlayListWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PlayListWindow.cpp,v 1.3 2001/11/30 09:49:04 tcastley Exp $
+ * $Id: PlayListWindow.cpp,v 1.4 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -33,12 +33,10 @@
 /* VLC headers */
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
-#include "main.h"
 #include "tests.h"
 #include "stream_control.h"
 #include "input_ext-intf.h"

diff --git a/plugins/beos/aout_beos.cpp b/plugins/beos/aout_beos.cpp
index 5176a045346a4173e1b425dfed4c5e27eb7a3189..5643d0f7330609e3929f0fe0a4cabc4116d53663 100644 (file)
--- a/plugins/beos/aout_beos.cpp
+++ b/plugins/beos/aout_beos.cpp
@@ -2,7 +2,7 @@
  * aout_beos.cpp: BeOS audio output
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: aout_beos.cpp,v 1.16 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_beos.cpp,v 1.17 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -44,7 +44,6 @@
 
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -52,8 +51,6 @@ extern "C"
 
 #include "audio_output.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 }

diff --git a/plugins/beos/intf_beos.cpp b/plugins/beos/intf_beos.cpp
index 006b7464e88067b2b2a634e80dffc223b3426c02..2b3e44be78a71602b0a344505e422fbb3f213987 100644 (file)
--- a/plugins/beos/intf_beos.cpp
+++ b/plugins/beos/intf_beos.cpp
@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.33 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_beos.cpp,v 1.34 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -39,7 +39,6 @@
 
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -48,7 +47,6 @@ extern "C"
 #include "stream_control.h"
 #include "interface.h"
 #include "input_ext-intf.h"
-#include "main.h"
 #include "modules.h"
 #include "modules_export.h"
 }

diff --git a/plugins/beos/vout_beos.cpp b/plugins/beos/vout_beos.cpp
index 226624c9a79c408496f8a72f961104b8ab6bca66..e41f9fa2716ee67649b2e7f0b5f3c1f4241f68b2 100644 (file)
--- a/plugins/beos/vout_beos.cpp
+++ b/plugins/beos/vout_beos.cpp
@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.34 2001/12/06 10:29:40 tcastley Exp $
+ * $Id: vout_beos.cpp,v 1.35 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -43,7 +43,6 @@
 
 extern "C"
 {
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -55,8 +54,6 @@ extern "C"
 
 #include "interface.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 }

diff --git a/plugins/directx/aout_directx.c b/plugins/directx/aout_directx.c
index f342be101a66090a3645a3ad30be574398124249..19714e6f72cb2387659cf456574723551605c712 100644 (file)
--- 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) 2001 VideoLAN
- * $Id: aout_directx.c,v 1.12 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_directx.c,v 1.13 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -37,7 +37,6 @@
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -52,8 +51,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/directx/vout_directx.c b/plugins/directx/vout_directx.c
index 71297e9ae75d277ba2f89182ea74c740591cf005..a3829699762c936e35bc1a41f452714e10cd27c0 100644 (file)
--- 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) 2001 VideoLAN
- * $Id: vout_directx.c,v 1.14 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_directx.c,v 1.15 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -63,7 +63,6 @@
 #   include <directx.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -75,7 +74,6 @@
 #include "video_output.h"
 
 #include "interface.h"
-#include "main.h"
 
 #include "modules.h"
 #include "modules_export.h"

diff --git a/plugins/directx/vout_events.c b/plugins/directx/vout_events.c
index 247c1cc3be86a3c739f6cca702709dbde333ea5a..dd4e8d56eaa2237f9af0f0d904ad5866e7b74693 100644 (file)
--- a/plugins/directx/vout_events.c
+++ b/plugins/directx/vout_events.c
@@ -2,7 +2,7 @@
  * vout_events.c: Windows DirectX video output events handler
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_events.c,v 1.5 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_events.c,v 1.6 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -53,7 +52,6 @@
 #endif
 
 #include "interface.h"
-#include "main.h"
 
 #include "modules.h"
 #include "modules_export.h"

diff --git a/plugins/dsp/aout_dsp.c b/plugins/dsp/aout_dsp.c
index 75783ea3650bca6b4d27219360fab9b33d0ebc23..f2ecfd156433f2433aa6951e8942e87a6df7d6a5 100644 (file)
--- a/plugins/dsp/aout_dsp.c
+++ b/plugins/dsp/aout_dsp.c
@@ -2,7 +2,7 @@
  * aout_dsp.c : dsp functions library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_dsp.c,v 1.16 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_dsp.c,v 1.17 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -54,7 +54,6 @@
                    SNDCTL_DSP_STEREO, SNDCTL_DSP_SPEED, SNDCTL_DSP_GETOSPACE */
 #endif
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -63,8 +62,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/dummy/aout_dummy.c b/plugins/dummy/aout_dummy.c
index 9b6d4e0eef0332035a5d6aacc2457674a80fb313..a55e456022cfbd8e360a15c27affc79eb590a47e 100644 (file)
--- a/plugins/dummy/aout_dummy.c
+++ b/plugins/dummy/aout_dummy.c
@@ -2,7 +2,7 @@
  * aout_dummy.c : dummy audio output plugin
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: aout_dummy.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_dummy.c,v 1.16 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -31,7 +31,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"
 #include "threads.h"
@@ -40,8 +39,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/dummy/input_dummy.c b/plugins/dummy/input_dummy.c
index 18fe45db416e81f940c2d23e816217ee177db796..ac06fd5bacdf9b3dde0d1eb7c121f3dbf5a4b27f 100644 (file)
--- a/plugins/dummy/input_dummy.c
+++ b/plugins/dummy/input_dummy.c
@@ -2,7 +2,7 @@
  * input_dummy.c: dummy input plugin, to manage "vlc:***" special options
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dummy.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: input_dummy.c,v 1.9 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -38,7 +38,6 @@
 #   include <strings.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -48,8 +47,6 @@
 #include "interface.h"
 #include "intf_playlist.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/dummy/intf_dummy.c b/plugins/dummy/intf_dummy.c
index d9bf835ed5c4bf5b25e7243b3cd762129d5ae52d..352efe13311802b809f9fc8d4d90e85a14667bfd 100644 (file)
--- a/plugins/dummy/intf_dummy.c
+++ b/plugins/dummy/intf_dummy.c
@@ -2,7 +2,7 @@
  * intf_dummy.c: dummy interface plugin
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: intf_dummy.c,v 1.11 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_dummy.c,v 1.12 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -43,8 +42,6 @@
 #include "interface.h"
 
 #include "modules.h"
-
-#include "main.h"
 #include "modules_export.h"
 
 /*****************************************************************************

diff --git a/plugins/dvd/dvd_summary.c b/plugins/dvd/dvd_summary.c
index 3c2a3644438524612c21b6447419859c69491611..a77e60758882395bc7fd6c8a44792197c814dea2 100644 (file)
--- 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.10 2001/11/28 15:08:05 massiot Exp $
+ * $Id: dvd_summary.c,v 1.11 2001/12/07 18:33:07 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -56,7 +56,6 @@
 #   include <videolan/dvdcss.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -64,8 +63,6 @@
 #include "iso_lang.h"
 #include "tests.h"
 
-#include "main.h"
-
 #include "input_dvd.h"
 #include "dvd_ifo.h"
 

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 04749d4501f2ef87abf7dcea8884b67916bf86f2..0decae62fa17ca34721fefecf51b06e871bed560 100644 (file)
--- 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.104 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_dvd.c,v 1.105 2001/12/07 18:33:07 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -66,7 +66,6 @@
 #   include <videolan/dvdcss.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -78,8 +77,6 @@
 #   include "input_iovec.h"
 #endif
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/dvdread/input_dvdread.c b/plugins/dvdread/input_dvdread.c
index 32f3cc278836ef095eddadc8502a7ca63200634c..5f59804fc7e8b8049b80ba8bb7c97cad55be1ba3 100644 (file)
--- a/plugins/dvdread/input_dvdread.c
+++ b/plugins/dvdread/input_dvdread.c
@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.2 2001/11/28 15:08:05 massiot Exp $
+ * $Id: input_dvdread.c,v 1.3 2001/12/07 18:33:07 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -60,7 +60,6 @@
 #endif
 
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -72,8 +71,6 @@
 #   include "input_iovec.h"
 #endif
 
-#include "main.h"
-
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"

diff --git a/plugins/esd/aout_esd.c b/plugins/esd/aout_esd.c
index f4dea5a766f18ea695283f3dd19fe86cac474d45..122c0a7b2131c185499519e5fdbc0a527efef704 100644 (file)
--- a/plugins/esd/aout_esd.c
+++ b/plugins/esd/aout_esd.c
@@ -2,7 +2,7 @@
  * aout_esd.c : Esound functions library
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: aout_esd.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_esd.c,v 1.16 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,7 +44,6 @@
 
 #include <esd.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -53,8 +52,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/fb/vout_fb.c b/plugins/fb/vout_fb.c
index 61d7c43c41dad39a4d8bcc7756a6aef6c605153f..8ea49bff3cfaed3b7e84ddbe04ddc31ebe70c2dc 100644 (file)
--- a/plugins/fb/vout_fb.c
+++ b/plugins/fb/vout_fb.c
@@ -2,7 +2,7 @@
  * vout_fb.c: framebuffer video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_fb.c,v 1.14 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_fb.c,v 1.15 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,7 +44,6 @@
 #include <linux/vt.h>                                                /* VT_* */
 #include <linux/kd.h>                                                 /* KD* */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -55,8 +54,6 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /*****************************************************************************

diff --git a/plugins/ggi/vout_ggi.c b/plugins/ggi/vout_ggi.c
index 2f13a29daf21a3bde329a08df3d908c296e68453..1f1c7e62c7967005ebc67a58850f74da73ed7e9f 100644 (file)
--- a/plugins/ggi/vout_ggi.c
+++ b/plugins/ggi/vout_ggi.c
@@ -2,7 +2,7 @@
  * vout_ggi.c: GGI video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_ggi.c,v 1.12 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_ggi.c,v 1.13 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -36,7 +36,6 @@
 
 #include <ggi/ggi.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -50,8 +49,6 @@
 #include "intf_msg.h"
 #include "interface.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /*****************************************************************************

diff --git a/plugins/glide/vout_glide.c b/plugins/glide/vout_glide.c
index 7b010ad89a9439d9da8e8392257a693094f95d4d..28c368c023a41e9e36fe403bc762bc59d269c12e 100644 (file)
--- a/plugins/glide/vout_glide.c
+++ b/plugins/glide/vout_glide.c
@@ -2,7 +2,7 @@
  * vout_glide.c: 3dfx video output display method for 3dfx cards
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_glide.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_glide.c,v 1.9 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -39,7 +39,6 @@
 #include <glide.h>
 #include <linutil.h>                            /* Glide kbhit() and getch() */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -51,8 +50,6 @@
 
 #include "interface.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/gtk/gtk_callbacks.c b/plugins/gtk/gtk_callbacks.c
index 8fe1c0bb583602aa791e4f8996197832a8cb2d44..f0ff3a1eb01b5597514b837b11d67a99c435ff1a 100644 (file)
--- a/plugins/gtk/gtk_callbacks.c
+++ b/plugins/gtk/gtk_callbacks.c
@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.27 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_callbacks.c,v 1.28 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -33,7 +33,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -53,7 +52,6 @@
 #include "gtk_support.h"
 #include "intf_gtk.h"
 
-#include "main.h"
 #include "netutils.h"
 
 #include "modules_export.h"

diff --git a/plugins/gtk/gtk_control.c b/plugins/gtk/gtk_control.c
index d8c3f3c592f57e77258fb4cd912bf35cedb76974..b1dd89b3d4b0ad4b43b5fb931dec407575232069 100644 (file)
--- a/plugins/gtk/gtk_control.c
+++ b/plugins/gtk/gtk_control.c
@@ -2,7 +2,7 @@
  * gtk_control.c : functions to handle stream control buttons.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_control.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_control.c,v 1.7 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,8 +58,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /****************************************************************************

diff --git a/plugins/gtk/gtk_display.c b/plugins/gtk/gtk_display.c
index 4082334449337948e9f62e0a5220044ed64a4950..3f362191c6e5c7713c3d7a9cf5462e8ee7f14ade 100644 (file)
--- a/plugins/gtk/gtk_display.c
+++ b/plugins/gtk/gtk_display.c
@@ -2,7 +2,7 @@
  * gtk_display.c: Gtk+ tools for main interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: gtk_display.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_display.c,v 1.9 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -42,7 +42,6 @@
 #undef gtk
 #undef gnome
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -66,8 +65,6 @@
 #include "gtk_display.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /*****************************************************************************

diff --git a/plugins/gtk/gtk_menu.c b/plugins/gtk/gtk_menu.c
index 34a1e83b3aef82c15f68f03793f85e8d03be1dba..a4cf5463f4ebaabace5e14b3a67e9c5757e3ca03 100644 (file)
--- a/plugins/gtk/gtk_menu.c
+++ b/plugins/gtk/gtk_menu.c
@@ -2,7 +2,7 @@
  * gtk_menu.c : functions to handle menu items.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_menu.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_menu.c,v 1.16 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -63,8 +62,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /*

diff --git a/plugins/gtk/gtk_modules.c b/plugins/gtk/gtk_modules.c
index 5e820faa4c648c46d68f86373a930f1710abcdd0..3072769c8f33f45f21e4f462489ffaa8240934a9 100644 (file)
--- a/plugins/gtk/gtk_modules.c
+++ b/plugins/gtk/gtk_modules.c
@@ -2,7 +2,7 @@
  * gtk_modules.c : functions to build modules configuration boxes.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_modules.c,v 1.5 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_modules.c,v 1.6 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,8 +58,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 gboolean GtkModulesShow( GtkWidget       *widget,
                          GdkEventButton  *event,
                          gpointer         user_data )

diff --git a/plugins/gtk/gtk_open.c b/plugins/gtk/gtk_open.c
index 9815c28fd331f4e9cafa0778810cadae3b86e9c3..48faf85aad3bf97a98771473a8d6f68abb793b64 100644 (file)
--- a/plugins/gtk/gtk_open.c
+++ b/plugins/gtk/gtk_open.c
@@ -2,7 +2,7 @@
  * gtk_open.c : functions to handle file/disc/network open widgets.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_open.c,v 1.10 2001/12/03 16:18:37 sam Exp $
+ * $Id: gtk_open.c,v 1.11 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,7 +58,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
 #include "netutils.h"
 
 #include "modules_export.h"

diff --git a/plugins/gtk/gtk_playlist.c b/plugins/gtk/gtk_playlist.c
index 6aa7f85c423d3971ee678c508ab51608ec695ea9..54b53ca05cd2063a52131760ebc8b64183901cb0 100644 (file)
--- a/plugins/gtk/gtk_playlist.c
+++ b/plugins/gtk/gtk_playlist.c
@@ -2,7 +2,7 @@
  * gtk_playlist.c : Interface for the playlist dialog
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: gtk_playlist.c,v 1.21 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_playlist.c,v 1.22 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Pierre Baillet <oct@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -49,7 +49,6 @@
 #undef gtk
 #undef gnome
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -67,8 +66,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /****************************************************************************

diff --git a/plugins/gtk/gtk_preferences.c b/plugins/gtk/gtk_preferences.c
index 6268ad13ff2682230b2665d9c877118d8296e691..3901f04a39b72da8ac348b52aaf222a35cce1d5a 100644 (file)
--- a/plugins/gtk/gtk_preferences.c
+++ b/plugins/gtk/gtk_preferences.c
@@ -2,7 +2,7 @@
  * gtk_control.c : functions to handle stream control buttons.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.7 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_preferences.c,v 1.8 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -41,7 +41,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,8 +58,6 @@
 #include "gtk_playlist.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules_export.h"
 
 /****************************************************************************

diff --git a/plugins/gtk/intf_gnome.c b/plugins/gtk/intf_gnome.c
index 4a1bc2ed3a8453ba6b20e7583eb831e72fd2e49b..f1874d76f73e98cbd8676614d885a880551ea261 100644 (file)
--- a/plugins/gtk/intf_gnome.c
+++ b/plugins/gtk/intf_gnome.c
@@ -2,7 +2,7 @@
  * intf_gnome.c: Gnome interface
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_gnome.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_gnome.c,v 1.7 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -37,7 +37,6 @@
 
 #include <gnome.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,8 +58,6 @@
 #include "gtk_display.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/gtk/intf_gtk.c b/plugins/gtk/intf_gtk.c
index de8dd6af8229d7f02ab6548596707cd3d98216cd..670777c0e217686ccae134c7fbe6bccf79db45c5 100644 (file)
--- a/plugins/gtk/intf_gtk.c
+++ b/plugins/gtk/intf_gtk.c
@@ -2,7 +2,7 @@
  * intf_gtk.c: Gtk+ interface
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_gtk.c,v 1.28 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_gtk.c,v 1.29 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -37,7 +37,6 @@
 
 #include <gtk/gtk.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -60,8 +59,6 @@
 #include "gtk_display.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/kde/intf_plugin.h b/plugins/kde/intf_plugin.h
index 07c21d602f681d1fbe478d65ba0df45e428b0718..d69a0a46258091e37953857d2314c43fae0efb32 100644 (file)
--- a/plugins/kde/intf_plugin.h
+++ b/plugins/kde/intf_plugin.h
@@ -19,7 +19,6 @@ extern "C"
 #include <string.h>
 #include <stdio.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -32,8 +31,6 @@ extern "C"
 #include "intf_playlist.h"
 #include "interface.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 }

diff --git a/plugins/macosx/aout_macosx.c b/plugins/macosx/aout_macosx.c
index 1498edd1f115c29f3a3067d6421146db94ec768b..eeed87cb128920273320b6b9e209eb803e2fa6aa 100644 (file)
--- a/plugins/macosx/aout_macosx.c
+++ b/plugins/macosx/aout_macosx.c
@@ -2,7 +2,7 @@
  * aout_darwin.c : Darwin audio output plugin
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.c,v 1.7 2001/11/29 10:20:56 massiot Exp $
+ * $Id: aout_macosx.c,v 1.8 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *
@@ -44,7 +44,6 @@
 
 #include <string.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -53,8 +52,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 
 #include <Carbon/Carbon.h>

diff --git a/plugins/macosx/intf_vlc_wrapper.c b/plugins/macosx/intf_vlc_wrapper.c
index e148c4c1e318f9d19b9e04f58e8db61f8473b098..3e69172b0b6754c06c043f6bc64e5c8a8cb3ee46 100644 (file)
--- a/plugins/macosx/intf_vlc_wrapper.c
+++ b/plugins/macosx/intf_vlc_wrapper.c
@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.c : MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.c,v 1.4 2001/11/29 10:20:56 massiot Exp $
+ * $Id: intf_vlc_wrapper.c,v 1.5 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *
@@ -27,7 +27,6 @@
 #include <sys/param.h>                                    /* for MAXPATHLEN */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -37,8 +36,6 @@
 #include "interface.h"
 #include "intf_playlist.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c
index 1a7bb973dd282810f50e11a54366b4771f6df926..52cdfca93b2b07e912f09c933ff4f098d024e268 100644 (file)
--- a/plugins/macosx/vout_macosx.c
+++ b/plugins/macosx/vout_macosx.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -46,7 +45,6 @@
 #include "video_output.h"
 
 #include "modules.h"
-#include "main.h"
 
 #include "macosx.h"
 

diff --git a/plugins/memcpy/memcpy.c b/plugins/memcpy/memcpy.c
index 3fe9d92b009c193cd2f1a70db70b5fccd3ba41d1..e9fe6f04819a9b47c4efaa500b91a3737560b9fd 100644 (file)
--- a/plugins/memcpy/memcpy.c
+++ b/plugins/memcpy/memcpy.c
@@ -2,7 +2,7 @@
  * memcpy.c : classic memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpy.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpy.c,v 1.2 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -79,7 +78,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
 {
     p_function_list->pf_probe = memcpy_Probe;
 #define F p_function_list->functions.memcpy
-    F.pf_fast_memcpy = memcpy;
+    F.fast_memcpy = memcpy;
 #undef F
 }
 

diff --git a/plugins/memcpy/memcpy3dn.c b/plugins/memcpy/memcpy3dn.c
index d691a9ec0922aa33dfdf544029cd499d8d9a2a37..9dd405297039fd5faa88647d05af143235cc7bbb 100644 (file)
--- a/plugins/memcpy/memcpy3dn.c
+++ b/plugins/memcpy/memcpy3dn.c
@@ -2,7 +2,7 @@
  * memcpy3dn.c : 3D Now! memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpy3dn.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpy3dn.c,v 1.2 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
 {
     p_function_list->pf_probe = memcpy_Probe;
 #define F p_function_list->functions.memcpy
-    F.pf_fast_memcpy = _M( fast_memcpy );
+    F.fast_memcpy = _M( fast_memcpy );
 #undef F
 }
 

diff --git a/plugins/memcpy/memcpymmx.c b/plugins/memcpy/memcpymmx.c
index 67fbba95d7dfd98647ddfa07173e89d7a69488d6..b51f81acdebf7b6b160fd16a1c2daa64f5efd63a 100644 (file)
--- a/plugins/memcpy/memcpymmx.c
+++ b/plugins/memcpy/memcpymmx.c
@@ -2,7 +2,7 @@
  * memcpymmx.c : MMX memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpymmx.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpymmx.c,v 1.2 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
 {
     p_function_list->pf_probe = memcpy_Probe;
 #define F p_function_list->functions.memcpy
-    F.pf_fast_memcpy = _M( fast_memcpy );
+    F.fast_memcpy = _M( fast_memcpy );
 #undef F
 }
 

diff --git a/plugins/memcpy/memcpymmxext.c b/plugins/memcpy/memcpymmxext.c
index 6eb1ed5ac0b7055875dfb570560cb0ebd84c5a2a..947d31e4302db106a49ec7009a6231f79142bffa 100644 (file)
--- a/plugins/memcpy/memcpymmxext.c
+++ b/plugins/memcpy/memcpymmxext.c
@@ -2,7 +2,7 @@
  * memcpymmxext.c : MMX EXT memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpymmxext.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpymmxext.c,v 1.2 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
 {
     p_function_list->pf_probe = memcpy_Probe;
 #define F p_function_list->functions.memcpy
-    F.pf_fast_memcpy = _M( fast_memcpy );
+    F.fast_memcpy = _M( fast_memcpy );
 #undef F
 }
 

diff --git a/plugins/mpeg/input_es.c b/plugins/mpeg/input_es.c
index a229925484e19d6c44216f14e5e6c842c582dd47..1d16e3e819c3287ccfe49835ecc9c22586d34b8f 100644 (file)
--- a/plugins/mpeg/input_es.c
+++ b/plugins/mpeg/input_es.c
@@ -2,7 +2,7 @@
  * input_es.c: Elementary Stream demux and packet management
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_es.c,v 1.15 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_es.c,v 1.16 2001/12/07 18:33:07 sam Exp $
  *
  * Author: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -48,7 +48,6 @@
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -59,8 +58,6 @@
 #   include "input_iovec.h"
 #endif
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/mpeg/input_ps.c b/plugins/mpeg/input_ps.c
index 929bde73a8218ade6664a246610e21992cca8274..7124580032363db7904bad40569fea1926fe289b 100644 (file)
--- 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-2001 VideoLAN
- * $Id: input_ps.c,v 1.43 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_ps.c,v 1.44 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Cyril Deguet <asmax@via.ecp.fr>
@@ -50,15 +50,12 @@
 
 #include <fcntl.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c
index 7f531a927bd9a77555d893c19a254fea5e16136c..1143818c425ba5f8704cc9e9af5dfabf3398dd06 100644 (file)
--- 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-2001 VideoLAN
- * $Id: input_ts.c,v 1.41 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_ts.c,v 1.42 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -62,7 +62,6 @@
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -106,7 +105,7 @@ void _M( input_getfunctions )( function_list_t * p_function_list )
     input.pf_end              = TSEnd;
     input.pf_init_bit_stream  = InitBitstream;
     input.pf_set_area         = NULL;
-    input.pf_set_area         = input_SetProgram;
+    input.pf_set_program      = input_SetProgram;
     input.pf_read             = TSRead;
     input.pf_demux            = input_DemuxTS;
     input.pf_new_packet       = input_NetlistNewPacket;

diff --git a/plugins/mpeg/input_ts.h b/plugins/mpeg/input_ts.h
index d58a4eade1e70c3f7efded25d0c7860873ac3ab6..9e1339f2db66a2739df6ead71372a63137109fe1 100644 (file)
--- a/plugins/mpeg/input_ts.h
+++ b/plugins/mpeg/input_ts.h
@@ -2,7 +2,7 @@
  * input_ts.h: structures of the input not exported to other modules
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ts.h,v 1.11 2001/12/03 16:18:37 sam Exp $
+ * $Id: input_ts.h,v 1.12 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Boris Dorès <babal@via.ecp.fr>
@@ -71,7 +71,7 @@ static __inline__ int read_network( int i_fd, char * p_base,
          i_bytes = p_sys->i_length - p_sys->i_offset;
     }
 
-    pf_fast_memcpy( p_base, p_sys->p_buffer + p_sys->i_offset, i_bytes );
+    fast_memcpy( p_base, p_sys->p_buffer + p_sys->i_offset, i_bytes );
     p_sys->i_offset += i_bytes;
 
     return i_bytes;

diff --git a/plugins/mpeg_vdec/video_parser.c b/plugins/mpeg_vdec/video_parser.c
index 33277f828596754f4f353e8da567b0ad97b60799..6a4a2116c89ae3078ba59181a39fd954d0578046 100644 (file)
--- a/plugins/mpeg_vdec/video_parser.c
+++ b/plugins/mpeg_vdec/video_parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video_parser.c,v 1.5 2001/12/03 16:18:37 sam Exp $
+ * $Id: video_parser.c,v 1.6 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -43,15 +43,12 @@
 #   include <sys/times.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 #include "modules.h"
 
-#include "main.h"
-
 #include "video.h"
 #include "video_output.h"
 

diff --git a/plugins/mpeg_vdec/vpar_synchro.c b/plugins/mpeg_vdec/vpar_synchro.c
index 0968aea356272cc23da695aa0bcb4a60a7919a77..31066ad47cb8fd9d591a8cebc7cbc0e23939ca19 100644 (file)
--- a/plugins/mpeg_vdec/vpar_synchro.c
+++ b/plugins/mpeg_vdec/vpar_synchro.c
@@ -2,7 +2,7 @@
  * vpar_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vpar_synchro.c,v 1.2 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vpar_synchro.c,v 1.3 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -98,14 +98,11 @@
 
 #include <string.h>                                    /* memcpy(), memset() */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 
-#include "main.h"
-
 #include "video.h"
 #include "video_output.h"
 

diff --git a/plugins/qnx/aout_qnx.c b/plugins/qnx/aout_qnx.c
index acedb2e73ac847f9f7735297dd5ad5fbc54cb0f8..1210e677bdc88d04e894f0f6c68795690301dd87 100644 (file)
--- a/plugins/qnx/aout_qnx.c
+++ b/plugins/qnx/aout_qnx.c
@@ -37,7 +37,6 @@
 
 #include <sys/asoundlib.h>
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -46,8 +45,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/qnx/vout_qnx.c b/plugins/qnx/vout_qnx.c
index 4ed8d2bc2673330c97517fe37ab43e285679ac70..13531ac48bcc1a0bdc83777cbff5e66fdeb2437d 100644 (file)
--- a/plugins/qnx/vout_qnx.c
+++ b/plugins/qnx/vout_qnx.c
@@ -37,7 +37,6 @@
 #include <photon/PtLabel.h>
 #include <photon/PdDirect.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -48,7 +47,6 @@
 #include "video_output.h"
 
 #include "interface.h"
-#include "main.h"
 
 #include "modules.h"
 #include "modules_export.h"

diff --git a/plugins/qt/intf_qt.cpp b/plugins/qt/intf_qt.cpp
index c9f12951fcf99b79b610b418d3059f3b9e6b4cfe..93048b766397fd424a73c1b7331f78ad7fa8081c 100644 (file)
--- a/plugins/qt/intf_qt.cpp
+++ b/plugins/qt/intf_qt.cpp
@@ -2,7 +2,7 @@
  * intf_qt.cpp: Qt interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_qt.cpp,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_qt.cpp,v 1.9 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -37,7 +37,6 @@ extern "C"
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -50,8 +49,6 @@ extern "C"
 #include "intf_playlist.h"
 #include "interface.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c
index 2b318ae9286774092babd4324d57cf7ea3ddda66..4f35c0558ee89d58b94738831131f84b792e5b9d 100644 (file)
--- a/plugins/sdl/aout_sdl.c
+++ b/plugins/sdl/aout_sdl.c
@@ -2,7 +2,7 @@
  * aout_sdl.c : audio sdl functions library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_sdl.c,v 1.19 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_sdl.c,v 1.20 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -40,7 +40,6 @@
 
 #include SDL_INCLUDE_FILE
 
-#include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -49,8 +48,6 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c
index a509d2378646ca75b31a0e485a2b485ef09cf828..1ac557fa6d5a74f5b39f3d859267a9c5f0491be1 100644 (file)
--- a/plugins/sdl/vout_sdl.c
+++ b/plugins/sdl/vout_sdl.c
@@ -2,7 +2,7 @@
  * vout_sdl.c: SDL video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_sdl.c,v 1.66 2001/12/03 16:18:37 sam Exp $
+ * $Id: vout_sdl.c,v 1.67 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Pierre Baillet <oct@zoy.org>
@@ -42,7 +42,6 @@
 
 #include SDL_INCLUDE_FILE
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -55,7 +54,6 @@
 #include "interface.h"
 /* FIXME: get rid of this */
 #include "keystrokes.h"
-#include "main.h"
 #include "netutils.h"
 
 #include "modules.h"
@@ -594,20 +592,20 @@ static void vout_Display( vout_thread_t *p_vout )
                 SDL_LockYUVOverlay( p_vout->p_sys->p_overlay );
                 /* copy the data into video buffers */
                 /* Y first */
-                pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[0],
-                                p_vout->p_rendered_pic->p_y,
-                                p_vout->p_sys->p_overlay->h *
-                                p_vout->p_sys->p_overlay->pitches[0] );
+                p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[0],
+                                     p_vout->p_rendered_pic->p_y,
+                                     p_vout->p_sys->p_overlay->h *
+                                     p_vout->p_sys->p_overlay->pitches[0] );
                 /* then V */
-                pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[1],
-                                p_vout->p_rendered_pic->p_v,
-                                p_vout->p_sys->p_overlay->h *
-                                p_vout->p_sys->p_overlay->pitches[1] / 2 );
+                p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[1],
+                                     p_vout->p_rendered_pic->p_v,
+                                     p_vout->p_sys->p_overlay->h *
+                                     p_vout->p_sys->p_overlay->pitches[1] / 2 );
                 /* and U */
-                pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[2],
-                                p_vout->p_rendered_pic->p_u,
-                                p_vout->p_sys->p_overlay->h *
-                                p_vout->p_sys->p_overlay->pitches[2] / 2 );
+                p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[2],
+                                     p_vout->p_rendered_pic->p_u,
+                                     p_vout->p_sys->p_overlay->h *
+                                     p_vout->p_sys->p_overlay->pitches[2] / 2 );
 
                 OutputCoords( p_vout->p_rendered_pic, 1,
                               p_vout->p_sys->i_width,

diff --git a/plugins/text/intf_ncurses.c b/plugins/text/intf_ncurses.c
index 9a99cb1b82c7b6cf3f479e4855bc9dbda287d9d3..f286bf6a77b16d7df94646d3796041676b664a58 100644 (file)
--- a/plugins/text/intf_ncurses.c
+++ b/plugins/text/intf_ncurses.c
@@ -2,7 +2,7 @@
  * intf_ncurses.c: ncurses interface
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_ncurses.c,v 1.6 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_ncurses.c,v 1.7 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -36,7 +36,6 @@
 
 #include <curses.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -49,8 +48,6 @@
 #include "interface.h"
 
 #include "modules.h"
-#include "main.h"
-
 #include "modules_export.h"
 
 /*****************************************************************************

diff --git a/plugins/vcd/input_vcd.c b/plugins/vcd/input_vcd.c
index 7f644ed7f36983dc433538c2f4376abd18e5a379..4cb3920988b9bbba7b506e8122fa7e50e0fa0af4 100644 (file)
--- a/plugins/vcd/input_vcd.c
+++ b/plugins/vcd/input_vcd.c
@@ -50,8 +50,6 @@
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
-
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -62,8 +60,6 @@
 #   include "input_iovec.h"
 #endif
 
-#include "main.h"
-
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
@@ -598,8 +594,8 @@ static int VCDRead( input_thread_t * p_input,
     
             if( U32_AT(p_buffer) != 0x1B9 )
             {
-                pf_fast_memcpy( p_data->p_buffer, p_buffer + i_index,
-                                6 + i_packet_size );
+                p_main->fast_memcpy( p_data->p_buffer, p_buffer + i_index,
+                                     6 + i_packet_size );
                 i_index += ( 6 + i_packet_size );
     
             }

diff --git a/plugins/vcd/linux_cdrom_tools.c b/plugins/vcd/linux_cdrom_tools.c
index 93d0ad10fff96c821c42733a19dccc88efe740ae..2286d52235932abbd88cd55ee1997a4f25610c17 100644 (file)
--- a/plugins/vcd/linux_cdrom_tools.c
+++ b/plugins/vcd/linux_cdrom_tools.c
@@ -51,7 +51,6 @@
 
 #include <sys/ioctl.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -62,8 +61,6 @@
 #   include "input_iovec.h"
 #endif
 
-#include "main.h"
-
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"

diff --git a/plugins/x11/vout_x11.c b/plugins/x11/vout_x11.c
index 2ea7eb4b0a973dd6d1762ce69c764a65b8f5ec55..af43f99b293a537f2ec0fe6adbf5b941283bbb81 100644 (file)
--- a/plugins/x11/vout_x11.c
+++ b/plugins/x11/vout_x11.c
@@ -2,7 +2,7 @@
  * vout_x11.c: X11 video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_x11.c,v 1.32 2001/11/28 15:08:06 massiot Exp $
+ * $Id: vout_x11.c,v 1.33 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -52,7 +52,6 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XShm.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -66,8 +65,6 @@
 
 #include "netutils.h"                                 /* network_ChannelJoin */
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 

diff --git a/plugins/x11/vout_xvideo.c b/plugins/x11/vout_xvideo.c
index d04c0119b77a766c6a6cc04cb9483104c4ff0a1f..a50612f20387d296b494a58274b2e4b2190346b0 100644 (file)
--- a/plugins/x11/vout_xvideo.c
+++ b/plugins/x11/vout_xvideo.c
@@ -2,7 +2,7 @@
  * vout_xvideo.c: Xvideo video output display method
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_xvideo.c,v 1.35 2001/12/06 10:53:42 massiot Exp $
+ * $Id: vout_xvideo.c,v 1.36 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -56,7 +56,6 @@
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/dpms.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -70,8 +69,6 @@
 
 #include "netutils.h"                                 /* network_ChannelJoin */
 
-#include "main.h"
-
 #include "stream_control.h"                 /* needed by input_ext-intf.h... */
 #include "input_ext-intf.h"
 
@@ -680,12 +677,13 @@ static void vout_Display( vout_thread_t *p_vout )
         break;
 
     case YUV_420_PICTURE:
-        pf_fast_memcpy( p_vout->p_sys->p_xvimage->data,
-                        p_vout->p_rendered_pic->p_y, i_size );
-        pf_fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ),
-                        p_vout->p_rendered_pic->p_v, i_size / 4 );
-        pf_fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ) + ( i_size / 4 ),
-                        p_vout->p_rendered_pic->p_u, i_size / 4 );
+        p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data,
+                             p_vout->p_rendered_pic->p_y, i_size );
+        p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ),
+                             p_vout->p_rendered_pic->p_v, i_size / 4 );
+        p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data
+                                 + ( i_size ) + ( i_size / 4 ),
+                             p_vout->p_rendered_pic->p_u, i_size / 4 );
         break;
     }
 

diff --git a/src/audio_output/aout_ext-dec.c b/src/audio_output/aout_ext-dec.c
index d185ef95151b8f98b57ad44bdc7cf5d1b9560e5f..aace8e4aed616188242a9c7ac38201fd5259befe 100644 (file)
--- a/src/audio_output/aout_ext-dec.c
+++ b/src/audio_output/aout_ext-dec.c
@@ -2,7 +2,7 @@
  * aout_ext-dec.c : exported fifo management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_ext-dec.c,v 1.6 2001/11/28 15:08:06 massiot Exp $
+ * $Id: aout_ext-dec.c,v 1.7 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *
@@ -30,7 +30,6 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -39,8 +38,6 @@
 #include "audio_output.h"
 #include "aout_common.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * aout_CreateFifo
  *****************************************************************************/

diff --git a/src/audio_output/aout_s16.c b/src/audio_output/aout_s16.c
index 392399f7429da042a01d49d69cf953c28218a561..5712d981d662fad312c05a1540d18be2533d9dea 100644 (file)
--- a/src/audio_output/aout_s16.c
+++ b/src/audio_output/aout_s16.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -38,8 +37,6 @@
 #include "audio_output.h"
 #include "aout_common.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/audio_output/aout_u8.c b/src/audio_output/aout_u8.c
index 24196cce59dcb71b81210d83dae780b39268fa4d..f34c858644164dc67ebf9e76a15faff7b95708dc 100644 (file)
--- a/src/audio_output/aout_u8.c
+++ b/src/audio_output/aout_u8.c
@@ -2,7 +2,7 @@
  * aout_u8.c: 8 bit unsigned audio output functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_u8.c,v 1.8 2001/12/06 10:53:42 massiot Exp $
+ * $Id: aout_u8.c,v 1.9 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *
@@ -30,7 +30,6 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -39,8 +38,6 @@
 #include "audio_output.h"
 #include "aout_common.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c
index 093a2947be9ac72f7816cca209f82a323db47d4c..93a2873510c4a28e6890f3978d1d8be1baf8ef28 100644 (file)
--- a/src/audio_output/audio_output.c
+++ b/src/audio_output/audio_output.c
@@ -2,7 +2,7 @@
  * audio_output.c : audio output thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: audio_output.c,v 1.67 2001/12/06 10:53:42 massiot Exp $
+ * $Id: audio_output.c,v 1.68 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *
@@ -38,7 +38,6 @@
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 #include <string.h>
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 #include "threads.h"
@@ -48,8 +47,6 @@
 #include "audio_output.h"
 #include "aout_common.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/input/input.c b/src/input/input.c
index 1eca5e2b69be00d177813f82d1d2a7def4b2b9c4..c3f76a42e4de3c082992ee77e13eaa87e66c319c 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.162 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input.c,v 1.163 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -62,7 +62,6 @@
 #   include <sys/times.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -80,8 +79,6 @@
 
 #include "interface.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/input/input_clock.c b/src/input/input_clock.c
index 98be4627113880de86ea6766cf9b1dfd4fa9e7ec..37b418ee683d980fead79456ead9f7df0be712fd 100644 (file)
--- a/src/input/input_clock.c
+++ b/src/input/input_clock.c
@@ -2,7 +2,7 @@
  * input_clock.c: Clock/System date convertions, stream management
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_clock.c,v 1.26 2001/12/06 10:53:42 massiot Exp $
+ * $Id: input_clock.c,v 1.27 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -29,7 +29,6 @@
 #include <string.h>                                    /* memcpy(), memset() */
 #include <sys/types.h>                                              /* off_t */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -40,8 +39,6 @@
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
 
-#include "main.h"
-
 /*
  * DISCUSSION : SYNCHRONIZATION METHOD
  *

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 7f219b35469d2d55d1b4f6d7e485b63cb1d2e015..96e4d83c25d29fa341026f2bbcbbdd0b36571f36 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_programs.c,v 1.68 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_programs.c,v 1.69 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -30,7 +30,6 @@
 #include <string.h>                                    /* memcpy(), memset() */
 #include <sys/types.h>                                              /* off_t */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -42,8 +41,6 @@
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
 
-#include "main.h"                                     /* --noaudio --novideo */
-
 /*
  * NOTICE : all of these functions expect you to have taken the lock on
  * p_input->stream.lock

diff --git a/src/input/mpeg_system.c b/src/input/mpeg_system.c
index f655227b3183b50f168218bd644b6e7d3a24b89f..c6374a2df98e65810769b3022ad10f898bb167aa 100644 (file)
--- a/src/input/mpeg_system.c
+++ b/src/input/mpeg_system.c
@@ -2,7 +2,7 @@
  * mpeg_system.c: TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: mpeg_system.c,v 1.68 2001/12/05 03:31:04 jobi Exp $
+ * $Id: mpeg_system.c,v 1.69 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -34,7 +34,6 @@
 #include <string.h>                                    /* memcpy(), memset() */
 #include <sys/types.h>                                              /* off_t */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -45,8 +44,6 @@
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
 
-#include "main.h"                   /* AC3/MPEG channel, SPU channel, b_stat */
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/interface/interface.c b/src/interface/interface.c
index e690310e0e0f807fc532cf2a4d267221a4bb7f08..0b9d18b9e1081bbfc500f645181081183ab5646b 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -4,7 +4,7 @@
  * interface, such as command line.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.81 2001/11/28 15:08:06 massiot Exp $
+ * $Id: interface.c,v 1.82 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -34,7 +34,6 @@
 #include <string.h>                                            /* strerror() */
 #include <sys/types.h>                                              /* off_t */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -54,8 +53,6 @@
 #include "video.h"
 #include "video_output.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/interface/intf_channels.c b/src/interface/intf_channels.c
index ef364e8975808e5ad833ce8b98dceafb996f2ea9..0eb6070a63a9ce6410e6b6e928649ea8ad1db475 100644 (file)
--- a/src/interface/intf_channels.c
+++ b/src/interface/intf_channels.c
@@ -2,7 +2,7 @@
  * intf_channels.c: channel handling functions
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: intf_channels.c,v 1.4 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_channels.c,v 1.5 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -31,7 +31,6 @@
 #include <stdio.h>                                                   /* FILE */
 #include <string.h>                                            /* strerror() */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -40,8 +39,6 @@
 #include "intf_channels.h"
 #include "interface.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/interface/intf_msg.c b/src/interface/intf_msg.c
index 6b1a005bbdef50d9c6199574bc9d26cbc93b6fb8..eb0ff2d85dea230e8486626a535a8a035eaac775 100644 (file)
--- a/src/interface/intf_msg.c
+++ b/src/interface/intf_msg.c
@@ -4,7 +4,7 @@
  * interface, such as message output. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: intf_msg.c,v 1.39 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_msg.c,v 1.40 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -39,7 +39,6 @@
 #include <unistd.h>                                      /* close(), write() */
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -47,8 +46,6 @@
 
 #include "interface.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * intf_msg_item_t
  *****************************************************************************

diff --git a/src/interface/intf_playlist.c b/src/interface/intf_playlist.c
index cce4558ec780ed60f0d51a7147bce08a258c6435..d7e2639f775a9bca2c9f460bcfbc13ba30021c87 100644 (file)
--- a/src/interface/intf_playlist.c
+++ b/src/interface/intf_playlist.c
@@ -2,7 +2,7 @@
  * intf_playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_playlist.c,v 1.10 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_playlist.c,v 1.11 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,15 +27,12 @@
 #include <string.h>                                            /* strerror() */
 #include <errno.h>                                                 /* ENOMEM */
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
 
 #include "intf_playlist.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/interface/main.c b/src/interface/main.c
index f2427de23355520eb8b6c188de4ccdf7d1d0b92f..614eb931409e3ade8d76e93e9ed63f787b97b18f 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.131 2001/12/06 10:53:42 massiot Exp $
+ * $Id: main.c,v 1.132 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -64,7 +64,6 @@
 #include <fcntl.h>                                       /* open(), O_WRONLY */
 #include <sys/stat.h>                                             /* S_IREAD */
 
-#include "config.h"
 #include "common.h"
 #include "debug.h"
 #include "intf_msg.h"
@@ -98,8 +97,6 @@
 
 #include "netutils.h"                                 /* network_ChannelJoin */
 
-#include "main.h"
-
 /*****************************************************************************
  * Command line options constants. If something is changed here, be sure that
  * GetConfiguration and Usage are also changed.
@@ -241,7 +238,6 @@ main_t        *p_main;
 module_bank_t *p_module_bank;
 aout_bank_t   *p_aout_bank;
 vout_bank_t   *p_vout_bank;
-void*       ( *pf_fast_memcpy ) ( void *, const void *, size_t );
 
 /*****************************************************************************
  * Local prototypes
@@ -394,12 +390,12 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     {
         intf_ErrMsg( "intf error: no suitable memcpy module, "
                      "using libc default" );
-        pf_fast_memcpy = memcpy;
+        p_main->fast_memcpy = memcpy;
     }
     else
     {
 #define f p_main->p_memcpy_module->p_functions->memcpy.functions.memcpy
-        pf_fast_memcpy = f.pf_fast_memcpy;
+        p_main->fast_memcpy = f.fast_memcpy;
 #undef f
     }
 

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 45168731c909b146e55ca09600690c4c6c075d75..46c550910c964b5679c93f3e39c9915726b3429d 100644 (file)
--- 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.43 2001/11/28 15:08:06 massiot Exp $
+ * $Id: modules.c,v 1.44 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -23,8 +23,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include "config.h"
-
 /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
  * is set to 64. Don't try to be cleverer. */
 #ifdef _FILE_OFFSET_BITS
@@ -88,8 +86,6 @@
 #include "modules_builtin.h"
 #include "modules_export.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index 1c4ae12a925bd2cd1ef234967eb08e64a2d574dd..a0a12b689740f72e85602543ad59e59d8c667752 100644 (file)
--- a/src/misc/netutils.c
+++ b/src/misc/netutils.c
@@ -2,7 +2,7 @@
  * netutils.c: various network functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.52 2001/11/28 15:08:06 massiot Exp $
+ * $Id: netutils.c,v 1.53 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Benoit Steiner <benny@via.ecp.fr>
@@ -77,12 +77,10 @@
 #include <sys/sockio.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "mtime.h"
 #include "intf_msg.h"
 #include "threads.h"
-#include "main.h"
 
 #include "intf_playlist.h"
 

diff --git a/src/misc/tests.c b/src/misc/tests.c
index b7ae9cdfede920adb2e45c840abb18da03a95a18..7b560f519927647112f3e6d959cf045eafae10c4 100644 (file)
--- a/src/misc/tests.c
+++ b/src/misc/tests.c
@@ -3,7 +3,7 @@
  * Functions are prototyped in tests.h.
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: tests.c,v 1.8 2001/11/28 15:08:06 massiot Exp $
+ * $Id: tests.c,v 1.9 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *
@@ -29,14 +29,10 @@
 
 #include <string.h>                                    /* memcpy(), memset() */
 
-#include "config.h"
 #include "common.h"
-
 #include "intf_msg.h"
 #include "tests.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * TestProgram: tests if the given string equals the program name
  *****************************************************************************/

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 8629902b8acde418a3d2ee1361080acb91221a38..1053aa05705793682bfe6c3ff9649b171b0f3224 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.144 2001/11/28 15:08:06 massiot Exp $
+ * $Id: video_output.c,v 1.145 2001/12/07 18:33:08 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -38,7 +38,6 @@
 #   include <sys/times.h>
 #endif
 
-#include "config.h"
 #include "common.h"
 #include "intf_msg.h"
 #include "threads.h"
@@ -51,8 +50,6 @@
 #include "video_spu.h"
 #include "video_yuv.h"
 
-#include "main.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/