Merge commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 16:43:26 +0000 (18:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 16:43:26 +0000 (18:43 +0200)
* commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f':
  configure: Suppress "potentially uninitialized variable" warnings from MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -3180,8 -2688,7 +3180,8 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
-                                        -wd4273 ;;
 +                                       -wd4554 \
+                                        -wd4273 -wd4701 ;;
          esac
      done
  }