MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refer to ff* tools by their lowercase names.

Browse Source
This commit is contained in:
Diego Biurrun 2011-04-23 16:40:01 +02:00
parent 43fb279f56
commit 3a50894eaa
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/faq.texi
View File

@ -280,7 +280,7 @@ Just create an "input.avs" text file with this single line ...
@example
DirectShowSource("C:\path to your file\yourfile.asf")
@end example
... and then feed that text file to FFmpeg:
... and then feed that text file to ffmpeg:
@example
ffmpeg -i input.avs
@end example
@ -348,7 +348,7 @@ ffmpeg -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \
rm temp[12].[av] all.[av]
@end example
@section FFmpeg does not adhere to the -maxrate setting, some frames are bigger than maxrate/fps.
@section The ffmpeg program does not respect the -maxrate setting, some frames are bigger than maxrate/fps.
Read the MPEG spec about video buffer verifier.

26
doc/ffmpeg.texi
View File

@ -22,17 +22,15 @@ ffmpeg [[infile options][@option{-i} @var{infile}]]... @{[outfile options] @var{
@chapter Description
@c man begin DESCRIPTION
FFmpeg is a very fast video and audio converter. It can also grab from
a live audio/video source.
ffmpeg is a very fast video and audio converter that can also grab from
a live audio/video source. It can also convert between arbitrary sample
rates and resize video on the fly with a high quality polyphase filter.
The command line interface is designed to be intuitive, in the sense
that FFmpeg tries to figure out all parameters that can possibly be
that ffmpeg tries to figure out all parameters that can possibly be
derived automatically. You usually only have to specify the target
bitrate you want.
FFmpeg can also convert from any sample rate to any other, and resize
video on the fly with a high quality polyphase filter.
As a general rule, options are applied to the next specified
file. Therefore, order is important, and you can have the same
option on the command line multiple times. Each occurrence is
@ -61,7 +59,7 @@ ffmpeg -r 1 -i input.m2v -r 24 output.avi
The format option may be needed for raw input files.
By default, FFmpeg tries to convert as losslessly as possible: It
By default ffmpeg tries to convert as losslessly as possible: It
uses the same audio and video parameters for the outputs as the one
specified for the inputs.
@ -486,7 +484,7 @@ Use 'frames' B-frames (supported for MPEG-1, MPEG-2 and MPEG-4).
macroblock decision
@table @samp
@item 0
FF_MB_DECISION_SIMPLE: Use mb_cmp (cannot change it yet in FFmpeg).
FF_MB_DECISION_SIMPLE: Use mb_cmp (cannot change it yet in ffmpeg).
@item 1
FF_MB_DECISION_BITS: Choose the one which needs the fewest bits.
@item 2
@ -868,22 +866,22 @@ It allows almost lossless encoding.
@section Video and Audio grabbing
FFmpeg can grab video and audio from devices given that you specify the input
format and device.
If you specify the input format and device then ffmpeg can grab video
and audio directly.
@example
ffmpeg -f oss -i /dev/dsp -f video4linux2 -i /dev/video0 /tmp/out.mpg
@end example
Note that you must activate the right video source and channel before
launching FFmpeg with any TV viewer such as xawtv
launching ffmpeg with any TV viewer such as xawtv
(@url{http://linux.bytesex.org/xawtv/}) by Gerd Knorr. You also
have to set the audio recording levels correctly with a
standard mixer.
@section X11 grabbing
FFmpeg can grab the X11 display.
Grab the X11 display with ffmpeg via
@example
ffmpeg -f x11grab -s cif -r 25 -i :0.0 /tmp/out.mpg
@ -901,7 +899,7 @@ variable. 10 is the x-offset and 20 the y-offset for the grabbing.
@section Video and Audio file format conversion
FFmpeg can use any supported file format and protocol as input:
Any supported file format and protocol can serve as input to ffmpeg:
Examples:
@itemize
@ -921,7 +919,7 @@ It will use the files:
The Y files use twice the resolution of the U and V files. They are
raw files, without header. They can be generated by all decent video
decoders. You must specify the size of the image with the @option{-s} option
if FFmpeg cannot guess it.
if ffmpeg cannot guess it.
@item
You can input from a raw YUV420P file:

6
doc/ffprobe.texi
View File

@ -22,7 +22,7 @@ ffprobe [options] [@file{input_file}]
@chapter Description
@c man begin DESCRIPTION
FFprobe gathers information from multimedia streams and prints it in
ffprobe gathers information from multimedia streams and prints it in
human- and machine-readable fashion.
For example it can be used to check the format of the container used
@ -33,7 +33,7 @@ If a filename is specified in input, ffprobe will try to open and
probe the file content. If the file cannot be opened or recognized as
a multimedia file, a positive exit code is returned.
FFprobe may be employed both as a standalone application or in
ffprobe may be employed both as a standalone application or in
combination with a textual filter, which may perform more
sophisticated processing, e.g. statistical processing or plotting.
@ -41,7 +41,7 @@ Options are used to list some of the formats supported by ffprobe or
for specifying which information to display, and for setting how
ffprobe will show it.
FFprobe output is designed to be easily parsable by a textual filter,
ffprobe output is designed to be easily parsable by a textual filter,
and consists of one or more sections of the form:
@example
[SECTION]

12
doc/ffserver.texi
View File

@ -22,12 +22,12 @@ ffserver [options]
@chapter Description
@c man begin DESCRIPTION
FFserver is a streaming server for both audio and video. It supports
ffserver is a streaming server for both audio and video. It supports
several live feeds, streaming from files and time shifting on live feeds
(you can seek to positions in the past on each live feed, provided you
specify a big enough feed storage in ffserver.conf).
FFserver runs in daemon mode by default; that is, it puts itself in
ffserver runs in daemon mode by default; that is, it puts itself in
the background and detaches from its TTY, unless it is launched in
debug mode or a NoDaemon option is specified in the configuration
file.
@ -39,7 +39,7 @@ information.
@section How does it work?
FFserver receives prerecorded files or FFM streams from some ffmpeg
ffserver receives prerecorded files or FFM streams from some ffmpeg
instance as input, then streams them over RTP/RTSP/HTTP.
An ffserver instance will listen on some port as specified in the
@ -57,7 +57,7 @@ file.
@section Status stream
FFserver supports an HTTP interface which exposes the current status
ffserver supports an HTTP interface which exposes the current status
of the server.
Simply point your browser to the address of the special status stream
@ -249,8 +249,8 @@ For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
Use @file{configfile} instead of @file{/etc/ffserver.conf}.
@item -n
Enable no-launch mode. This option disables all the Launch directives
within the various <Stream> sections. FFserver will not launch any
ffmpeg instance, so you will have to launch them manually.
within the various <Stream> sections. Since ffserver will not launch
any ffmpeg instances, you will have to launch them manually.
@item -d
Enable debug mode. This option increases log verbosity, directs log
messages to stdout and causes ffserver to run in the foreground