From 65a02096bc70699388f5392659ea75e059cac0d6 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Wed, 19 Jan 2005 16:12:46 +0000 Subject: [PATCH] Added indexing tags and instructions to install HTML documentation to FFmpeg git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3308 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- introduction/welcome/changelog.xml | 3 + multimedia/libdriv/xine-lib.xml | 14 ++-- multimedia/videoutils/ffmpeg.xml | 121 +++++++++++++++++++--------- multimedia/videoutils/transcode.xml | 2 +- 4 files changed, 97 insertions(+), 43 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 4d598f4d2a..a5b5dc98ab 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -22,6 +22,9 @@ who wrote what. +January 19th, 2005 [randy]: Added installation of +HTML documentation to the FFmpeg instructions. + January 17th, 2005 [randy]: Updated to AbiWord-2.2.3. diff --git a/multimedia/libdriv/xine-lib.xml b/multimedia/libdriv/xine-lib.xml index d084944e1d..4edad2354a 100644 --- a/multimedia/libdriv/xine-lib.xml +++ b/multimedia/libdriv/xine-lib.xml @@ -27,11 +27,15 @@ the flow of information from the source to the screen and speakers. Package information -Download (HTTP): -Download (FTP): +Download (HTTP): + +Download (FTP): + Download size: &xine-lib-size; -Estimated disk space required: &xine-lib-buildsize; -Estimated build time: &xine-lib-time; +Estimated disk space required: +&xine-lib-buildsize; +Estimated build time: +&xine-lib-time; Additional downloads @@ -50,7 +54,7 @@ url="&patch-root;/xine-lib-&xine-lib-version;-discover_smb-1.patch"/> Optional , -, +, , , , diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml index 19a3bf8b1b..446710101b 100644 --- a/multimedia/videoutils/ffmpeg.xml +++ b/multimedia/videoutils/ffmpeg.xml @@ -10,13 +10,15 @@ ]> - + $LastChangedBy$ $Date$ FFmpeg-&ffmpeg-version; + +FFmpeg Introduction to <application>FFmpeg</application> @@ -70,11 +72,16 @@ commands: source tree for information about optimizing the build. -./configure --prefix=/usr \ - --enable-shared --enable-pthreads && +./configure --prefix=/usr --enable-shared \ + --enable-pthreads --disable-ffplay && make && -make -C doc {ffmpeg,ffserver,ffplay}.1 && -make install +make -C doc {ffmpeg,ffserver,ffplay}.1 + +Now, as the root user: + +make install && +install -v -d -m755 /usr/share/doc/ffmpeg-&ffmpeg-version; && +install -v -m644 doc/*.html /usr/share/doc/ffmpeg-&ffmpeg-version; @@ -89,14 +96,15 @@ libraries. --enable-pthreads: This switch enables the build to link against the Posix threads library. +: Only installs the server part. +ffplay requires X for +building. Remove this option if X is +installed. + : Review the available options and codecs using the ./configure --help command. -: Only installs the server part. -ffplay requires X for -building. - make -C doc {ffmpeg,ffserver,ffplay}.1: This builds the man pages which are installed by make install. @@ -109,15 +117,22 @@ known to break the build. Configuring <application>FFmpeg</application> -Config files +Config files /etc/ffserver.conf and ~/.ffmpeg/ffserver-config + +~/.ffmpeg/ffserver-config + + +/etc/ffserver.conf + + You'll find a sample ffserver configuration file at (also doc/ffserver.conf in the source tree). - @@ -125,38 +140,70 @@ known to break the build. Contents -The FFmpeg package contains -ffmpeg, -ffserver, -ffplay, -libavcodec, -libavformat and -video hook modules. + +Installed Programs +Installed Libraries +Installed Directories + +ffmpeg, ffserver and optionally, ffplay +libavcodec.so, libavformat.so and video hook modules +/usr/include/ffmpeg, /usr/lib/vhook and +/usr/share/doc/ffmpeg-&ffmpeg-version; + + - + +Short Descriptions + -Description + +ffmpeg +is a command-line tool to convert video files, network streams +and input from a TV card to several video formats. + +ffmpeg + + -ffmpeg -ffmpeg is a command-line tool to convert video files, -network streams and input from a TV card to several video formats. - + +ffplay +is a very simple and portable media player using the +ffmpeg libraries and the SDL +library. + +ffplay + + -ffserver -ffserver is a streaming server for everything -that ffmpeg could use as input (files, streams, TV card -input, webcam, etc.). + +ffserver +is a streaming server for everything that +ffmpeg could use as input (files, streams, TV card input, +webcam, etc.). + +ffserver + + -ffplay -ffplay is a very simple and portable media -player using the ffmpeg libraries and the -SDL library. + +libavcodec.so +is a library containing the FFmpeg +codecs (both encoding and decoding). + +libavcodec.so + + -libavcodec/libavformat -libavcodec and -libavformats are libraries for -encoding/decoding video streams and putting them into files or network -packets. + +libavformat.so +is a library containing the file formats handling (mux and +demux code for several formats) used by ffplay as well as +allowing the generation of audio or video streams. + +libavformat.so + + + diff --git a/multimedia/videoutils/transcode.xml b/multimedia/videoutils/transcode.xml index a6ea8cd091..2fe12cdbad 100644 --- a/multimedia/videoutils/transcode.xml +++ b/multimedia/videoutils/transcode.xml @@ -62,7 +62,7 @@ url="&patch-root;/transcode-&transcode-version;-gcc34-1.patch"/> <application>Transcode</application> dependencies Required - + Recommended