diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:38:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:52:25 +0200 |
| commit | 31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba (patch) | |
| tree | 321a6eb57e018866779df59bc4ef6144d4780a40 /doc | |
| parent | 48a40e09c4858c43627d9bc25efc3c47efdde5af (diff) | |
| parent | 90c9edba58eddf39e77937a6c602d7ff289c9bfd (diff) | |
| download | ffmpeg-31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 3 | ||||
| -rw-r--r-- | doc/platform.texi | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/general.texi b/doc/general.texi index 2fbcbbf20a..876a0f3397 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -13,7 +13,8 @@ FFmpeg can be hooked up with a number of external libraries to add support for more formats. None of them are used by default, their use has to be -explicitly requested by passing the appropriate flags to @file{./configure}. +explicitly requested by passing the appropriate flags to +@command{./configure}. @section OpenJPEG diff --git a/doc/platform.texi b/doc/platform.texi index d0db8aed62..dcbb0f6437 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -27,11 +27,11 @@ to configure. @section BSD BSD make will not build FFmpeg, you need to install and use GNU Make -(@file{gmake}). +(@command{gmake}). @section (Open)Solaris -GNU Make is required to build FFmpeg, so you have to invoke (@file{gmake}), +GNU Make is required to build FFmpeg, so you have to invoke (@command{gmake}), standard Solaris Make will not work. When building with a non-c99 front-end (gcc, generic suncc) add either @code{--extra-libs=/usr/lib/values-xpg6.o} or @code{--extra-libs=/usr/lib/64/values-xpg6.o} to the configure options @@ -272,7 +272,7 @@ To create import libraries that work with the @code{/OPT:REF} option @enumerate -@item Open @file{Visual Studio 2005 Command Prompt}. +@item Open @emph{Visual Studio 2005 Command Prompt}. Alternatively, in a normal command line prompt, call @file{vcvars32.bat} which sets up the environment variables for the Visual C++ tools @@ -282,7 +282,7 @@ which sets up the environment variables for the Visual C++ tools @item Enter the @file{bin} directory where the created LIB and DLL files are stored. -@item Generate new import libraries with @file{lib.exe}: +@item Generate new import libraries with @command{lib.exe}: @example lib /machine:i386 /def:..\lib\foo-version.def /out:foo.lib |