aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-05-20 09:50:00 +0200
committerPaul B Mahol <onemda@gmail.com>2016-05-20 09:51:55 +0200
commit8b5941ce5954e26d372b8bf88babfa3d62175dd0 (patch)
treed549c4e1f6ae757bba673fe645c807e12dceaab2 /doc
parentb24fffeb9476b46be89229c8df338a8c8f1a9a62 (diff)
downloadffmpeg-8b5941ce5954e26d372b8bf88babfa3d62175dd0.tar.gz
doc/filters: fix order of tinterlace filter drop modes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/filters.texi26
1 files changed, 14 insertions, 12 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 27584e91db..b35c65135c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -12669,8 +12669,8 @@ Output:
22222 44444
@end example
-@item drop_odd, 1
-Only output even frames, odd frames are dropped, generating a frame with
+@item drop_even, 1
+Only output odd frames, even frames are dropped, generating a frame with
unchanged height at half frame rate.
@example
@@ -12684,14 +12684,14 @@ Frame 1 Frame 2 Frame 3 Frame 4
11111 22222 33333 44444
Output:
- 22222 44444
- 22222 44444
- 22222 44444
- 22222 44444
+11111 33333
+11111 33333
+11111 33333
+11111 33333
@end example
-@item drop_even, 2
-Only output odd frames, even frames are dropped, generating a frame with
+@item drop_odd, 2
+Only output even frames, odd frames are dropped, generating a frame with
unchanged height at half frame rate.
@example
@@ -12705,10 +12705,10 @@ Frame 1 Frame 2 Frame 3 Frame 4
11111 22222 33333 44444
Output:
-11111 33333
-11111 33333
-11111 33333
-11111 33333
+ 22222 44444
+ 22222 44444
+ 22222 44444
+ 22222 44444
@end example
@item pad, 3
@@ -12805,9 +12805,11 @@ Output:
11111 11111 22222 22222 33333 33333 44444
@end example
+
@item mergex2, 7
Move odd frames into the upper field, even into the lower field,
generating a double height frame at same frame rate.
+
@example
------> time
Input: