diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
| commit | 6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3 (patch) | |
| tree | 01b5badc0c32d180a63b8b81553cef40407f6884 /doc/filters.texi | |
| parent | 8695d9de4704aa328b6dd0e9826c04da44d04046 (diff) | |
| parent | ffea3b00c39caa8ad78456ae08c8353929974dfd (diff) | |
| download | ffmpeg-6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3.tar.gz | |
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
vf_settb: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index f7fa5f1e64..251bcb5bc7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6915,9 +6915,14 @@ ffmpeg -nostats -i input.mp3 -filter_complex ebur128 -f null - Set the timebase to use for the output frames timestamps. It is mainly useful for testing timebase configuration. -This filter accepts a single option @option{tb}, which can be -specified either by setting @option{tb}=@var{VALUE} or setting the -value alone. +This filter accepts the following options: + +@table @option + +@item expr +The expression which is evaluated into the output timebase. + +@end table The value for @option{tb} is an arithmetic expression representing a rational. The expression can contain the constants "AVTB" (the default @@ -6930,13 +6935,13 @@ audio only). Default value is "intb". @item Set the timebase to 1/25: @example -settb=1/25 +settb=expr=1/25 @end example @item Set the timebase to 1/10: @example -settb=0.1 +settb=expr=0.1 @end example @item |