From: Clément Bœsch <u@pkh.me>
Date: Sat, 20 May 2017 14:31:37 +0000 (+0200)
Subject: Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=068d91885ffdc858796ef73ada2a88b8313d9465;p=ffmpeg

Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'

* commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce':
  build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4

Merged-by: Clément Bœsch <u@pkh.me>
---

068d91885ffdc858796ef73ada2a88b8313d9465
diff --cc configure
index de290b199b1,dde78b86575..f377b480dd2
--- a/configure
+++ b/configure
@@@ -3886,10 -3069,11 +3887,12 @@@ msvc_flags()
      msvc_common_flags "$@"
      for flag; do
          case $flag in
-             -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
+             -Wall)                echo -W3 -wd4018 -wd4146 -wd4244 -wd4305     \
+                                        -wd4554 ;;
+             -Wextra)              echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
 +                                       -wd4307 \
                                         -wd4273 -wd4554 -wd4701 -wd4703 ;;
          esac
      done