diff options
| author | wm4 <wm4@nowhere> | 2012-09-28 21:19:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:26:28 +0200 |
| commit | ffb7a2fe17af204635db6694b5b49b6368be91e6 (patch) | |
| tree | 2aa0814e4cf37443bb01b50a23c19b28547a99f1 /libmpcodecs | |
| parent | 65ea69f56476aabb0755ae80b7dc565df23ab426 (diff) | |
| download | mpv-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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vfcap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h index aef75840ae..0bb255b3cd 100644 --- a/libmpcodecs/vfcap.h +++ b/libmpcodecs/vfcap.h @@ -46,7 +46,6 @@ #define VFCAP_EOSD_UNSCALED 0x4000 // used by libvo and vf_vo, indicates the VO does not support draw_slice for this format #define VOCAP_NOSLICES 0x8000 -#define VFCAP_OSD_FILTER 0x10000 // OSD is drawn in filter chain #define VFCAP_EOSD_FILTER 0x20000 // EOSD is drawn in filter chain #define VFCAP_EOSD_RGBA 0x40000 |