[MPlayer-cvslog] CVS: main edl.c,1.2,1.3 edl.h,1.4,1.5

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv10281

Modified Files:
	edl.c edl.h 
Log Message:
several sets of headers declare global variables in them, which causes multiple definition errors with gcc 4.x
patch by Alexander Strange <astrange ithinksw.com>


Index: edl.c
===================================================================
RCS file: /cvsroot/mplayer/main/edl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- edl.c	17 Sep 2004 02:28:44 -0000	1.2
+++ edl.c	29 Jan 2005 12:24:42 -0000	1.3
@@ -5,6 +5,9 @@
 #include "edl.h"
 #include "help_mp.h"
 
+char *edl_filename; // file to extract EDL entries from (-edl)
+char *edl_output_filename; // file to put EDL entries in (-edlout)
+
 #ifdef USE_EDL
 
 /**

Index: edl.h
===================================================================
RCS file: /cvsroot/mplayer/main/edl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- edl.h	17 Sep 2004 02:28:44 -0000	1.4
+++ edl.h	29 Jan 2005 12:24:42 -0000	1.5
@@ -23,8 +23,8 @@
 
 typedef struct edl_record* edl_record_ptr;
 
-char *edl_filename; // file to extract EDL entries from (-edl)
-char *edl_output_filename; // file to put EDL entries in (-edlout)
+extern char *edl_filename; // file to extract EDL entries from (-edl)
+extern char *edl_output_filename; // file to put EDL entries in (-edlout)
 
 int edl_check_mode(void); // we cannot do -edl and -edlout at the same time
 int edl_count_entries(void); // returns total number of entries needed