aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-22 18:43:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-22 18:43:26 +0200
commitde9e0386b2f01852e305faae62736f387cf5a18a (patch)
tree1ab3ed88057517ad9a89c0c3c90ca9e8227d656f
parent2346f2b5db595a9f2d0e23ae4faa34b8977f9704 (diff)
parentb0bfd09f88da8b7c7666faf0ac7d5e74559dba9f (diff)
downloadffmpeg-de9e0386b2f01852e305faae62736f387cf5a18a.tar.gz
Merge commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'
* commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f': configure: Suppress "potentially uninitialized variable" warnings from MSVC Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index f355dad1d7..5454caaadd 100755
--- a/configure
+++ b/configure
@@ -3181,7 +3181,7 @@ msvc_flags(){
-wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
-wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
-wd4554 \
- -wd4273 ;;
+ -wd4273 -wd4701 ;;
esac
done
}