[Mplayer-cvslog] CVS: main/libmpdemux mf.c,1.7,1.8 yuv4mpeg.h,1.1,1.2

Sascha Sommer CVS faust3 at mplayerhq.hu
Fri Apr 4 22:32:43 CEST 2003


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv2094

Modified Files:
	mf.c yuv4mpeg.h 
Log Message:
temporary disable mf support for systems without glob

Index: mf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mf.c	30 Mar 2003 17:07:31 -0000	1.7
+++ mf.c	4 Apr 2003 20:32:21 -0000	1.8
@@ -5,13 +5,16 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <glob.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include "config.h"
 
+#ifdef HAVE_GLOB
+#include <glob.h>
+#endif
+
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "stream.h"
@@ -24,6 +27,7 @@
 char * mf_type = NULL; //"jpg";
 
 mf_t* open_mf(char * filename){
+#ifdef HAVE_GLOB
  glob_t        gg;
  struct stat   fs;
  int           i;
@@ -110,5 +114,9 @@
 exit_mf:
  free( fname );
  return mf;
+#else
+ mp_msg(MSGT_STREAM,MSGL_FATAL,"[mf] mf support is disabled on your os\n");
+ return 0;
+#endif
 }
 

Index: yuv4mpeg.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/yuv4mpeg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yuv4mpeg.h	27 Dec 2001 02:08:31 -0000	1.1
+++ yuv4mpeg.h	4 Apr 2003 20:32:21 -0000	1.2
@@ -31,6 +31,10 @@
 //#include "mp_msg.h"
 #include "stream.h"
 
+#ifdef __MINGW32__
+typedef long ssize_t;
+#endif
+
 
 /************************************************************************
  *  error codes returned by y4m_* functions



More information about the MPlayer-cvslog mailing list