changeset 11991:1c268fb0503d

A bit late, but here's the "more sane options ordering" patch. Also fixes the supported formats.
author ranma
date Mon, 23 Feb 2004 21:12:06 +0000
parents 69c3c8b71f0c
children d8890a065727
files DOCS/man/en/mplayer.1 libmpcodecs/vf_kerndeint.c
diffstat 2 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Mon Feb 23 09:30:07 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Feb 23 21:12:06 2004 +0000
@@ -2905,17 +2905,17 @@
 .B lavcdeint
 Use libavcodec's deinterlace filter.
 .TP
-.B kerndeint[=map[:order[:thresh[:sharp[:twoway]]]]]
+.B kerndeint[=thresh[:map[:order[:sharp[:twoway]]]]]
 Donald Graft's adaptive kernel deinterlacer.
 Deinterlaces parts of a video if a configurable threshold is exceeded.
 .PD 0
 .RSs
+.IPs "thresh (0 - 255)"
+Threshold (default 10).
 .IPs "map (0 or 1)"
 Paint pixels which exceed the threshold white (default: 0).
 .IPs "order (0 or 1)"
 Swap fields if 1 (default: 0).
-.IPs "thresh (0 - 255)"
-Threshold (default 10).
 .IPs "sharp (0 or 1)"
 Enable additional sharpening (default: 0).
 .IPs "twoway (0 or 1)"
--- a/libmpcodecs/vf_kerndeint.c	Mon Feb 23 09:30:07 2004 +0000
+++ b/libmpcodecs/vf_kerndeint.c	Mon Feb 23 21:12:06 2004 +0000
@@ -281,12 +281,8 @@
         switch(fmt)
 	{
 	case IMGFMT_YV12:
-	case IMGFMT_I420:
-	case IMGFMT_IYUV:
-	case IMGFMT_YVU9:
-	case IMGFMT_444P:
-	case IMGFMT_422P:
-	case IMGFMT_411P:
+	case IMGFMT_RGB:
+	case IMGFMT_YUY2:
 		return vf_next_query_format(vf, fmt);
 	}
 	return 0;
@@ -314,8 +310,8 @@
         if (args)
         {
             sscanf(args, "%d:%d:%d:%d:%d",
-		&vf->priv->map, &vf->priv->order,
-		&vf->priv->thresh, &vf->priv->sharp,
+		&vf->priv->thresh, &vf->priv->map,
+		&vf->priv->order, &vf->priv->sharp,
 		&vf->priv->twoway);
         }
 	if (vf->priv->order > 1) vf->priv->order = 1;