diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /sub/sd.h | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'sub/sd.h')
| -rw-r--r-- | sub/sd.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,15 +1,14 @@ #ifndef MPLAYER_SD_H #define MPLAYER_SD_H -struct osd_state; -struct sh_sub; -struct sub_bitmaps; +#include "dec_sub.h" struct sd_functions { int (*init)(struct sh_sub *sh, struct osd_state *osd); void (*decode)(struct sh_sub *sh, struct osd_state *osd, void *data, int data_len, double pts, double duration); void (*get_bitmaps)(struct sh_sub *sh, struct osd_state *osd, + struct mp_osd_res dim, double pts, struct sub_bitmaps *res); void (*reset)(struct sh_sub *sh, struct osd_state *osd); void (*switch_off)(struct sh_sub *sh, struct osd_state *osd); |