diff options
| author | ranma <ranma@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-23 21:12:06 +0000 |
|---|---|---|
| committer | ranma <ranma@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-02-23 21:12:06 +0000 |
| commit | f4f06018b973c36869e1b37fc65fa7999c15a055 (patch) | |
| tree | 63e67a4b8e2070cfb0870a3024ce4dbbbc58129e | |
| parent | e3ff1abced61ea5f8d02e10eaeb0843cd52a44d0 (diff) | |
| download | mpv-f4f06018b973c36869e1b37fc65fa7999c15a055.tar.bz2 mpv-f4f06018b973c36869e1b37fc65fa7999c15a055.tar.xz | |
A bit late, but here's the "more sane options ordering" patch.
Also fixes the supported formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11992 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_kerndeint.c | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 8cf60e5168..0f76383a97 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2905,17 +2905,17 @@ be detected as interlaced to drop the frame. .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)" diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c index a383996bfb..accb370bfe 100644 --- a/libmpcodecs/vf_kerndeint.c +++ b/libmpcodecs/vf_kerndeint.c @@ -281,12 +281,8 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ 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 @@ static int open(vf_instance_t *vf, char* args){ 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; |