diff options
| author | wm4 <wm4@nowhere> | 2012-10-19 19:25:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:34 +0200 |
| commit | 4d11f32162b08e3b48ae382e2ed0a151035f8aea (patch) | |
| tree | c588341bf672fd935de45a05bef99e0d8f20892f /sub/spudec.h | |
| parent | a4f9077f6c1a897120616cc70c1ca37c6a247be2 (diff) | |
| download | mpv-4d11f32162b08e3b48ae382e2ed0a151035f8aea.tar.bz2 mpv-4d11f32162b08e3b48ae382e2ed0a151035f8aea.tar.xz | |
VO, sub: refactor
Remove VFCTRL_DRAW_OSD, VFCAP_EOSD_FILTER, VFCAP_EOSD_RGBA, VFCAP_EOSD,
VOCTRL_DRAW_EOSD, VOCTRL_GET_EOSD_RES, VOCTRL_QUERY_EOSD_FORMAT.
Remove draw_osd_with_eosd(), which rendered the OSD by calling
VOCTRL_DRAW_EOSD. Change VOs to call osd_draw() directly, which takes
a callback as argument. (This basically works like the old OSD API,
except multiple OSD bitmap formats are supported and caching is
possible.)
Remove all mentions of "eosd". It's simply "osd" now.
Make OSD size per-OSD-object, as they can be different when using
vf_sub. Include display_par/video_par in resolution change detection.
Fix the issue with margin borders in vo_corevideo.
Diffstat (limited to 'sub/spudec.h')
| -rw-r--r-- | sub/spudec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/spudec.h b/sub/spudec.h index 6611a28327..84a05cbee0 100644 --- a/sub/spudec.h +++ b/sub/spudec.h @@ -22,11 +22,11 @@ #include <stdint.h> struct sub_bitmaps; -struct mp_eosd_res; +struct mp_osd_res; void spudec_heartbeat(void *this, unsigned int pts100); void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pts100); -void spudec_get_indexed(void *this, struct mp_eosd_res *dim, struct sub_bitmaps *res); +void spudec_get_indexed(void *this, struct mp_osd_res *dim, struct sub_bitmaps *res); void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height, uint8_t *extradata, int extradata_len); void *spudec_new(unsigned int *palette); void spudec_free(void *this); |