From 3be5ebde87e8856650fdeef9614247bed637cbb1 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 6 Mar 2009 10:45:49 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28841 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/dec_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libmpcodecs/dec_video.c') diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index f158d7eddf..4186bd5e72 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -415,10 +415,13 @@ int filter_video(sh_video_t *sh_video, void *frame, double pts) // 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; -- cgit v1.2.3