aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Eldridge <bill@rfa.org>2002-12-20 19:25:10 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-12-20 19:25:10 +0000
commit9b2e001fc5e25f23673f977a3ad74dfcd367a2c7 (patch)
tree85776bf0146808b957d38145da40159a917abdf2
parente5e65a53cd2d9687693ea3f9ac438b1d7dce803c (diff)
downloadffmpeg-9b2e001fc5e25f23673f977a3ad74dfcd367a2c7.tar.gz
mingw patch by (Bill Eldridge <bill at rfa dot org>)
Originally committed as revision 1347 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/img.c5
-rw-r--r--libavformat/utils.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/img.c b/libavformat/img.c
index 189ef6e239..838db9a2ef 100644
--- a/libavformat/img.c
+++ b/libavformat/img.c
@@ -38,6 +38,11 @@ extern AVInputFormat ppmpipe_iformat;
extern AVOutputFormat ppmpipe_oformat;
extern AVOutputFormat yuv4mpegpipe_oformat;
+#ifdef __MINGW32__
+# include <windows.h>
+# define usleep(t) Sleep((t) / 1000)
+#endif
+
#define IMGFMT_YUV 1
#define IMGFMT_PGMYUV 2
#define IMGFMT_PGM 3
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d36df449b4..e5159495df 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -354,12 +354,14 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
}
/* XXX: suppress this hack for redirectors */
+#ifndef __MINGW32__
if (fmt == &redir_demux) {
err = redir_open(ic_ptr, &ic->pb);
url_fclose(&ic->pb);
av_free(ic);
return err;
}
+#endif
ic->iformat = fmt;