diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-04 20:32:21 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-04 20:32:21 +0000 |
| commit | 0c185d95e2e3ff8c4008cc49553ea487c865248d (patch) | |
| tree | 3df4b1de515ccec5410b4b8eb27eaf2187d22482 /libmpdemux | |
| parent | 425b08fcc67c5c1e6880c172c9b854b5a2dfe39f (diff) | |
| download | mpv-0c185d95e2e3ff8c4008cc49553ea487c865248d.tar.bz2 mpv-0c185d95e2e3ff8c4008cc49553ea487c865248d.tar.xz | |
temporary disable mf support for systems without glob
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9834 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/mf.c | 10 | ||||
| -rw-r--r-- | libmpdemux/yuv4mpeg.h | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index 908aa98449..18ec48e623 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -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 @@ float mf_fps = 25.0; 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 @@ mf_t* open_mf(char * filename){ 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 } diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 7ada483967..af8293b202 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -31,6 +31,10 @@ //#include "mp_msg.h" #include "stream.h" +#ifdef __MINGW32__ +typedef long ssize_t; +#endif + /************************************************************************ * error codes returned by y4m_* functions |