* include/video.h: renamed this file to vlc_video.h to avoid name collisions

    with a couple of modules.

Makefile.am

@@ -194,7 +194,6 @@ HEADERS_include = \
 	include/stream_output.h \
 	include/announce.h \
 	include/variables.h \
-	include/video.h \
 	include/video_output.h \
 	include/vlc_common.h \
 	include/vlc_config.h \
@@ -205,6 +204,7 @@ HEADERS_include = \
 	include/vlc_playlist.h \
 	include/vlc_threads.h \
 	include/vlc_threads_funcs.h \
+	include/vlc_video.h \
 	include/vout_synchro.h \
 	include/win32_specific.h \
 	include/osd.h \

include/vlc/vout.h

@@ -2,7 +2,7 @@
  * vout.h: video output header for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vout.h,v 1.1 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout.h,v 1.2 2003/06/26 12:19:59 sam Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ extern "C" {
 /*****************************************************************************
  * Required internal headers
  *****************************************************************************/
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 # ifdef __cplusplus

include/video.h → include/vlc_video.h

 /*****************************************************************************
- * video.h: common video definitions
+ * vlc_video.h: common video definitions
  * This header is required by all modules which have to handle pictures. It
  * includes all common video types and constants.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video.h,v 1.63 2003/06/09 00:33:34 massiot Exp $
+ * $Id: vlc_video.h,v 1.1 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *

src/interface/interface.c

@@ -4,7 +4,7 @@
  * interface, such as command line.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.104 2003/06/24 13:33:49 sam Exp $
+ * $Id: interface.c,v 1.105 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -39,7 +39,7 @@
 
 #include "vlc_interface.h"
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 /*****************************************************************************

src/libvlc.c

@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.90 2003/06/24 13:33:49 sam Exp $
+ * $Id: libvlc.c,v 1.91 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -73,7 +73,7 @@
 
 #include "audio_output.h"
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 #include "libvlc.h"

src/misc/modules.c

@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.122 2003/06/24 13:33:49 sam Exp $
+ * $Id: modules.c,v 1.123 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -78,7 +78,7 @@
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 #include "vout_synchro.h"
 

src/misc/objects.c

@@ -2,7 +2,7 @@
  * objects.c: vlc_object_t handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.36 2003/06/24 13:33:49 sam Exp $
+ * $Id: objects.c,v 1.37 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -34,7 +34,7 @@
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 #include "audio_output.h"

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.226 2003/06/24 22:26:01 asmax Exp $
+ * $Id: video_output.c,v 1.227 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -35,7 +35,7 @@
 #   include <sys/times.h>
 #endif
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 #include <vlc/input.h>                 /* for input_thread_t and i_pts_delay */
 

src/video_output/video_text.c

@@ -2,7 +2,7 @@
  * video_text.c : text manipulation functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video_text.c,v 1.42 2003/01/19 03:16:24 sam Exp $
+ * $Id: video_text.c,v 1.43 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -47,7 +47,7 @@
 #   include <io.h>
 #endif
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 #include "video_text.h"
 

src/video_output/vout_pictures.c

@@ -2,7 +2,7 @@
  * vout_pictures.c : picture management functions
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vout_pictures.c,v 1.40 2003/06/09 00:33:34 massiot Exp $
+ * $Id: vout_pictures.c,v 1.41 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -31,7 +31,7 @@
 
 #include <vlc/vlc.h>
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 #include "vout_pictures.h"

src/video_output/vout_subpictures.c

@@ -2,7 +2,7 @@
  * vout_subpictures.c : subpicture management functions
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vout_subpictures.c,v 1.19 2003/01/30 12:38:13 gbazin Exp $
+ * $Id: vout_subpictures.c,v 1.20 2003/06/26 12:19:59 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -31,7 +31,7 @@
 
 #include <vlc/vlc.h>
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 
 /*****************************************************************************