From d85753b79e4ce0fa7a5ddac5b2ed0cf65f7aecd8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 27 Dec 2015 02:07:01 +0100 Subject: sub: refactor initialization Just simplify by removing parts not needed anymore. This includes merging dec_sub allocation and initialization (since things making initialization complicated were removed), or format support queries (it simply tries to create a decoder, and if that fails, tries the next one). --- sub/sd_ass.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'sub/sd_ass.c') diff --git a/sub/sd_ass.c b/sub/sd_ass.c index d798b1f4f4..564a62133d 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -125,12 +125,6 @@ static void add_subtitle_fonts(struct sd *sd) } } -static bool supports_format(const char *format) -{ - return (format && strcmp(format, "ass") == 0) || - lavc_conv_supports_format(format); -} - static void enable_output(struct sd *sd, bool enable) { struct sd_ass_priv *ctx = sd->priv; @@ -633,7 +627,6 @@ static int control(struct sd *sd, enum sd_ctrl cmd, void *arg) const struct sd_functions sd_ass = { .name = "ass", .accept_packets_in_advance = true, - .supports_format = supports_format, .init = init, .decode = decode, .get_bitmaps = get_bitmaps, -- cgit v1.2.3