diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-13 00:42:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-13 00:42:11 +0200 |
| commit | bb258fb995a42112d1fe14f53ec599b2cd19b707 (patch) | |
| tree | d7152f06fcff2c66509c57a5dd906ca225069ae1 /doc/general.texi | |
| parent | 896e59758a11ff645879098b5ebca2e753731b4e (diff) | |
| parent | 2cb6dec61c8e6676105de628ba20a5b3d162976e (diff) | |
| download | ffmpeg-bb258fb995a42112d1fe14f53ec599b2cd19b707.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Improve references to external URLs.
h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
dnxhdenc: Replace a forward declaration by the proper #include.
h264: move h264_mvpred.h include.
pix_fmt: Fix number of bits per component in yuv444p9be
lavf: deprecate AVFormatContext.timestamp
ffmpeg: merge input_files_ts_scale into InputStream.
ffmpeg: don't abuse a global for passing sample format from input to output
ffmpeg: don't abuse a global for passing channel layout from input to output
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
matroskaenc: make SSA default subtitle codec.
oggdec: prevent heap corruption.
Conflicts:
doc/developer.texi
doc/faq.texi
doc/general.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/general.texi b/doc/general.texi index f44e57359c..a52ce69a13 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -848,7 +848,7 @@ noticeable when running make for a second time (for example in @code{make install}). @item In order to compile FFplay, you must have the MinGW development library -of SDL. Get it from @url{http://www.libsdl.org}. +of @uref{http://www.libsdl.org/, SDL}. Edit the @file{bin/sdl-config} script so that it points to the correct prefix where SDL was installed. Verify that @file{sdl-config} can be launched from the MSYS command line. @@ -1044,8 +1044,7 @@ Then configure FFmpeg with the following options: (you can change the cross-prefix according to the prefix chosen for the MinGW tools). -Then you can easily test FFmpeg with Wine -(@url{http://www.winehq.com/}). +Then you can easily test FFmpeg with @uref{http://www.winehq.com/, Wine}. @subsection Compilation under Cygwin @@ -1084,8 +1083,8 @@ If you want to build FFmpeg with additional libraries, download Cygwin libogg-devel, libvorbis-devel @end example -These library packages are only available from Cygwin Ports -(@url{http://sourceware.org/cygwinports/}) : +These library packages are only available from +@uref{http://sourceware.org/cygwinports/, Cygwin Ports}: @example yasm, libSDL-devel, libdirac-devel, libfaac-devel, libgsm-devel, |