summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-31 14:15:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-31 14:20:01 +0100
commit08196c785a1df33da435c5a669c9c560f647290c (patch)
tree2f1e51c4f37f40cbcdff0c9858f0ae2acf5649ef /configure
parent98275283d52622c16a6d59f508de7d40216e8b63 (diff)
parent506409776c49910050f3150d0e51d11b44d323ed (diff)
downloadffmpeg-streaming-08196c785a1df33da435c5a669c9c560f647290c.zip
ffmpeg-streaming-08196c785a1df33da435c5a669c9c560f647290c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: suppress -fPIC in msvc builds Drop unnecessary 'l' length modifier when printfing double values. truemotion2: Sanitize tm2_read_header() Conflicts: libavcodec/truemotion2.c libavfilter/src_movie.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index faea887..32f7eb1 100755
--- a/configure
+++ b/configure
@@ -2448,6 +2448,7 @@ msvc_flags(){
-fno-math-errno) ;;
-fno-common) ;;
-fno-signed-zeros) ;;
+ -fPIC) ;;
-lz) echo zlib.lib ;;
-lavifil32) echo vfw32.lib ;;
-lavicap32) echo vfw32.lib user32.lib ;;
OpenPOWER on IntegriCloud