RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  configure: Use headers in the check for _beginthreadex for w32threads
  avutil: Use a configure check to enable windows console functions
  avutil: Include io.h with a separate condition from windows console functions

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-01 13:10:48 +01:00
parent 12cd992d67 3bbe63d1a4
commit 5473f6258c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1393,6 +1393,7 @@ HAVE_LIST="
sched_getaffinity
sdl
sdl_video_size
SetConsoleTextAttribute
setmode
setrlimit
Sleep
@ -3648,6 +3649,7 @@ check_func_headers windows.h GetProcessAffinityMask
check_func_headers windows.h GetProcessTimes
check_func_headers windows.h GetSystemTimeAsFileTime
check_func_headers windows.h MapViewOfFile
check_func_headers windows.h SetConsoleTextAttribute
check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc
check_func_headers glob.h glob
@ -3685,7 +3687,7 @@ if ! disabled vda && ! enabled ppc; then
fi
if ! disabled w32threads && ! enabled pthreads; then
check_func _beginthreadex && enable w32threads
check_func_headers "windows.h process.h" _beginthreadex && enable w32threads
fi
# check for some common methods of building with pthread support

8
libavutil/log.c
View File

@ -29,6 +29,9 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_IO_H
#include <io.h>
#endif
#include <stdlib.h>
#include "avutil.h"
#include "common.h"
@ -39,9 +42,8 @@
static int av_log_level = AV_LOG_INFO;
static int flags;
#if defined(_WIN32) && !defined(__MINGW32CE__)
#if HAVE_SETCONSOLETEXTATTRIBUTE
#include <windows.h>
#include <io.h>
static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
[AV_LOG_PANIC /8] = 12,
[AV_LOG_FATAL /8] = 12,
@ -101,7 +103,7 @@ static int use_color = -1;
static void colored_fputs(int level, const char *str)
{
if (use_color < 0) {
#if defined(_WIN32) && !defined(__MINGW32CE__)
#if HAVE_SETCONSOLETEXTATTRIBUTE
CONSOLE_SCREEN_BUFFER_INFO con_info;
con = GetStdHandle(STD_ERROR_HANDLE);
use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") &&