[FFmpeg-cvslog] avutil: Include io. h with a separate condition from windows console functions

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Fri Nov 30 16:56:54 2012 +0200| [b70abd5b614341947ce7d81c1de97877dec5f35e] | committer: Martin Storsjö

avutil: Include io.h with a separate condition from windows console functions

Not all versions of windows have the console color functions,
while io.h might be needed for isatty (which can be found in
unistd.h or io.h).

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b70abd5b614341947ce7d81c1de97877dec5f35e
---

 libavutil/log.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/log.c b/libavutil/log.c
index d2cf88f..d335944 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -29,6 +29,9 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#if HAVE_IO_H
+#include <io.h>
+#endif
 #include <stdlib.h>
 #include "avstring.h"
 #include "avutil.h"
@@ -40,7 +43,6 @@ static int flags;
 
 #if defined(_WIN32) && !defined(__MINGW32CE__)
 #include <windows.h>
-#include <io.h>
 static const uint8_t color[] = { 12, 12, 12, 14, 7, 10, 11 };
 static int16_t background, attr_orig;
 static HANDLE con;