[FFmpeg-cvslog] Merge commit '5bcc6f76f180d0f88269018727c92fc562fb8abb'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr  4 16:03:05 2017 -0300| [b9886e569a9c5748222b4ebf5f601823e3a6aeb6] | committer: James Almer

Merge commit '5bcc6f76f180d0f88269018727c92fc562fb8abb'

* commit '5bcc6f76f180d0f88269018727c92fc562fb8abb':
  configure: Disable warning C4703 with MSVC

Merged-by: James Almer <jamrial at gmail.com>

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

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index a631a1b..426fae1 100755
--- a/configure
+++ b/configure
@@ -3865,7 +3865,7 @@ msvc_flags(){
                                        -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                        -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
                                        -wd4307 \
-                                       -wd4273 -wd4554 -wd4701 ;;
+                                       -wd4273 -wd4554 -wd4701 -wd4703 ;;
         esac
     done
 }


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

diff --cc configure
index a631a1b,42c1848..426fae1
--- a/configure
+++ b/configure
@@@ -3864,8 -3056,7 +3864,8 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
 +                                       -wd4307 \
-                                        -wd4273 -wd4554 -wd4701 ;;
+                                        -wd4273 -wd4554 -wd4701 -wd4703 ;;
          esac
      done
  }