diff options
| author | Ben Boeckel <mathstuf@gmail.com> | 2015-02-23 22:24:38 -0500 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-24 10:45:10 +0100 |
| commit | a0894974ffb12322ed472c6a3241433f0bdd60d7 (patch) | |
| tree | d706df05568bdfe77a85a8621cc2fca0922e3ff8 /sub/sd_ass.c | |
| parent | 7281a72fabc610c70b4803ffb739c4155862c2d0 (diff) | |
| download | mpv-a0894974ffb12322ed472c6a3241433f0bdd60d7.tar.bz2 mpv-a0894974ffb12322ed472c6a3241433f0bdd60d7.tar.xz | |
libass: remove redundant checks for LIBASS_VERSION
Since 0.12.1 is the minimum, just assume it in the code too.
Diffstat (limited to 'sub/sd_ass.c')
| -rw-r--r-- | sub/sd_ass.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 73b836c98a..2ccfb5fc23 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -147,7 +147,6 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts, } mp_ass_configure(renderer, opts, !ctx->is_converted, &dim); ass_set_aspect_ratio(renderer, scale, 1); -#if LIBASS_VERSION >= 0x01020000 if (!ctx->is_converted && (!opts->ass_style_override || opts->ass_vsfilter_blur_compat)) { @@ -155,7 +154,6 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts, } else { ass_set_storage_size(renderer, 0, 0); } -#endif mp_ass_render_frame(renderer, ctx->ass_track, pts * 1000 + .5, &ctx->parts, res); talloc_steal(ctx, ctx->parts); @@ -336,7 +334,6 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts) if (opts->ass_vsfilter_color_compat == 0) // "no" return; bool force_601 = opts->ass_vsfilter_color_compat == 3; -#if LIBASS_VERSION >= 0x01020000 ASS_Track *track = ctx->ass_track; static const int ass_csp[] = { [YCBCR_BT601_TV] = MP_CSP_BT_601, @@ -371,7 +368,6 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts) // Unknown colorspace (either YCBCR_UNKNOWN, or a valid value unknown to us) if (!csp || !levels) return; -#endif struct mp_image_params params = ctx->video_params; |