Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)
* qatar/master:
  log: Include io.h on windows
  lavr: x86: merge some branches
  x86: cpu: whitespace (mostly) cosmetics
  x86: fft: win64: fix stack alignment for memcpy() call

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/fft_mmx.asm
libavutil/log.c
libavutil/x86/cpu.c

Simple merge
diff --cc libavutil/log.c
@@@ -40,25 -39,8 +40,26 @@@ static int flags
  
  #if defined(_WIN32) && !defined(__MINGW32CE__)
  #include <windows.h>
 -static const uint8_t color[] = { 12, 12, 12, 14, 7, 10, 11 };
+ #include <io.h>
 +static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
 +    [AV_LOG_PANIC  /8] = 12,
 +    [AV_LOG_FATAL  /8] = 12,
 +    [AV_LOG_ERROR  /8] = 12,
 +    [AV_LOG_WARNING/8] = 14,
 +    [AV_LOG_INFO   /8] =  7,
 +    [AV_LOG_VERBOSE/8] = 10,
 +    [AV_LOG_DEBUG  /8] = 10,
 +    [16+AV_CLASS_CATEGORY_NA              ] =  7,
 +    [16+AV_CLASS_CATEGORY_INPUT           ] = 13,
 +    [16+AV_CLASS_CATEGORY_OUTPUT          ] =  5,
 +    [16+AV_CLASS_CATEGORY_MUXER           ] = 13,
 +    [16+AV_CLASS_CATEGORY_DEMUXER         ] =  5,
 +    [16+AV_CLASS_CATEGORY_ENCODER         ] = 11,
 +    [16+AV_CLASS_CATEGORY_DECODER         ] =  3,
 +    [16+AV_CLASS_CATEGORY_FILTER          ] =  1,
 +    [16+AV_CLASS_CATEGORY_BITSTREAM_FILTER] =  9,
 +};
 +
  static int16_t background, attr_orig;
  static HANDLE con;
  #define set_color(x)  SetConsoleTextAttribute(con, background | color[x])
Simple merge