diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
| commit | 5d1b39f7e7381a2e837b9b6d43dede7de528da3c (patch) | |
| tree | 5d0f96c4324c637d436e1aaf2f45aee1eb9f99b6 /doc | |
| parent | ebd1edf36c81155e2817edaa056b0bc9eb21e8f5 (diff) | |
| parent | 2f138f0b7c36fe50b51e0d74bc913d14aea00c5e (diff) | |
| download | ffmpeg-5d1b39f7e7381a2e837b9b6d43dede7de528da3c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: clean up library installation rules
vf_drawtext: Remove some write-only variables.
libgsm: Drop const qualifier to silence compiler warning.
docs: Remove needless configure options
docs: Don't recommend adding --enable-memalign-hack
libvo-amrwbenc: Add braces to shut up gcc warning.
adts: Fix PCE copying.
Conflicts:
configure
doc/general.texi
subdir.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 8e3d4af706..f2f8ed4631 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1037,7 +1037,7 @@ diffutils Then run @example -./configure --enable-static --disable-shared +./configure @end example to make a static build. @@ -1084,7 +1084,7 @@ and add some special flags to your configure invocation. For a static build run @example -./configure --target-os=mingw32 --enable-static --disable-shared --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin +./configure --target-os=mingw32 --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin @end example and for a build with shared libraries |