ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Fri May 19 11:21:41 2017 +0200| [42ed79a2294ca08e3902bd92003d4ccd9cf464ef] | committer: Clément Bœsch
Merge commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a' * commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a': OS/2: Try to commit memory above 1GB Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42ed79a2294ca08e3902bd92003d4ccd9cf464ef --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 18fbb73045..250e067df4 100755 --- a/configure +++ b/configure @@ -4971,7 +4971,7 @@ case $target_os in strip="lxlite -CS" objformat="aout" add_cppflags -D_GNU_SOURCE - add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap + add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' LIBSUF="_s.a" SLIBPREF="" ====================================================================== diff --cc configure index 18fbb73045,53dd809b86..250e067df4 --- a/configure +++ b/configure @@@ -4968,10 -3961,10 +4968,10 @@@ case $target_os i ranlib="echo ignoring ranlib" ;; os/2*) - ln_s="cp -f" + strip="lxlite -CS" objformat="aout" add_cppflags -D_GNU_SOURCE - add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap + add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' LIBSUF="_s.a" SLIBPREF="" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog