March 2013 - ffmpeg-cvslog - lists.ffmpeg.org

ff_gen_search: Fix finding the maximum timestamp in a really small file
by git＠videolan.org 30 May '13

30 May '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Feb 18 20:18:19 2013 +0100| [6cd650dbd2bea006e1c4b70456f6d9eb7f638922] | committer: Michael Niedermayer ff_gen_search: Fix finding the maximum timestamp in a really small file Fixes Assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cd650dbd2bea006e… --- libavformat/utils.c | 4 ++-- tests/ref/seek/lavf-ogg | 54 +++++++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d59a02d..a4218db 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1863,10 +1863,10 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, filesize = avio_size(s->pb); pos_max = filesize - 1; do{ - pos_max -= step; + pos_max = FFMAX(0, pos_max - step); ts_max = ff_read_timestamp(s, stream_index, &pos_max, pos_max + step, read_timestamp); step += step; - }while(ts_max == AV_NOPTS_VALUE && pos_max >= step); + }while(ts_max == AV_NOPTS_VALUE && pos_max > 0); if (ts_max == AV_NOPTS_VALUE) return -1; diff --git a/tests/ref/seek/lavf-ogg b/tests/ref/seek/lavf-ogg index 2898d10..583526e 100644 --- a/tests/ref/seek/lavf-ogg +++ b/tests/ref/seek/lavf-ogg @@ -1,35 +1,53 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788345 +ret: 0 st:-1 flags:1 ts: 1.894167 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.788345 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.576668 -ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365011 +ret: 0 st:-1 flags:0 ts: 2.576668 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.470835 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.365011 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.153336 -ret:-1 st:-1 flags:1 ts: 1.047503 +ret: 0 st:-1 flags:0 ts: 2.153336 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.047503 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.835828 -ret:-1 st:-1 flags:0 ts: 1.730004 -ret:-1 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 ts: 2.835828 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.730004 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.412494 -ret:-1 st:-1 flags:0 ts: 1.306672 -ret:-1 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 ts: 2.412494 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.306672 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 1.989184 -ret:-1 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 ts: 1.989184 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565850 -ret:-1 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:0 ts: 2.671678 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:1 ts: 1.565850 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364

2 1

doc: Fix broken English in the common options description
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 15:21:36 2013 -0400| [0cb2d32453ed6eae54716c990ab51b355e535df1] | committer: Derek Buitenhuis doc: Fix broken English in the common options description Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cb2d32453ed6eae5… --- doc/avtools-common-opts.texi | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index c18f667..37f27a9 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -1,16 +1,17 @@ -All the numerical options, if not specified otherwise, accept in input -a string representing a number, which may contain one of the -SI unit prefixes, for example 'K', 'M', 'G'. -If 'i' is appended after the prefix, binary prefixes are used, -which are based on powers of 1024 instead of powers of 1000. -The 'B' postfix multiplies the value by 8, and can be -appended after a unit prefix or used alone. This allows using for -example 'KB', 'MiB', 'G' and 'B' as number postfix. +All the numerical options, if not specified otherwise, accept a string +representing a number as input, which may be followed by one of the SI +unit prefixes, for example: 'K', 'M', or 'G'. + +If 'i' is appended to the SI unit prefix, the complete prefix will be +interpreted as a unit prefix for binary multiplies, which are based on +powers of 1024 instead of powers of 1000. Appending 'B' to the SI unit +prefix multiplies the value by 8. This allows using, for example: +'KB', 'MiB', 'G' and 'B' as number suffixes. Options which do not take arguments are boolean options, and set the corresponding value to true. They can be set to false by prefixing -with "no" the option name, for example using "-nofoo" in the -command line will set to false the boolean option with name "foo". +the option name with "no". For example using "-nofoo" +will set the boolean option with name "foo" to false. @anchor{Stream specifiers} @section Stream specifiers

1 0

doc: Grammar fixes for stream selection
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 15:16:49 2013 -0400| [a034cdf49d1a434ab751c2cc9672973bc0238540] | committer: Derek Buitenhuis doc: Grammar fixes for stream selection Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a034cdf49d1a434ab… --- doc/ffmpeg.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 0b08eda..1eeca9a 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -198,14 +198,14 @@ filters is obviously also impossible, since filters work on uncompressed data. @chapter Stream selection @c man begin STREAM SELECTION -By default ffmpeg includes only one stream of each type (video, audio, subtitle) +By default, @command{ffmpeg} includes only one stream of each type (video, audio, subtitle) present in the input files and adds them to each output file. It picks the -"best" of each based upon the following criteria; for video it is the stream -with the highest resolution, for audio the stream with the most channels, for -subtitle it's the first subtitle stream. In the case where several streams of -the same type rate equally, the lowest numbered stream is chosen. +"best" of each based upon the following criteria: for video, it is the stream +with the highest resolution, for audio, it is the stream with the most channels, for +subtitles, it is the first subtitle stream. In the case where several streams of +the same type rate equally, the stream with the lowest index is chosen. -You can disable some of those defaults by using @code{-vn/-an/-sn} options. For +You can disable some of those defaults by using the @code{-vn/-an/-sn} options. For full manual control, use the @code{-map} option, which disables the defaults just described.

1 0

doc: Grammar fixes for strem specifiers section
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 15:26:21 2013 -0400| [7d057515818d606fd1d7ab9f0dc1eebf31a47239] | committer: Derek Buitenhuis doc: Grammar fixes for strem specifiers section Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d057515818d606fd… --- doc/avtools-common-opts.texi | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index 37f27a9..ff38ebb 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -16,18 +16,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 -@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 +@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: @@ -36,15 +36,16 @@ 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}] -@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 +@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. @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 the stream with number @var{stream_index} +in the program with the id @var{program_id}. Otherwise, it matches all streams in the +program. @item #@var{stream_id} -Matches the stream by format-specific ID. +Matches the stream by a format-specific ID. @end table @section Generic options

1 0

doc: Small grammar fix in -f description
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 14:44:33 2013 -0400| [876fe11e32bf290c6df02864393115b1e6c6d13c] | committer: Derek Buitenhuis doc: Small grammar fix in -f description Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=876fe11e32bf290c6… --- doc/ffmpeg.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index d3bf405..5132227 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -222,7 +222,7 @@ described. @item -f @var{fmt} (@emph{input/output}) Force input or output file format. The format is normally auto detected for input -files and guessed from file extension for output files, so this option is not +files and guessed from the file extension for output files, so this option is not needed in most cases. @item -i @var{filename} (@emph{input})

1 0

