diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-06 10:45:49 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-06 10:45:49 +0000 |
| commit | 3be5ebde87e8856650fdeef9614247bed637cbb1 (patch) | |
| tree | 7c43181abf1c080305b66f9f413f63af52793980 /libmpcodecs | |
| parent | d4748622fa98dcc5cb4cecc77655bec7476b8387 (diff) | |
| download | mpv-3be5ebde87e8856650fdeef9614247bed637cbb1.tar.bz2 mpv-3be5ebde87e8856650fdeef9614247bed637cbb1.tar.xz | |
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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/dec_video.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |