diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
| commit | b14517d3cd3787f3c399f3ca7faf1a99a1066ff8 (patch) | |
| tree | 368cc144be79c3c7c4ef1a146c73b2ea19e53c64 /doc | |
| parent | 130c33af35c5d8798f70c62586ab228d4f8cd2a2 (diff) | |
| parent | 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4 (diff) | |
| download | ffmpeg-streaming-b14517d3cd3787f3c399f3ca7faf1a99a1066ff8.zip ffmpeg-streaming-b14517d3cd3787f3c399f3ca7faf1a99a1066ff8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filters.texi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 352d49e..d102843 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5278,7 +5278,8 @@ Swap luma/chroma/alpha fields. Exchange even & odd lines. Default value is @code Simple interlacing filter from progressive contents. This interleaves upper (or lower) lines from odd frames with lower (or upper) lines from even frames, -halving the frame rate and preserving image height. +halving the frame rate and preserving image height. A vertical lowpass filter +is always applied in order to avoid twitter effects and reduce moire patterns. @example Original Original New Frame @@ -5298,10 +5299,6 @@ It accepts the following optional parameters: @item scan determines whether the interlaced frame is taken from the even (tff - default) or odd (bff) lines of the progressive frame. - -@item lowpass -Enable (default) or disable the vertical lowpass filter to avoid twitter -interlacing and reduce moire patterns. @end table @section kerndeint |