doc: Grammar fixes for FFmpeg description
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 14:51:05 2013 -0400| [91b5ee66998ea28cdafb5ca31cbebc55ddf4cdb9] | committer: Derek Buitenhuis doc: Grammar fixes for FFmpeg description Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91b5ee66998ea28cd… --- doc/ffmpeg.texi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 38d341e..a826616 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -16,26 +16,26 @@ ffmpeg [@var{global_options}] @{[@var{input_file_options}] -i @file{input_file}@ @chapter Description @c man begin DESCRIPTION -ffmpeg is a very fast video and audio converter that can also grab from +@command{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. -ffmpeg reads from an arbitrary number of input "files" (which can be regular +@command{ffmpeg} reads from an arbitrary number of input "files" (which can be regular files, pipes, network streams, grabbing devices, etc.), specified by the @code{-i} option, and writes to an arbitrary number of output "files", which are specified by a plain output filename. Anything found on the command line which cannot be interpreted as an option is considered to be an output filename. -Each input or output file can in principle contain any number of streams of -different types (video/audio/subtitle/attachment/data). Allowed number and/or -types of streams can be limited by the container format. Selecting, which -streams from which inputs go into output, is done either automatically or with -the @code{-map} option (see the Stream selection chapter). +Each input or output file can, in principle, contain any number of streams of +different types (video/audio/subtitle/attachment/data). The allowed number and/or +types of streams may be limited by the container format. Selecting which +streams from which inputs will go into which output is either done automatically +or with the @code{-map} option (see the Stream selection chapter). To refer to input files in options, you must use their indices (0-based). E.g. -the first input file is @code{0}, the second is @code{1} etc. Similarly, streams +the first input file is @code{0}, the second is @code{1}, etc. Similarly, streams within a file are referred to by their indices. E.g. @code{2:3} refers to the -fourth stream in the third input file. See also the Stream specifiers chapter. +fourth stream in the third input file. Also see the Stream specifiers chapter. As a general rule, options are applied to the next specified file. Therefore, order is important, and you can have the same @@ -50,7 +50,7 @@ options apply ONLY to the next input or output file and are reset between files. @itemize @item -To set the video bitrate of the output file to 64kbit/s: +To set the video bitrate of the output file to 64 kbit/s: @example ffmpeg -i input.avi -b:v 64k -bufsize 64k output.avi @end example

1 0

doc: Consistently use 'filtergraph'
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 15:13:08 2013 -0400| [9db706206d1e4a5b776f50acee591d0e066a21ef] | committer: Derek Buitenhuis doc: Consistently use 'filtergraph' We used to use 'filtergraph' or 'filter graph' randomly. 'filtergraph' was chosen due to having 57 occurrences in the documentation, whereas 'filter graph' had only 19. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9db706206d1e4a5b7… --- doc/faq.texi | 2 +- doc/ffmpeg.texi | 26 +++++++++++++------------- doc/ffplay.texi | 12 ++++++------ doc/filters.texi | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/faq.texi b/doc/faq.texi index ebf21f5..a95476d 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -399,7 +399,7 @@ why the converting filter was needed at that place. Just before the output is a likely place, as @option{-f lavfi} currently only support packed S16. -Then insert the correct @code{aconvert} explicitly in the filter graph, +Then insert the correct @code{aconvert} explicitly in the filtergraph, specifying the exact format. @example diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 62c59bc..0b08eda 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -346,19 +346,19 @@ Use fixed quality scale (VBR). The meaning of @var{q} is codec-dependent. @anchor{filter_option} -@item -filter[:@var{stream_specifier}] @var{filter_graph} (@emph{output,per-stream}) -Create the filter graph specified by @var{filter_graph} and use it to +@item -filter[:@var{stream_specifier}] @var{filtergraph} (@emph{output,per-stream}) +Create the filtergraph specified by @var{filtergraph} and use it to filter the stream. -@var{filter_graph} is a description of the filter graph to apply to +@var{filtergraph} is a description of the filtergraph to apply to the stream, and must have a single input and a single output of the -same type of the stream. In the filter graph, the input is associated +same type of the stream. In the filtergraph, the input is associated to the label @code{in}, and the output to the label @code{out}. See the ffmpeg-filters manual for more information about the filtergraph syntax. See the @ref{filter_complex_option,,-filter_complex option} if you -want to create filter graphs with multiple inputs and/or outputs. +want to create filtergraphs with multiple inputs and/or outputs. @item -filter_script[:@var{stream_specifier}] @var{filename} (@emph{output,per-stream}) This option is similar to @option{-filter}, the only difference is that its @@ -496,8 +496,8 @@ stream @item -vlang @var{code} Set the ISO 639 language code (3 letters) of the current video stream. -@item -vf @var{filter_graph} (@emph{output}) -Create the filter graph specified by @var{filter_graph} and use it to +@item -vf @var{filtergraph} (@emph{output}) +Create the filtergraph specified by @var{filtergraph} and use it to filter the stream. This is an alias for @code{-filter:v}, see the @ref{filter_option,,-filter option}. @@ -513,7 +513,7 @@ If the selected pixel format can not be selected, ffmpeg will print a warning and select the best pixel format supported by the encoder. If @var{pix_fmt} is prefixed by a @code{+}, ffmpeg will exit with an error if the requested pixel format can not be selected, and automatic conversions -inside filter graphs are disabled. +inside filtergraphs are disabled. If @var{pix_fmt} is a single @code{+}, ffmpeg selects the same pixel format as the input (or graph output) and automatic conversions are disabled. @@ -637,8 +637,8 @@ Set the audio codec. This is an alias for @code{-codec:a}. Set the audio sample format. Use @code{-sample_fmts} to get a list of supported sample formats. -@item -af @var{filter_graph} (@emph{output}) -Create the filter graph specified by @var{filter_graph} and use it to +@item -af @var{filtergraph} (@emph{output}) +Create the filtergraph specified by @var{filtergraph} and use it to filter the stream. This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter option}. @@ -1005,10 +1005,10 @@ ffmpeg -i input.mpg -timecode 01:02:03.04 -r 30000/1001 -s ntsc output.mpg @anchor{filter_complex_option} @item -filter_complex @var{filtergraph} (@emph{global}) -Define a complex filter graph, i.e. one with arbitrary number of inputs and/or +Define a complex filtergraph, i.e. one with arbitrary number of inputs and/or outputs. For simple graphs -- those with one input and one output of the same type -- see the @option{-filter} options. @var{filtergraph} is a description of -the filter graph, as described in the ``Filtergraph syntax'' section of the +the filtergraph, as described in the ``Filtergraph syntax'' section of the ffmpeg-filters manual. Input link labels must refer to input streams using the @@ -1052,7 +1052,7 @@ ffmpeg -filter_complex 'color=c=red' -t 5 out.mkv @end example @item -lavfi @var{filtergraph} (@emph{global}) -Define a complex filter graph, i.e. one with arbitrary number of inputs and/or +Define a complex filtergraph, i.e. one with arbitrary number of inputs and/or outputs. Equivalent to @option{-filter_complex}. @item -filter_complex_script @var{filename} (@emph{global}) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index ee160a0..3c2ec50 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -73,19 +73,19 @@ Default value is "video", if video is not present or cannot be played You can interactively cycle through the available show modes by pressing the key @key{w}. -@item -vf @var{filter_graph} -Create the filter graph specified by @var{filter_graph} and use it to +@item -vf @var{filtergraph} +Create the filtergraph specified by @var{filtergraph} and use it to filter the video stream. -@var{filter_graph} is a description of the filter graph to apply to +@var{filtergraph} is a description of the filtergraph to apply to the stream, and must have a single video input and a single video -output. In the filter graph, the input is associated to the label +output. In the filtergraph, the input is associated to the label @code{in}, and the output to the label @code{out}. See the ffmpeg-filters manual for more information about the filtergraph syntax. -@item -af @var{filter_graph} -@var{filter_graph} is a description of the filter graph to apply to +@item -af @var{filtergraph} +@var{filtergraph} is a description of the filtergraph to apply to the input audio. Use the option "-filters" to show all the available filters (including sources and sinks). diff --git a/doc/filters.texi b/doc/filters.texi index 5424b85..2c82ac3 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6,7 +6,7 @@ Filtering in FFmpeg is enabled through the libavfilter library. In libavfilter, it is possible for filters to have multiple inputs and multiple outputs. To illustrate the sorts of things that are possible, we can -use a complex filter graph. For example, the following one: +use a complex filtergraph. For example, the following one: @example input --> split ---------------------> overlay --> output @@ -49,7 +49,7 @@ output. @c man begin GRAPH2DOT The @file{graph2dot} program included in the FFmpeg @file{tools} -directory can be used to parse a filter graph description and issue a +directory can be used to parse a filtergraph description and issue a corresponding textual representation in the dot language. Invoke the command: @@ -61,7 +61,7 @@ to see how to use @file{graph2dot}. You can then pass the dot description to the @file{dot} program (from the graphviz suite of programs) and obtain a graphical representation -of the filter graph. +of the filtergraph. For example the sequence of commands: @example @@ -2865,7 +2865,7 @@ they should be escaped. Note that they probably must also be escaped as the value for the @option{text} option in the filter argument string and as the filter -argument in the filter graph description, and possibly also for the shell, +argument in the filtergraph description, and possibly also for the shell, that makes up to four levels of escaping; using a text file avoids these problems.

1 0

doc: Grammar fixes for FFmpeg's detailed description
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 15:08:51 2013 -0400| [9249b28e799c88102ff218ec6cbb99c82d702b68] | committer: Derek Buitenhuis doc: Grammar fixes for FFmpeg's detailed description Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9249b28e799c88102… --- doc/ffmpeg.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index f949c9b..62c59bc 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -96,14 +96,14 @@ tracking lowest timestamp on any active input stream. Encoded packets are then passed to the decoder (unless streamcopy is selected for the stream, see further for a description). The decoder produces uncompressed frames (raw video/PCM audio/...) which can be processed further by -filtering (see next section). After filtering the frames are passed to the -encoder, which encodes them and outputs encoded packets again. Finally those are +filtering (see next section). After filtering, the frames are passed to the +encoder, which encodes them and outputs encoded packets. Finally those are passed to the muxer, which writes the encoded packets to the output file. @section Filtering Before encoding, @command{ffmpeg} can process raw audio and video frames using filters from the libavfilter library. Several chained filters form a filter -graph. @command{ffmpeg} distinguishes between two types of filtergraphs - +graph. @command{ffmpeg} distinguishes between two types of filtergraphs: simple and complex. @subsection Simple filtergraphs @@ -139,7 +139,7 @@ only sets timestamps and otherwise passes the frames unchanged. @subsection Complex filtergraphs Complex filtergraphs are those which cannot be described as simply a linear -processing chain applied to one stream. This is the case e.g. when the graph has +processing chain applied to one stream. This is the case, for example, when the graph has more than one input and/or output, or when output stream type is different from input. They can be represented with the following diagram: @@ -164,7 +164,7 @@ input. They can be represented with the following diagram: @end example Complex filtergraphs are configured with the @option{-filter_complex} option. -Note that this option is global, since a complex filtergraph by its nature +Note that this option is global, since a complex filtergraph, by its nature, cannot be unambiguously associated with a single stream or file. The @option{-lavfi} option is equivalent to @option{-filter_complex}. @@ -178,7 +178,7 @@ Stream copy is a mode selected by supplying the @code{copy} parameter to the @option{-codec} option. It makes @command{ffmpeg} omit the decoding and encoding step for the specified stream, so it does only demuxing and muxing. It is useful for changing the container format or modifying container-level metadata. The -diagram above will in this case simplify to this: +diagram above will, in this case, simplify to this: @example _______ ______________ ________ @@ -190,7 +190,7 @@ diagram above will in this case simplify to this: @end example Since there is no decoding or encoding, it is very fast and there is no quality -loss. However it might not work in some cases because of many factors. Applying +loss. However, it might not work in some cases because of many factors. Applying filters is obviously also impossible, since filters work on uncompressed data. @c man end DETAILED DESCRIPTION

1 0

doc: Consistently use 'frame rate' everywhere
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 14:55:47 2013 -0400| [fe64b88950d417ed36add4229bce5fa8668edb5a] | committer: Derek Buitenhuis doc: Consistently use 'frame rate' everywhere We used to use 'framerate' or 'frame rate' randomly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe64b88950d417ed3… --- doc/demuxers.texi | 2 +- doc/ffmpeg-codecs.texi | 4 ++-- doc/ffmpeg.texi | 2 +- doc/filter_design.txt | 2 +- doc/filters.texi | 20 ++++++++++---------- doc/indevs.texi | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index fc50871..03d4f59 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -120,7 +120,7 @@ same for all the files in the sequence. This demuxer accepts the following options: @table @option @item framerate -Set the framerate for the video stream. It defaults to 25. +Set the frame rate for the video stream. It defaults to 25. @item loop If set to 1, loop over the input. Default value is 0. @item pattern_type diff --git a/doc/ffmpeg-codecs.texi b/doc/ffmpeg-codecs.texi index 8f807c1..e97abe3 100644 --- a/doc/ffmpeg-codecs.texi +++ b/doc/ffmpeg-codecs.texi @@ -144,8 +144,8 @@ Set codec time base. It is the fundamental unit of time (in seconds) in terms of which frame timestamps are represented. For fixed-fps content, timebase -should be 1/framerate and timestamp increments should be identically -1. +should be @code{1 / frame_rate} and timestamp increments should be +identically 1. @item g @var{integer} (@emph{encoding,video}) Set the group of picture size. Default value is 12. diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index a826616..f949c9b 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -896,7 +896,7 @@ Newly added values will have to be specified as strings always. Each frame is passed with its timestamp from the demuxer to the muxer. @item 1, cfr Frames will be duplicated and dropped to achieve exactly the requested -constant framerate. +constant frame rate. @item 2, vfr Frames are passed through with their timestamp or dropped so as to prevent 2 frames from having the same timestamp. diff --git a/doc/filter_design.txt b/doc/filter_design.txt index 2f9e57d..c303c3c 100644 --- a/doc/filter_design.txt +++ b/doc/filter_design.txt @@ -204,7 +204,7 @@ Frame scheduling filter; these buffered frames must be flushed immediately if a new input produces new output. - (Example: framerate-doubling filter: filter_frame must (1) flush the + (Example: frame rate-doubling filter: filter_frame must (1) flush the second copy of the previous frame, if it is still there, (2) push the first copy of the incoming frame, (3) keep the second copy for later.) diff --git a/doc/filters.texi b/doc/filters.texi index 79fe9a4..5424b85 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2404,7 +2404,7 @@ curves=vintage @section decimate Drop frames that do not differ greatly from the previous frame in -order to reduce framerate. +order to reduce frame rate. The main use of this filter is for very-low-bitrate encoding (e.g. streaming over dialup modem), but it could in theory be used for @@ -3169,14 +3169,14 @@ format=yuv420p:yuv444p:yuv410p @section fps -Convert the video to specified constant framerate by duplicating or dropping +Convert the video to specified constant frame rate by duplicating or dropping frames as necessary. This filter accepts the following named parameters: @table @option @item fps -Desired output framerate. The default is @code{25}. +Desired output frame rate. The default is @code{25}. @item round Rounding method. @@ -5387,27 +5387,27 @@ Available values are: @table @samp @item merge, 0 Move odd frames into the upper field, even into the lower field, -generating a double height frame at half framerate. +generating a double height frame at half frame rate. @item drop_odd, 1 Only output even frames, odd frames are dropped, generating a frame with -unchanged height at half framerate. +unchanged height at half frame rate. @item drop_even, 2 Only output odd frames, even frames are dropped, generating a frame with -unchanged height at half framerate. +unchanged height at half frame rate. @item pad, 3 Expand each frame to full height, but pad alternate lines with black, -generating a frame with double height at the same input framerate. +generating a frame with double height at the same input frame rate. @item interleave_top, 4 Interleave the upper field from odd frames with the lower field from -even frames, generating a frame with unchanged height at half framerate. +even frames, generating a frame with unchanged height at half frame rate. @item interleave_bottom, 5 Interleave the lower field from odd frames with the upper field from -even frames, generating a frame with unchanged height at half framerate. +even frames, generating a frame with unchanged height at half frame rate. @item interlacex2, 6 Double frame rate with unchanged height. Frames are inserted each @@ -7003,7 +7003,7 @@ amovie=a.mp3,asplit[out0],showwaves[out1] @item Create a synthetic signal and show it with showwaves, forcing a -framerate of 30 frames per second: +frame rate of 30 frames per second: @example aevalsrc=sin(1*2*PI*t)*sin(880*2*PI*t):cos(2*PI*200*t),asplit[out0],showwaves=r=30[out1] @end example diff --git a/doc/indevs.texi b/doc/indevs.texi index 63104e2..5e8d215 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -86,7 +86,7 @@ fail to open. Set the video size in the captured video. @item framerate -Set the framerate in the captured video. +Set the frame rate in the captured video. @item sample_rate Set the sample rate (in Hz) of the captured audio. @@ -600,7 +600,7 @@ kind @file{/dev/video@var{N}}, where @var{N} is a number associated to the device. Video4Linux2 devices usually support a limited set of -@var{width}x@var{height} sizes and framerates. You can check which are +@var{width}x@var{height} sizes and frame rates. You can check which are supported using @command{-list_formats all} for Video4Linux2 devices. Some devices, like TV cards, support one or more standards. It is possible to list all the supported standards using @command{-list_standards all}. @@ -623,7 +623,7 @@ ffplay -f video4linux2 -framerate 30 -video_size hd720 /dev/video0 @item Grab and record the input of a video4linux2 device, leave the -framerate and size as previously set: +frame rate and size as previously set: @example ffmpeg -f video4linux2 -input_format mjpeg -i /dev/video0 out.mpeg @end example @@ -656,7 +656,7 @@ This option allows to select the input format, when several are available. @item framerate -Set the preferred video framerate. +Set the preferred video frame rate. @item list_formats List available formats (supported pixel formats, codecs, and frame @@ -772,7 +772,7 @@ ffmpeg -f x11grab -follow_mouse 100 -r 25 -s cif -i :0.0 out.mpg @item framerate Set the grabbing frame rate. Default value is @code{ntsc}, -corresponding to a framerate of @code{30000/1001}. +corresponding to a frame rate of @code{30000/1001}. @item show_region Show grabbed region on screen.

1 0

doc: Fix grammar in -n description
by git＠videolan.org 31 Mar '13

31 Mar '13

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Sat Mar 30 14:45:33 2013 -0400| [9f597052d460cbe6b0a5f4660997001b50867751] | committer: Derek Buitenhuis doc: Fix grammar in -n description Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f597052d460cbe6b… --- doc/ffmpeg.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 5132227..38d341e 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -232,7 +232,8 @@ input file name Overwrite output files without asking. @item -n (@emph{global}) -Do not overwrite output files but exit if file exists. +Do not overwrite output files, and exit immediately if a specified +output file already exists. @item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream}) @itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})

1 0