[FFmpeg-devel] [PATCH 1/2] doc/platform: Move a caveat down to the notes section

Stefano Sabatini stefasab at gmail.com
Sat Oct 20 12:26:40 CEST 2012


On date Friday 2012-10-19 19:20:52 -0400, Derek Buitenhuis encoded:
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
>  doc/platform.texi |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/doc/platform.texi b/doc/platform.texi
> index 6047e71..0fc9563 100644
> --- a/doc/platform.texi
> +++ b/doc/platform.texi
> @@ -126,11 +126,6 @@ you want to run @uref{fate.html, FATE}.
>  To set up a proper MSVC environment in MSYS, you simply need to run
>  @code{msys.bat} from the Visual Studio command prompt.
>  
> -Caveat: Run @code{which link} to see which link you are using. If it is located
> -at @code{/bin/link.exe}, then you have the wrong link in your @code{PATH}.
> -Either move/remove that copy, or make sure MSVC's link.exe is higher up in your
> - at code{PATH} than coreutils'.
> -
>  Place @code{c99wrap.exe}, @code{c99conv.exe}, and @code{yasm.exe} somewhere
>  in your @code{PATH}.
>  
> @@ -152,6 +147,12 @@ Notes:
>  
>  @itemize
>  
> + at item It's possible that coreutils' @code{link.exe} conflicts with MSVC's linker.
> +You can find out by running @code{which link} to see which @code{link.exe} you
> +are using. If it is located at @code{/bin/link.exe}, then you have the wrong one
> +in your @code{PATH}. Either move/remove that copy, or make sure MSVC's link.exe
> +is higher up in your @code{PATH} than coreutils'.
> +

LGTM, thanks.
-- 
FFmpeg = Fabulous Frightening Maxi Pacific Eager God


More information about the ffmpeg-devel mailing list