summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-28 21:19:36 +0200
committerwm4 <wm4@nowhere>2012-10-16 07:26:28 +0200
commitffb7a2fe17af204635db6694b5b49b6368be91e6 (patch)
tree2aa0814e4cf37443bb01b50a23c19b28547a99f1 /mplayer.c
parent65ea69f56476aabb0755ae80b7dc565df23ab426 (diff)
downloadmpv-ffb7a2fe17af204635db6694b5b49b6368be91e6.tar.bz2
mpv-ffb7a2fe17af204635db6694b5b49b6368be91e6.tar.xz
sub: create sub_bitmap array even when using libass
One sub_bitmaps struct could contain either a libass ASS_Image list, or a mplayer native list of sub-bitmaps. This caused code duplication in vo_vdpau.c and bitmap_packer.c. Avoid this by creating such a sub_bitmap array even with libass. This basically copies the list and recreates it in mplayer's native format. It gets rid of the code duplication, and will make implementing extended subtitle and OSD rendering in other VOs easier. Also do some cosmetic changes and other preparations for the following commits.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index d17be7c357..5c08cdf330 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2638,8 +2638,6 @@ static int redraw_osd(struct MPContext *mpctx)
{
struct sh_video *sh_video = mpctx->sh_video;
struct vf_instance *vf = sh_video->vfilter;
- if (sh_video->output_flags & VFCAP_OSD_FILTER)
- return -1;
if (vo_redraw_frame(mpctx->video_out) < 0)
return -1;
mpctx->osd->sub_pts = mpctx->video_pts;