[FFmpeg-devel] [PATCH 12/12] doc: Grammar fixes for strem specifiers section

Stefano Sabatini stefasab at gmail.com
Sat Mar 30 23:24:07 CET 2013


On date Saturday 2013-03-30 15:32:59 -0400, Derek Buitenhuis encoded:
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
>  doc/avtools-common-opts.texi |   22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
> index efd64d4..7773e78 100644
> --- a/doc/avtools-common-opts.texi
> +++ b/doc/avtools-common-opts.texi
> @@ -15,18 +15,18 @@ will set the boolean option with name "foo" to false.
>  @anchor{Stream specifiers}
>  @section Stream specifiers
>  Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
> -are used to precisely specify which stream(s) does a given option belong to.
> +are used to precisely specify which stream(s) a given option belongs to.
>  
>  A stream specifier is a string generally appended to the option name and
> -separated from it by a colon. E.g. @code{-codec:a:1 ac3} option contains
> - at code{a:1} stream specifier, which matches the second audio stream. Therefore it
> +separated from it by a colon. E.g. @code{-codec:a:1 ac3} contains the
> + at code{a:1} stream specifier, which matches the second audio stream. Therefore, it
>  would select the ac3 codec for the second audio stream.
>  
> -A stream specifier can match several streams, the option is then applied to all
> +A stream specifier can match several streams, so that the option is applied to all
>  of them. E.g. the stream specifier in @code{-b:a 128k} matches all audio
>  streams.
>  
> -An empty stream specifier matches all streams, for example @code{-codec copy}
> +An empty stream specifier matches all streams. For example, @code{-codec copy}
>  or @code{-codec: copy} would copy all the streams without reencoding.
>  
>  Possible forms of stream specifiers are:
> @@ -35,15 +35,15 @@ Possible forms of stream specifiers are:
>  Matches the stream with this index. E.g. @code{-threads:1 4} would set the
>  thread count for the second stream to 4.
>  @item @var{stream_type}[:@var{stream_index}]
> - at var{stream_type} is one of: 'v' for video, 'a' for audio, 's' for subtitle,
> -'d' for data and 't' for attachments. If @var{stream_index} is given, then
> -matches stream number @var{stream_index} of this type. Otherwise matches all
> + at var{stream_type} is one of following: 'v' for video, 'a' for audio, 's' for subtitle,

> +'d' for data, and 't' for attachments. If @var{stream_index} is given, then
> +it matches stream number, @var{stream_index}, of this type. Otherwise, it matches all
>  streams of this type.

then it matches the stream of this type with number @var{stream_index}.

sounds more intelligible to me.


>  @item p:@var{program_id}[:@var{stream_index}]
> -If @var{stream_index} is given, then matches stream number @var{stream_index} in
> -program with id @var{program_id}. Otherwise matches all streams in this program.

> +If @var{stream_index} is given, then it matches stream number @var{stream_index} in
> +program with id @var{program_id}. Otherwise, it matches all streams in the program.

then it matches the stream with number @var{stream_index} in the
program with id @var{program_id}.

?

[...]
-- 
FFmpeg = Fierce Fascinating Magical Perfectionist Evil Glue


More information about the ffmpeg-devel mailing list