Simplify layout, and make it more consistent with that of the other
man pages. Also I cannot see a good reason for keeping split the two
sections.
Originally committed as revision 23407 to svn://svn.ffmpeg.org/ffmpeg/trunk
... | ... |
@@ -7,8 +7,8 @@ |
7 | 7 |
@sp 3 |
8 | 8 |
@end titlepage |
9 | 9 |
|
10 |
- |
|
11 |
-@chapter Introduction |
|
10 |
+@chapter Description |
|
11 |
+@c man begin DESCRIPTION |
|
12 | 12 |
|
13 | 13 |
FFmpeg is a very fast video and audio converter. It can also grab from |
14 | 14 |
a live audio/video source. |
... | ... |
@@ -21,6 +21,35 @@ bitrate you want. |
21 | 21 |
FFmpeg can also convert from any sample rate to any other, and resize |
22 | 22 |
video on the fly with a high quality polyphase filter. |
23 | 23 |
|
24 |
+As a general rule, options are applied to the next specified |
|
25 |
+file. Therefore, order is important, and you can have the same |
|
26 |
+option on the command line multiple times. Each occurrence is |
|
27 |
+then applied to the next input or output file. |
|
28 |
+ |
|
29 |
+* To set the video bitrate of the output file to 64kbit/s: |
|
30 |
+@example |
|
31 |
+ffmpeg -i input.avi -b 64k output.avi |
|
32 |
+@end example |
|
33 |
+ |
|
34 |
+* To force the frame rate of the output file to 24 fps: |
|
35 |
+@example |
|
36 |
+ffmpeg -i input.avi -r 24 output.avi |
|
37 |
+@end example |
|
38 |
+ |
|
39 |
+* To force the frame rate of the input file (valid for raw formats only) |
|
40 |
+to 1 fps and the frame rate of the output file to 24 fps: |
|
41 |
+@example |
|
42 |
+ffmpeg -r 1 -i input.m2v -r 24 output.avi |
|
43 |
+@end example |
|
44 |
+ |
|
45 |
+The format option may be needed for raw input files. |
|
46 |
+ |
|
47 |
+By default, FFmpeg tries to convert as losslessly as possible: It |
|
48 |
+uses the same audio and video parameters for the outputs as the one |
|
49 |
+specified for the inputs. |
|
50 |
+ |
|
51 |
+@c man end DESCRIPTION |
|
52 |
+ |
|
24 | 53 |
@chapter Quick Start |
25 | 54 |
|
26 | 55 |
@c man begin EXAMPLES |
... | ... |
@@ -192,34 +221,6 @@ The generic syntax is: |
192 | 192 |
ffmpeg [[infile options][@option{-i} @var{infile}]]... @{[outfile options] @var{outfile}@}... |
193 | 193 |
@c man end |
194 | 194 |
@end example |
195 |
-@c man begin DESCRIPTION |
|
196 |
-As a general rule, options are applied to the next specified |
|
197 |
-file. Therefore, order is important, and you can have the same |
|
198 |
-option on the command line multiple times. Each occurrence is |
|
199 |
-then applied to the next input or output file. |
|
200 |
- |
|
201 |
-* To set the video bitrate of the output file to 64kbit/s: |
|
202 |
-@example |
|
203 |
-ffmpeg -i input.avi -b 64k output.avi |
|
204 |
-@end example |
|
205 |
- |
|
206 |
-* To force the frame rate of the output file to 24 fps: |
|
207 |
-@example |
|
208 |
-ffmpeg -i input.avi -r 24 output.avi |
|
209 |
-@end example |
|
210 |
- |
|
211 |
-* To force the frame rate of the input file (valid for raw formats only) |
|
212 |
-to 1 fps and the frame rate of the output file to 24 fps: |
|
213 |
-@example |
|
214 |
-ffmpeg -r 1 -i input.m2v -r 24 output.avi |
|
215 |
-@end example |
|
216 |
- |
|
217 |
-The format option may be needed for raw input files. |
|
218 |
- |
|
219 |
-By default, FFmpeg tries to convert as losslessly as possible: It |
|
220 |
-uses the same audio and video parameters for the outputs as the one |
|
221 |
-specified for the inputs. |
|
222 |
-@c man end |
|
223 | 195 |
|
224 | 196 |
@c man begin OPTIONS |
225 | 197 |
|