diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
| commit | 6638207bce4eabd3f99295c1ab096d2815eff3ce (patch) | |
| tree | 7ffc8358858c6628812a7514dc6e11d02083b2e2 /doc/filters.texi | |
| parent | 2c1c0c5024f8e82200874762cbeeda494875b7e3 (diff) | |
| parent | e83c2ddebf8ee90086d8e34de9c8ba245f548f89 (diff) | |
| download | ffmpeg-6638207bce4eabd3f99295c1ab096d2815eff3ce.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix 'heigth' vs. 'height' typos.
lavc/lavf: use unique private classes.
lavc: use designated initializers for av_codec_context_class
Conflicts:
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index d5013f345b..c643c06c3e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -486,13 +486,13 @@ the computed values for @var{x} and @var{y}. They are evaluated for each new frame. @item in_w, in_h -the input width and heigth +the input width and height @item iw, ih same as @var{in_w} and @var{in_h} @item out_w, out_h -the output (cropped) width and heigth +the output (cropped) width and height @item ow, oh same as @var{out_w} and @var{out_h} @@ -1548,13 +1548,13 @@ the corresponding mathematical approximated values for e (euler number), pi (greek PI), phi (golden ratio) @item in_w, in_h -the input video width and heigth +the input video width and height @item iw, ih same as @var{in_w} and @var{in_h} @item out_w, out_h -the output width and heigth, that is the size of the padded area as +the output width and height, that is the size of the padded area as specified by the @var{width} and @var{height} expressions @item ow, oh @@ -1667,13 +1667,13 @@ the corresponding mathematical approximated values for e (euler number), pi (greek PI), phi (golden ratio) @item in_w, in_h -the input width and heigth +the input width and height @item iw, ih same as @var{in_w} and @var{in_h} @item out_w, out_h -the output (cropped) width and heigth +the output (cropped) width and height @item ow, oh same as @var{out_w} and @var{out_h} @@ -2318,7 +2318,7 @@ alpha specifier. The default value is "black". @item frame_size Specify the size of the sourced video, it may be a string of the form -@var{width}x@var{heigth}, or the name of a size abbreviation. The +@var{width}x@var{height}, or the name of a size abbreviation. The default value is "320x240". @item frame_rate |