[MPlayer-cvslog] r28841 - trunk/libmpcodecs/dec_video.c

[reimar]

Author: reimar
Date: Fri Mar  6 11:45:49 2009
New Revision: 28841

Log:
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.

Modified:
   trunk/libmpcodecs/dec_video.c

Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c	Fri Mar  6 11:39:58 2009	(r28840)
+++ trunk/libmpcodecs/dec_video.c	Fri Mar  6 11:45:49 2009	(r28841)
@@ -415,10 +415,13 @@ int filter_video(sh_video_t *sh_video, v
     // 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;