On Thu, Apr 11, 2013 at 09:10:02PM +0200, Anton Khirnov wrote:
> ---
> Changelog | 1 +
> doc/filters.texi | 125 +++++++++++
> libavfilter/Makefile | 2 +
> libavfilter/allfilters.c | 2 +
> libavfilter/trim.c | 407
> ++++++++++++++++++++++++++++++++++
> tests/fate/filter.mak | 30 +++
> tests/ref/fate/filter-atrim-duration | 2 +
> tests/ref/fate/filter-atrim-mixed | 5 +
> tests/ref/fate/filter-atrim-samples | 2 +
> tests/ref/fate/filter-atrim-time | 6 +
> tests/ref/fate/filter-trim-duration | 2 +
> tests/ref/fate/filter-trim-frame | 8 +
> tests/ref/fate/filter-trim-mixed | 10 +
> tests/ref/fate/filter-trim-time | 3 +
> 14 files changed, 605 insertions(+)
> create mode 100644 libavfilter/trim.c
> create mode 100644 tests/ref/fate/filter-atrim-duration
> create mode 100644 tests/ref/fate/filter-atrim-mixed
> create mode 100644 tests/ref/fate/filter-atrim-samples
> create mode 100644 tests/ref/fate/filter-atrim-time
> create mode 100644 tests/ref/fate/filter-trim-duration
> create mode 100644 tests/ref/fate/filter-trim-frame
> create mode 100644 tests/ref/fate/filter-trim-mixed
> create mode 100644 tests/ref/fate/filter-trim-time
version bump missing
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -345,6 +345,70 @@ with a negative pts due to encoder delay.
> +
> +Note that that the first two sets of the start/end options and the
> +@option{duration} option look at the frame timestamp, while the _sample
> options
> +simply count the samples that pass through the filter. So start/end_pts and
> +start/end_sample will give different results when the timestamps are wrong,
One could optionally add some markup around all the _sample mentions.
> @@ -2221,6 +2285,67 @@ l.r l.L
>
> +@item start_pts
> +Same as @var{start}, except this option sets the start timestamp in the
> timebase
> +units instead of seconds.
in timebase units
> +@item end_pts
> +Same as @var{end}, except this option sets the end timestamp in the timebase
> +units instead of seconds.
same
> +Note that that the first two sets of the start/end options and the
s/that that/that/
> +@option{duration} option look at the frame timestamp, while the _frame
> variants
optional markup
> +If multiple start or end options are set, this filter tries to be greedy and
> +keep all the frames that pass at least one of the specified constraints. To
> keep
s/pass/match/
Documentation looks good to me otherwise.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
