[MPlayer-cvslog] r21018 - in trunk: libvo/vo_xvmc.c mplayer.c

[reimar]

Author: reimar
Date: Sat Nov 18 13:38:03 2006
New Revision: 21018

Modified:
   trunk/libvo/vo_xvmc.c
   trunk/mplayer.c

Log:
more mp_property_deinterlace simplification, patch by
Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at]


Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	(original)
+++ trunk/libvo/vo_xvmc.c	Sat Nov 18 13:38:03 2006
@@ -1383,10 +1383,7 @@
         *(int*)data = bob_deinterlace;
         return VO_TRUE;
       case VOCTRL_SET_DEINTERLACE:
-        if (*(int*)data == -1)
-            bob_deinterlace = !bob_deinterlace;
-        else
-            bob_deinterlace = *(int*)data;
+        bob_deinterlace = *(int*)data;
         return VO_TRUE;
       case VOCTRL_QUERY_FORMAT:
          return query_format(*((uint32_t*)data));

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sat Nov 18 13:38:03 2006
@@ -1934,7 +1934,7 @@
 }
 
 static int mp_property_deinterlace(m_option_t* prop,int action,void* arg) {
-    int toggle = -1;
+    int deinterlace;
     vf_instance_t *vf;
     if (!sh_video || !sh_video->vfilter) return M_PROPERTY_UNAVAILABLE;
     vf = sh_video->vfilter;
@@ -1950,7 +1950,9 @@
         return M_PROPERTY_OK;
     case M_PROPERTY_STEP_UP:
     case M_PROPERTY_STEP_DOWN:
-        vf->control(vf, VFCTRL_SET_DEINTERLACE, &toggle);
+        vf->control(vf, VFCTRL_GET_DEINTERLACE, &deinterlace);
+        deinterlace = !deinterlace;
+        vf->control(vf, VFCTRL_SET_DEINTERLACE, &deinterlace);
         return M_PROPERTY_OK;
     }
     return M_PROPERTY_NOT_IMPLEMENTED;