This should make it less ambigous that these are URLs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5f27a9c3aa973c543bd8bbf2a78363700bbc03e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
... | ... |
@@ -12,7 +12,7 @@ |
12 | 12 |
|
13 | 13 |
@chapter Synopsis |
14 | 14 |
|
15 |
-ffmpeg [@var{global_options}] @{[@var{input_file_options}] -i @file{input_file}@} ... @{[@var{output_file_options}] @file{output_file}@} ... |
|
15 |
+ffmpeg [@var{global_options}] @{[@var{input_file_options}] -i @file{input_url}@} ... @{[@var{output_file_options}] @file{output_url}@} ... |
|
16 | 16 |
|
17 | 17 |
@chapter Description |
18 | 18 |
@c man begin DESCRIPTION |
... | ... |
@@ -24,10 +24,10 @@ rates and resize video on the fly with a high quality polyphase filter. |
24 | 24 |
@command{ffmpeg} reads from an arbitrary number of input "files" (which can be regular |
25 | 25 |
files, pipes, network streams, grabbing devices, etc.), specified by the |
26 | 26 |
@code{-i} option, and writes to an arbitrary number of output "files", which are |
27 |
-specified by a plain output filename. Anything found on the command line which |
|
28 |
-cannot be interpreted as an option is considered to be an output filename. |
|
27 |
+specified by a plain output url. Anything found on the command line which |
|
28 |
+cannot be interpreted as an option is considered to be an output url. |
|
29 | 29 |
|
30 |
-Each input or output file can, in principle, contain any number of streams of |
|
30 |
+Each input or output url can, in principle, contain any number of streams of |
|
31 | 31 |
different types (video/audio/subtitle/attachment/data). The allowed number and/or |
32 | 32 |
types of streams may be limited by the container format. Selecting which |
33 | 33 |
streams from which inputs will go into which output is either done automatically |
... | ... |
@@ -243,8 +243,8 @@ Force input or output file format. The format is normally auto detected for inpu |
243 | 243 |
files and guessed from the file extension for output files, so this option is not |
244 | 244 |
needed in most cases. |
245 | 245 |
|
246 |
-@item -i @var{filename} (@emph{input}) |
|
247 |
-input file name |
|
246 |
+@item -i @var{url} (@emph{input}) |
|
247 |
+input file url |
|
248 | 248 |
|
249 | 249 |
@item -y (@emph{global}) |
250 | 250 |
Overwrite output files without asking. |
... | ... |
@@ -281,7 +281,7 @@ libx264, and the 138th audio, which will be encoded with libvorbis. |
281 | 281 |
When used as an input option (before @code{-i}), limit the @var{duration} of |
282 | 282 |
data read from the input file. |
283 | 283 |
|
284 |
-When used as an output option (before an output filename), stop writing the |
|
284 |
+When used as an output option (before an output url), stop writing the |
|
285 | 285 |
output after its duration reaches @var{duration}. |
286 | 286 |
|
287 | 287 |
@var{duration} must be a time duration specification, |
... | ... |
@@ -310,7 +310,7 @@ extra segment between the seek point and @var{position} will be decoded and |
310 | 310 |
discarded. When doing stream copy or when @option{-noaccurate_seek} is used, it |
311 | 311 |
will be preserved. |
312 | 312 |
|
313 |
-When used as an output option (before an output filename), decodes but discards |
|
313 |
+When used as an output option (before an output url), decodes but discards |
|
314 | 314 |
input until the timestamps reach @var{position}. |
315 | 315 |
|
316 | 316 |
@var{position} must be a time duration specification, |
... | ... |
@@ -1129,7 +1129,7 @@ may be reassigned to a different value. |
1129 | 1129 |
For example, to set the stream 0 PID to 33 and the stream 1 PID to 36 for |
1130 | 1130 |
an output mpegts file: |
1131 | 1131 |
@example |
1132 |
-ffmpeg -i infile -streamid 0:33 -streamid 1:36 out.ts |
|
1132 |
+ffmpeg -i inurl -streamid 0:33 -streamid 1:36 out.ts |
|
1133 | 1133 |
@end example |
1134 | 1134 |
|
1135 | 1135 |
@item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream}) |
... | ... |
@@ -12,7 +12,7 @@ |
12 | 12 |
|
13 | 13 |
@chapter Synopsis |
14 | 14 |
|
15 |
-ffplay [@var{options}] [@file{input_file}] |
|
15 |
+ffplay [@var{options}] [@file{input_url}] |
|
16 | 16 |
|
17 | 17 |
@chapter Description |
18 | 18 |
@c man begin DESCRIPTION |
... | ... |
@@ -106,8 +106,8 @@ the input audio. |
106 | 106 |
Use the option "-filters" to show all the available filters (including |
107 | 107 |
sources and sinks). |
108 | 108 |
|
109 |
-@item -i @var{input_file} |
|
110 |
-Read @var{input_file}. |
|
109 |
+@item -i @var{input_url} |
|
110 |
+Read @var{input_url}. |
|
111 | 111 |
@end table |
112 | 112 |
|
113 | 113 |
@section Advanced options |
... | ... |
@@ -12,7 +12,7 @@ |
12 | 12 |
|
13 | 13 |
@chapter Synopsis |
14 | 14 |
|
15 |
-ffprobe [@var{options}] [@file{input_file}] |
|
15 |
+ffprobe [@var{options}] [@file{input_url}] |
|
16 | 16 |
|
17 | 17 |
@chapter Description |
18 | 18 |
@c man begin DESCRIPTION |
... | ... |
@@ -24,8 +24,8 @@ For example it can be used to check the format of the container used |
24 | 24 |
by a multimedia stream and the format and type of each media stream |
25 | 25 |
contained in it. |
26 | 26 |
|
27 |
-If a filename is specified in input, ffprobe will try to open and |
|
28 |
-probe the file content. If the file cannot be opened or recognized as |
|
27 |
+If a url is specified in input, ffprobe will try to open and |
|
28 |
+probe the url content. If the url cannot be opened or recognized as |
|
29 | 29 |
a multimedia file, a positive exit code is returned. |
30 | 30 |
|
31 | 31 |
ffprobe may be employed both as a standalone application or in |
... | ... |
@@ -332,8 +332,8 @@ with name "PIXEL_FORMAT". |
332 | 332 |
Force bitexact output, useful to produce output which is not dependent |
333 | 333 |
on the specific build. |
334 | 334 |
|
335 |
-@item -i @var{input_file} |
|
336 |
-Read @var{input_file}. |
|
335 |
+@item -i @var{input_url} |
|
336 |
+Read @var{input_url}. |
|
337 | 337 |
|
338 | 338 |
@end table |
339 | 339 |
@c man end |
... | ... |
@@ -3108,8 +3108,8 @@ enum OptGroup { |
3108 | 3108 |
}; |
3109 | 3109 |
|
3110 | 3110 |
static const OptionGroupDef groups[] = { |
3111 |
- [GROUP_OUTFILE] = { "output file", NULL, OPT_OUTPUT }, |
|
3112 |
- [GROUP_INFILE] = { "input file", "i", OPT_INPUT }, |
|
3111 |
+ [GROUP_OUTFILE] = { "output url", NULL, OPT_OUTPUT }, |
|
3112 |
+ [GROUP_INFILE] = { "input url", "i", OPT_INPUT }, |
|
3113 | 3113 |
}; |
3114 | 3114 |
|
3115 | 3115 |
static int open_files(OptionGroupList *l, const char *inout, |