aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-17 19:52:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-17 19:58:02 +0100
commit33a79e443b8611c8df4752373bc3322e85a03b1f (patch)
treebd97ffcb05f2c6fd4395b85d497c97bd2b0f58e6 /configure
parent13f8bbfb7051093e27ca2f4305f8a8bf88b679c9 (diff)
parent91894f27dce531c13d7e1be20253877f2e1e9e66 (diff)
downloadffmpeg-33a79e443b8611c8df4752373bc3322e85a03b1f.tar.gz
Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'
* commit '91894f27dce531c13d7e1be20253877f2e1e9e66': configure: Disable shift operator precedence warnings with MSVC Conflicts: configure See: 9e208ce6dd94596b4185a93af4aab3dcd28eb5b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure b/configure
index 586c26bb06..1bf8f8069c 100755
--- a/configure
+++ b/configure
@@ -3257,8 +3257,7 @@ msvc_flags(){
-Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \
-wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
-wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
- -wd4554 \
- -wd4273 -wd4701 ;;
+ -wd4273 -wd4554 -wd4701 ;;
esac
done
}