aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-07-11 21:45:45 +0000
committerDiego Biurrun <diego@biurrun.de>2006-07-11 21:45:45 +0000
commit2f30a81d192b90fd3b12f2ce40227ed74a331b6d (patch)
treedbdaf9dd7f5862237d81bd3dec64c1572be744c0 /ffmpeg.c
parent3dc7174e9dbe0d12d84b6159e6733d3865ed53f5 (diff)
downloadffmpeg-2f30a81d192b90fd3b12f2ce40227ed74a331b6d.tar.gz
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead. Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a005d7fc66..473185fef2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -23,7 +23,7 @@
#include "dsputil.h"
#include "opt.h"
-#ifndef CONFIG_WIN32
+#ifndef __MINGW32__
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
@@ -317,7 +317,7 @@ typedef struct AVInputFile {
int nb_streams; /* nb streams we are aware of */
} AVInputFile;
-#ifndef CONFIG_WIN32
+#ifndef __MINGW32__
/* init terminal so that we can grab keys */
static struct termios oldtty;
@@ -1896,7 +1896,7 @@ static int av_encode(AVFormatContext **output_files,
}
}
-#ifndef CONFIG_WIN32
+#ifndef __MINGW32__
if ( !using_stdin && verbose >= 0) {
fprintf(stderr, "Press [q] to stop encoding\n");
url_set_interrupt_cb(decode_interrupt_cb);
@@ -3585,7 +3585,7 @@ static void opt_pass(const char *pass_str)
do_pass = pass;
}
-#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
+#if defined(__MINGW32__) || defined(CONFIG_OS2)
static int64_t getutime(void)
{
return av_gettime();
@@ -4299,7 +4299,7 @@ int main(int argc, char **argv)
powerpc_display_perf_report();
#endif /* POWERPC_PERFORMANCE_REPORT */
-#ifndef CONFIG_WIN32
+#ifndef __MINGW32__
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",