Mercurial > mplayer.hg
changeset 28806:77d1e5749a09
Swap order of VFCTRL_DRAW_EOSD and VFCTRL_DRAW_OSD so that the EOSD is drawn
below the OSD and document possible issues when this is changed.
Patch by Uoti (though originally intended for a different issue) with extra comment by me.
| author | reimar |
|---|---|
| date | Fri, 06 Mar 2009 10:45:49 +0000 |
| parents | b382d065ba53 |
| children | 338065cac802 |
| files | libmpcodecs/dec_video.c |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/dec_video.c Fri Mar 06 10:39:58 2009 +0000 +++ b/libmpcodecs/dec_video.c Fri Mar 06 10:45:49 2009 +0000 @@ -415,10 +415,13 @@ // apply video filters and call the leaf vo/ve int ret = vf->put_image(vf, mpi, pts); if (ret > 0) { - vf->control(vf, VFCTRL_DRAW_OSD, NULL); + // draw EOSD first so it ends up below the OSD. + // Note that changing this is will not work right with vf_ass and the + // vos currently always draw the EOSD first in paused mode. #ifdef CONFIG_ASS vf->control(vf, VFCTRL_DRAW_EOSD, NULL); #endif + vf->control(vf, VFCTRL_DRAW_OSD, NULL); } t2 = GetTimer()-t2;