RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-26 10:14:33 +00:00
Code Issues Releases Wiki Activity

more mp_property_deinterlace simplification, patch by

Browse Source 
Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21018 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-18 12:38:03 +00:00
parent 45358915e7
commit 582d0b7cab
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvo/vo_xvmc.c
View File

@ -1383,9 +1383,6 @@ static int control(uint32_t request, void *data, ... )
*(int*)data = bob_deinterlace; *(int*)data = bob_deinterlace;
return VO_TRUE; return VO_TRUE;
case VOCTRL_SET_DEINTERLACE: case VOCTRL_SET_DEINTERLACE:
if (*(int*)data == -1)
bob_deinterlace = !bob_deinterlace;
else
bob_deinterlace = *(int*)data; bob_deinterlace = *(int*)data;
return VO_TRUE; return VO_TRUE;
case VOCTRL_QUERY_FORMAT: case VOCTRL_QUERY_FORMAT:

6
mplayer.c
View File

@ -1934,7 +1934,7 @@ static int mp_property_fullscreen(m_option_t* prop,int action,void* arg) {
} }
static int mp_property_deinterlace(m_option_t* prop,int action,void* arg) { static int mp_property_deinterlace(m_option_t* prop,int action,void* arg) {
int toggle = -1; int deinterlace;
vf_instance_t *vf; vf_instance_t *vf;
if (!sh_video || !sh_video->vfilter) return M_PROPERTY_UNAVAILABLE; if (!sh_video || !sh_video->vfilter) return M_PROPERTY_UNAVAILABLE;
vf = sh_video->vfilter; vf = sh_video->vfilter;
@ -1950,7 +1950,9 @@ static int mp_property_deinterlace(m_option_t* prop,int action,void* arg) {
return M_PROPERTY_OK; return M_PROPERTY_OK;
case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_UP:
case M_PROPERTY_STEP_DOWN: 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_OK;
} }
return M_PROPERTY_NOT_IMPLEMENTED; return M_PROPERTY_NOT_IMPLEMENTED;