diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
| commit | 0803f4ad21c195519209bae8d18840dd810191f8 (patch) | |
| tree | f9a869011ba90c106cf5c05c3e346912a669f63a /sub/ass_mp.h | |
| parent | 9d2980dab752280468620df49cabe7f4843f0551 (diff) | |
| parent | b968d779afb9114694976792e903b0591a71a816 (diff) | |
| download | mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.bz2 mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'sub/ass_mp.h')
| -rw-r--r-- | sub/ass_mp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/ass_mp.h b/sub/ass_mp.h index 789a53acb1..b4cae24ddc 100644 --- a/sub/ass_mp.h +++ b/sub/ass_mp.h @@ -55,7 +55,7 @@ ASS_Library *mp_ass_init(struct mpv_global *global, struct mp_log *log); struct sub_bitmap; struct sub_bitmaps; void mp_ass_render_frame(ASS_Renderer *renderer, ASS_Track *track, double time, - struct sub_bitmap **parts, struct sub_bitmaps *res); + struct sub_bitmaps *res); #endif /* HAVE_LIBASS */ #endif /* MPLAYER_ASS_MP_H */ |