Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Nov 2012 13:55:04 +0000 (14:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Nov 2012 13:55:12 +0000 (14:55 +0100)
* qatar/master:
  avutil: Include io.h with a separate condition from MapViewOfFile
  cmdutils: Use a configure check for enabling CommandLineToArgvW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c
configure
libavutil/file.c

diff --cc cmdutils.c
Simple merge
diff --cc configure
+++ b/configure
@@@ -1318,12 -1177,11 +1318,13 @@@ HAVE_LIST=
      arpa_inet_h
      asm_mod_q
      asm_mod_y
 +    asm_types_h
      attribute_may_alias
      attribute_packed
 +    clock_gettime
      closesocket
      cmov
+     CommandLineToArgvW
      cpunop
      CryptGenRandom
      dcbzl
Simple merge