[FFmpeg-devel] [PATCH] lavfi: add splice filters

[Lou Logan]

On Wed, 10 Apr 2013 01:43:18 +0200, Stefano Sabatini wrote:

> ---
>  doc/filters.texi         |   38 ++++++
>  libavfilter/Makefile     |    2 +
>  libavfilter/allfilters.c |    2 +
>  libavfilter/f_splice.c   |  295 ++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 337 insertions(+)
>  create mode 100644 libavfilter/f_splice.c
> 
> diff --git a/doc/filters.texi b/doc/filters.texi
> index d01ae82..dbbfafe 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -6792,6 +6792,44 @@ setpts='(RTCTIME - RTCSTART) / (TB * 1000000)'
>  @end example
>  @end itemize
>  
> + at section asplice, splice
> +
> +Mux frame from sevaral inputs together.

Mux frames from several inputs together.

> + at code{asplice} works on audio frames, @code{splice} on video frames.
> +
> +These filters read frames from several inputs, and send the oldest
> +frame cached so far to output.

These filters read frames from several inputs and send the oldest cached
frame to the output.

> +In order to work, they need to cache at least one frame for each
> +input, so they cannot work in case one input is not terminated and
> +will not receive input frames.

"...so they cannot work in case one input is not terminated and will not
receive input frames"

Sorry if this is obvious, but this half of the sentence is unclear and
confusing to me.

> Also, in order to work properly, the
> +input frames must have a well defined timestamp value, and should be
> +such that they are monotonically increasing.

Less verbose version without the ambiguous "they":

Input frames must have a well defined, monotonically increasing
timestamp value.

> +These filters accept parameters as a list of @var{key}=@var{value}
> +pairs, separated by ":". They accept the following options.
> +
> + at table @option
> + at item nb_inputs, n
> +Set the number of different inputs, it is 2 by default.
> +
> + at end table
> +
> + at subsection Examples
> +
> + at item
> +Interleave frames belonging to different streams using @command{ffmpeg}:
> + at example
> +ffmpeg -i bambi.avi -i pr0n.mkv -filter_complex "[0:v][1:v] splice" out.avi

I'm not the only one who doesn't get the hidden reference to a popular
movie. (Keeping it fine with me.)

Reset of the doc stuff looks fine to me.