[FFmpeg-cvslog] Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat May 20 16:31:37 2017 +0200| [068d91885ffdc858796ef73ada2a88b8313d9465] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=068d91885ffdc858796ef73ada2a88b8313d9465
---

 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index de290b199b..f377b480dd 100755
--- a/configure
+++ b/configure
@@ -3861,6 +3861,7 @@ msvc_common_flags(){
             # specific filters, they must be specified here as well or else the
             # generic catch all at the bottom will print the original flag.
             -Wall)                ;;
+            -Wextra)              ;;
             -std=c99)             ;;
             # Common flags
             -fomit-frame-pointer) ;;
@@ -3886,7 +3887,9 @@ 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 \


======================================================================

diff --cc configure
index de290b199b,dde78b8657..f377b480dd
--- 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