diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 28fb96208e..d3a792c9d2 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -45,17 +45,10 @@
 #define SUB_MICRODVD  0
 #define SUB_SUBRIP    1
 #define SUB_SUBVIEWER 2
-#define SUB_SAMI      3
-#define SUB_VPLAYER   4
-#define SUB_RT        5
-#define SUB_SSA       6
-#define SUB_PJS       7
-#define SUB_MPSUB     8
-#define SUB_AQTITLE   9
-#define SUB_SUBVIEWER2 10
-#define SUB_SUBRIP09 11
-#define SUB_JACOSUB  12
-#define SUB_MPL2     13
+#define SUB_SSA       3
+#define SUB_SUBVIEWER2 4
+#define SUB_SUBRIP09 5
+#define SUB_MPL2     6
 
 #define SUB_MAX_TEXT 12
 #define SUB_ALIGNMENT_BOTTOMLEFT       1
@@ -123,182 +116,6 @@ static int eol(char p) {
         return p=='\r' || p=='\n' || p=='\0';
 }
 
-/* Remove leading and trailing space */
-static void trail_space(char *s) {
-        int i = 0;
-        while (isspace(s[i])) ++i;
-        int copylen = strlen(s + i);
-        if (i) memmove(s, s + i, copylen);
-        i = strlen(s) - 1;
-        while (i > 0 && isspace(s[i])) s[i--] = '\0';
-}
-
-static char *stristr(const char *haystack, const char *needle) {
-    int len = 0;
-    const char *p = haystack;
-
-    if (!(haystack && needle)) return NULL;
-
-    len=strlen(needle);
-    while (*p != '\0') {
-        if (strncasecmp(p, needle, len) == 0) return (char*)p;
-        p++;
-    }
-
-    return NULL;
-}
-
-static void sami_add_line(subtitle *current, char *buffer, char **pos) {
-    char *p = *pos;
-    *p = 0;
-    trail_space(buffer);
-    if (*buffer && current->lines < SUB_MAX_TEXT)
-        current->text[current->lines++] = strdup(buffer);
-    *pos = buffer;
-}
-
-static subtitle *sub_read_line_sami(stream_t* st, subtitle *current,
-                                    struct readline_args *args)
-{
-    int utf16 = args->utf16;
-    static char line[LINE_LEN+1];
-    static char *s = NULL, *slacktime_s;
-    char text[LINE_LEN+1], *p=NULL, *q;
-    int state;
-
-    current->lines = current->start = current->end = 0;
-    current->alignment = SUB_ALIGNMENT_BOTTOMCENTER;
-    state = 0;
-
-    /* read the first line */
-    if (!s)
-            if (!(s = stream_read_line(st, line, LINE_LEN, utf16))) return 0;
-
-    do {
-        switch (state) {
-
-        case 0: /* find "START=" or "Slacktime:" */
-            slacktime_s = stristr (s, "Slacktime:");
-            if (slacktime_s)
-                args->sub_slacktime = strtol (slacktime_s+10, NULL, 0) / 10;
-
-            s = stristr (s, "Start=");
-            if (s) {
-                current->start = strtol (s + 6, &s, 0) / 10;
-                /* eat '>' */
-                for (; *s != '>' && *s != '\0'; s++);
-                s++;
-                state = 1; continue;
-            }
-            break;
-
-        case 1: /* find (optional) "<P", skip other TAGs */
-            for  (; *s == ' ' || *s == '\t'; s++); /* strip blanks, if any */
-            if (*s == '\0') break;
-            if (*s != '<') { state = 3; p = text; continue; } /* not a TAG */
-            s++;
-            if (*s == 'P' || *s == 'p') { s++; state = 2; continue; } /* found '<P' */
-            for (; *s != '>' && *s != '\0'; s++); /* skip remains of non-<P> TAG */
-            if (*s == '\0')
-              break;
-            s++;
-            continue;
-
-        case 2: /* find ">" */
-            if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; }
-            break;
-
-        case 3: /* get all text until '<' appears */
-            if (p - text >= LINE_LEN)
-                sami_add_line(current, text, &p);
-            if (*s == '\0') break;
-            else if (!strncasecmp (s, "<br>", 4)) {
-                sami_add_line(current, text, &p);
-                s += 4;
-            }
-            else if (*s == '{') { state = 5; ++s; continue; }
-            else if (*s == '<') { state = 4; }
-            else if (!strncasecmp (s, "&nbsp;", 6)) { *p++ = ' '; s += 6; }
-            else if (*s == '\t') { *p++ = ' '; s++; }
-            else if (*s == '\r' || *s == '\n') { s++; }
-            else *p++ = *s++;
-
-            /* skip duplicated space */
-            if (p > text + 2) if (*(p-1) == ' ' && *(p-2) == ' ') p--;
-
-            continue;
-
-        case 4: /* get current->end or skip <TAG> */
-            q = stristr (s, "Start=");
-            if (q) {
-                current->end = strtol (q + 6, &q, 0) / 10 - 1;
-                *p = '\0'; trail_space (text);
-                if (text[0] != '\0')
-                    current->text[current->lines++] = strdup (text);
-                if (current->lines > 0) { state = 99; break; }
-                state = 0; continue;
-            }
-            s = strchr (s, '>');
-            if (s) { s++; state = 3; continue; }
-            break;
-       case 5: /* get rid of {...} text, but read the alignment code */
-            if ((*s == '\\') && (*(s + 1) == 'a')) {
-               if (stristr(s, "\\a1") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_BOTTOMLEFT;
-                   s = s + 3;
-               }
-               if (stristr(s, "\\a2") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_BOTTOMCENTER;
-                   s = s + 3;
-               } else if (stristr(s, "\\a3") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT;
-                   s = s + 3;
-               } else if ((stristr(s, "\\a4") != NULL) || (stristr(s, "\\a5") != NULL) || (stristr(s, "\\a8") != NULL)) {
-                   current->alignment = SUB_ALIGNMENT_TOPLEFT;
-                   s = s + 3;
-               } else if (stristr(s, "\\a6") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_TOPCENTER;
-                   s = s + 3;
-               } else if (stristr(s, "\\a7") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_TOPRIGHT;
-                   s = s + 3;
-               } else if (stristr(s, "\\a9") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_MIDDLELEFT;
-                   s = s + 3;
-               } else if (stristr(s, "\\a10") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_MIDDLECENTER;
-                   s = s + 4;
-               } else if (stristr(s, "\\a11") != NULL) {
-                   current->alignment = SUB_ALIGNMENT_MIDDLERIGHT;
-                   s = s + 4;
-               }
-            }
-            if (*s == '}') state = 3;
-            ++s;
-            continue;
-        }
-
-        /* read next line */
-        if (state != 99 && !(s = stream_read_line (st, line, LINE_LEN, utf16))) {
-            if (current->start > 0) {
-                break; // if it is the last subtitle
-            } else {
-                return 0;
-            }
-        }
-
-    } while (state != 99);
-
-    // For the last subtitle
-    if (current->end <= 0) {
-        current->end = current->start + args->sub_slacktime;
-        sami_add_line(current, text, &p);
-    }
-
-    return current;
-}
-
-
 static const char *sub_readtext(const char *source, char **dest) {
     int len=0;
     const char *p=source;
@@ -499,98 +316,6 @@ static subtitle *sub_read_line_subviewer2(stream_t *st,subtitle *current,
     return current;
 }
 
-
-static subtitle *sub_read_line_vplayer(stream_t *st,subtitle *current,
-                                       struct readline_args *args)
-{
-        int utf16 = args->utf16;
-        char line[LINE_LEN+1];
-        int a1,a2,a3;
-        char *p=NULL, separator;
-        int len,plen;
-
-        while (!current->text[0]) {
-                if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
-                if ((len=sscanf (line, "%d:%d:%d%c%n",&a1,&a2,&a3,&separator,&plen)) < 4)
-                        continue;
-
-                if (!(current->start = a1*360000+a2*6000+a3*100))
-                        continue;
-                /* removed by wodzu
-                p=line;
-                // finds the body of the subtitle
-                for (i=0; i<3; i++){
-                   p=strchr(p,':');
-                   if (p==NULL) break;
-                   ++p;
-                }
-                if (p==NULL) {
-                    printf("Skipping incorrect subtitle line!\n");
-                    continue;
-                }
-                */
-                // by wodzu: hey! this time we know what length it has! what is
-                // that magic for? it can't deal with space instead of third
-                // colon! look, what simple it can be:
-                p = &line[ plen ];
-
-                if (*p!='|') {
-                        //
-                        return set_multiline_text(args, current, p, 0);
-                }
-        }
-        return current;
-}
-
-static subtitle *sub_read_line_rt(stream_t *st,subtitle *current,
-                                    struct readline_args *args)
-{
-    int utf16 = args->utf16;
-
-        //TODO: This format uses quite rich (sub/super)set of xhtml
-        // I couldn't check it since DTD is not included.
-        // WARNING: full XML parses can be required for proper parsing
-    char line[LINE_LEN+1];
-    int a1,a2,a3,a4,b1,b2,b3,b4;
-    char *p=NULL,*next=NULL;
-    int len,plen;
-
-    while (!current->text[0]) {
-        if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
-        //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0
-        //to describe the same moment in time. Maybe there are even more formats in use.
-        //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
-        plen=a1=a2=a3=a4=b1=b2=b3=b4=0;
-        if (
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen)) < 4) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen)) < 5) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) &&
-//      ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) &&
-        //now try it without end time
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) &&
-        ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4)
-        )
-            continue;
-        current->start = a1*360000+a2*6000+a3*100+a4/10;
-        current->end   = b1*360000+b2*6000+b3*100+b4/10;
-        if (b1 == 0 && b2 == 0 && b3 == 0 && b4 == 0)
-          current->end = current->start+200;
-        p=line; p+=plen;
-        // TODO: I don't know what kind of convention is here for marking multiline subs, maybe <br/> like in xml?
-        next = strstr(line,"<clear/>");
-        if(next && strlen(next)>8){
-          next+=8;
-          return set_multiline_text(args, current, next, 0);
-        }
-    }
-    return current;
-}
-
 static subtitle *sub_read_line_ssa(stream_t *st,subtitle *current,
                                     struct readline_args *args)
 {
@@ -654,135 +379,6 @@ static subtitle *sub_read_line_ssa(stream_t *st,subtitle *current,
         return current;
 }
 
-/*
- * PJS subtitles reader.
- * That's the "Phoenix Japanimation Society" format.
- * I found some of them in http://www.scriptsclub.org/ (used for anime).
- * The time is in tenths of second.
- *
- * by set, based on code by szabi (dunnowhat sub format ;-)
- */
-static subtitle *sub_read_line_pjs(stream_t *st,subtitle *current,
-                                   struct readline_args *args)
-{
-    int utf16 = args->utf16;
-    char line[LINE_LEN+1];
-    char text[LINE_LEN+1], *s, *d;
-
-    if (!stream_read_line (st, line, LINE_LEN, utf16))
-        return NULL;
-    /* skip spaces */
-    for (s=line; *s && isspace(*s); s++);
-    /* allow empty lines at the end of the file */
-    if (*s==0)
-        return NULL;
-    /* get the time */
-    if (sscanf (s, "%ld,%ld,", &(current->start),
-                &(current->end)) <2) {
-        return ERR;
-    }
-    /* the files I have are in tenths of second */
-    current->start *= 10;
-    current->end *= 10;
-    /* walk to the beggining of the string */
-    for (; *s; s++) if (*s==',') break;
-    if (*s) {
-        for (s++; *s; s++) if (*s==',') break;
-        if (*s) s++;
-    }
-    if (*s!='"') {
-        return ERR;
-    }
-    /* copy the string to the text buffer */
-    for (s++, d=text; *s && *s!='"'; s++, d++)
-        *d=*s;
-    *d=0;
-    current->text[0] = strdup(text);
-    current->lines = 1;
-
-    return current;
-}
-
-static subtitle *sub_read_line_mpsub(stream_t *st, subtitle *current,
-                                     struct readline_args *args)
-{
-        int utf16 = args->utf16;
-        char line[LINE_LEN+1];
-        float a,b;
-        int num=0;
-        char *p, *q;
-
-        do
-        {
-                if (!stream_read_line(st, line, LINE_LEN, utf16)) return NULL;
-        } while (sscanf (line, "%f %f", &a, &b) !=2);
-
-        args->mpsub_position += a*args->mpsub_multiplier;
-        current->start=(int) args->mpsub_position;
-        args->mpsub_position += b*args->mpsub_multiplier;
-        current->end=(int) args->mpsub_position;
-
-        while (num < SUB_MAX_TEXT) {
-                if (!stream_read_line (st, line, LINE_LEN, utf16)) {
-                        if (num == 0) return NULL;
-                        else return current;
-                }
-                p=line;
-                while (isspace(*p)) p++;
-                if (eol(*p) && num > 0) return current;
-                if (eol(*p)) return NULL;
-
-                for (q=p; !eol(*q); q++);
-                *q='\0';
-                if (strlen(p)) {
-                        current->text[num]=strdup(p);
-//                      printf (">%s<\n",p);
-                        current->lines = ++num;
-                } else {
-                        if (num) return current;
-                        else return NULL;
-                }
-        }
-        return NULL; // we should have returned before if it's OK
-}
-
-static subtitle *sub_read_line_aqt(stream_t *st,subtitle *current,
-                                   struct readline_args *args)
-{
-    int utf16 = args->utf16;
-    char line[LINE_LEN+1];
-
-retry:
-    while (1) {
-    // try to locate next subtitle
-        if (!stream_read_line (st, line, LINE_LEN, utf16))
-                return NULL;
-        if (!(sscanf (line, "-->> %ld", &(current->start)) <1))
-                break;
-    }
-
-    if (!args->previous_sub_end)
-    args->previous_sub_end = (current->start) ? current->start - 1 : 0;
-
-    if (!stream_read_line (st, line, LINE_LEN, utf16))
-        return NULL;
-
-    sub_readtext((char *) &line,&current->text[0]);
-    current->lines = 1;
-    current->end = current->start; // will be corrected by next subtitle
-
-    if (!stream_read_line (st, line, LINE_LEN, utf16))
-        return current;
-
-    if (set_multiline_text(args, current, line, 1) == ERR)
-        return ERR;
-
-    if (!strlen(current->text[0]) && !strlen(current->text[1]))
-        goto retry;
-
-    return current;
-}
-
 static subtitle *sub_read_line_subrip09(stream_t *st,subtitle *current,
                                     struct readline_args *args)
 {
@@ -819,200 +415,6 @@ retry:
     return current;
 }
 
-static subtitle *sub_read_line_jacosub(stream_t* st, subtitle * current,
-                                       struct readline_args *args)
-{
-    int utf16 = args->utf16;
-    char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q;
-    unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0;
-    static unsigned jacoTimeres = 30;
-    static int jacoShift = 0;
-
-    memset(current, 0, sizeof(subtitle));
-    memset(line1, 0, LINE_LEN);
-    memset(line2, 0, LINE_LEN);
-    memset(directive, 0, LINE_LEN);
-    while (!current->text[0]) {
-        if (!stream_read_line(st, line1, LINE_LEN, utf16)) {
-            return NULL;
-        }
-        if (sscanf
-            (line1, "%u:%u:%u.%u %u:%u:%u.%u %[^\n\r]", &a1, &a2, &a3, &a4,
-             &b1, &b2, &b3, &b4, line2) < 9) {
-            if (sscanf(line1, "@%u @%u %[^\n\r]", &a4, &b4, line2) < 3) {
-                if (line1[0] == '#') {
-                    int hours = 0, minutes = 0, seconds, delta, inverter =
-                        1;
-                    unsigned units = jacoShift;
-                    switch (toupper(line1[1])) {
-                    case 'S':
-                        if (isalpha(line1[2])) {
-                            delta = 6;
-                        } else {
-                            delta = 2;
-                        }
-                        if (sscanf(&line1[delta], "%d", &hours)) {
-                            if (hours < 0) {
-                                hours *= -1;
-                                inverter = -1;
-                            }
-                            if (sscanf(&line1[delta], "%*d:%d", &minutes)) {
-                                if (sscanf
-                                    (&line1[delta], "%*d:%*d:%d",
-                                     &seconds)) {
-                                    sscanf(&line1[delta], "%*d:%*d:%*d.%d",
-                                           &units);
-                                } else {
-                                    hours = 0;
-                                    sscanf(&line1[delta], "%d:%d.%d",
-                                           &minutes, &seconds, &units);
-                                    minutes *= inverter;
-                                }
-                            } else {
-                                hours = minutes = 0;
-                                sscanf(&line1[delta], "%d.%d", &seconds,
-                                       &units);
-                                seconds *= inverter;
-                            }
-                            jacoShift =
-                                ((hours * 3600 + minutes * 60 +
-                                  seconds) * jacoTimeres +
-                                 units) * inverter;
-                        }
-                        break;
-                    case 'T':
-                        if (isalpha(line1[2])) {
-                            delta = 8;
-                        } else {
-                            delta = 2;
-                        }
-                        sscanf(&line1[delta], "%u", &jacoTimeres);
-                        break;
-                    }
-                }
-                continue;
-            } else {
-                current->start =
-                    (unsigned long) ((a4 + jacoShift) * 100.0 /
-                                     jacoTimeres);
-                current->end =
-                    (unsigned long) ((b4 + jacoShift) * 100.0 /
-                                     jacoTimeres);
-            }
-        } else {
-            current->start =
-                (unsigned
-                 long) (((a1 * 3600 + a2 * 60 + a3) * jacoTimeres + a4 +
-                         jacoShift) * 100.0 / jacoTimeres);
-            current->end =
-                (unsigned
-                 long) (((b1 * 3600 + b2 * 60 + b3) * jacoTimeres + b4 +
-                         jacoShift) * 100.0 / jacoTimeres);
-        }
-        current->lines = 0;
-        p = line2;
-        while ((*p == ' ') || (*p == '\t')) {
-            ++p;
-        }
-        if (isalpha(*p)||*p == '[') {
-            int cont, jLength;
-
-            if (sscanf(p, "%s %[^\n\r]", directive, line1) < 2)
-                return (subtitle *) ERR;
-            jLength = strlen(directive);
-            for (cont = 0; cont < jLength; ++cont) {
-                if (isalpha(*(directive + cont)))
-                    *(directive + cont) = toupper(*(directive + cont));
-            }
-            if ((strstr(directive, "RDB") != NULL)
-                || (strstr(directive, "RDC") != NULL)
-                || (strstr(directive, "RLB") != NULL)
-                || (strstr(directive, "RLG") != NULL)) {
-                continue;
-            }
-            if (strstr(directive, "JL") != NULL) {
-                current->alignment = SUB_ALIGNMENT_BOTTOMLEFT;
-            } else if (strstr(directive, "JR") != NULL) {
-                current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT;
-            } else {
-                current->alignment = SUB_ALIGNMENT_BOTTOMCENTER;
-            }
-            snprintf(line2, sizeof(line2), "%s", line1);
-            p = line2;
-        }
-        for (q = line1; (!eol(*p)) && (current->lines < SUB_MAX_TEXT); ++p) {
-            switch (*p) {
-            case '{':
-                comment++;
-                break;
-            case '}':
-                if (comment) {
-                    --comment;
-                    //the next line to get rid of a blank after the comment
-                    if ((*(p + 1)) == ' ')
-                        p++;
-                }
-                break;
-            case '~':
-                if (!comment) {
-                    *q = ' ';
-                    ++q;
-                }
-                break;
-            case ' ':
-            case '\t':
-                if ((*(p + 1) == ' ') || (*(p + 1) == '\t'))
-                    break;
-                if (!comment) {
-                    *q = ' ';
-                    ++q;
-                }
-                break;
-            case '\\':
-                if (*(p + 1) == 'n') {
-                    *q = '\0';
-                    q = line1;
-                    current->text[current->lines++] = strdup(line1);
-                    ++p;
-                    break;
-                }
-                if ((toupper(*(p + 1)) == 'C')
-                    || (toupper(*(p + 1)) == 'F')) {
-                    ++p,++p;
-                    break;
-                }
-                if ((*(p + 1) == 'B') || (*(p + 1) == 'b') || (*(p + 1) == 'D') ||      //actually this means "insert current date here"
-                    (*(p + 1) == 'I') || (*(p + 1) == 'i') || (*(p + 1) == 'N') || (*(p + 1) == 'T') || //actually this means "insert current time here"
-                    (*(p + 1) == 'U') || (*(p + 1) == 'u')) {
-                    ++p;
-                    break;
-                }
-                if ((*(p + 1) == '\\') ||
-                    (*(p + 1) == '~') || (*(p + 1) == '{')) {
-                    ++p;
-                } else if (eol(*(p + 1))) {
-                    if (!stream_read_line(st, directive, LINE_LEN, utf16))
-                        return NULL;
-                    trail_space(directive);
-                    av_strlcat(line2, directive, LINE_LEN);
-                    break;
-                }
-            default:
-                if (!comment) {
-                    *q = *p;
-                    ++q;
-                }
-            }                   //-- switch
-        }                       //-- for
-        *q = '\0';
-        if (current->lines < SUB_MAX_TEXT)
-            current->text[current->lines] = strdup(line1);
-    }                           //-- while
-    if (current->lines < SUB_MAX_TEXT)
-        current->lines++;
-    return current;
-}
-
 static int sub_autodetect (stream_t* st, int *uses_time, int utf16) {
     char line[LINE_LEN+1];
     int i,j=0;
@@ -1034,30 +436,10 @@ static int sub_autodetect (stream_t* st, int *uses_time, int utf16) {
                 {*uses_time=1;return SUB_SUBVIEWER;}
         if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
                 {*uses_time=1;return SUB_SUBVIEWER2;}
-        if (strstr (line, "<SAMI>"))
-                {*uses_time=1; return SUB_SAMI;}
-        if (sscanf(line, "%d:%d:%d.%d %d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8)
-                {*uses_time = 1; return SUB_JACOSUB;}
-        if (sscanf(line, "@%d @%d", &i, &i) == 2)
-                {*uses_time = 1; return SUB_JACOSUB;}
-        if (sscanf (line, "%d:%d:%d:",     &i, &i, &i )==3)
-                {*uses_time=1;return SUB_VPLAYER;}
-        if (sscanf (line, "%d:%d:%d ",     &i, &i, &i )==3)
-                {*uses_time=1;return SUB_VPLAYER;}
-        if (!strncasecmp(line, "<window", 7))
-                {*uses_time=1;return SUB_RT;}
         if (!memcmp(line, "Dialogue: Marked", 16))
                 {*uses_time=1; return SUB_SSA;}
         if (!memcmp(line, "Dialogue: ", 10))
                 {*uses_time=1; return SUB_SSA;}
-        if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3)
-                {*uses_time=1;return SUB_PJS;}
-        if (sscanf (line, "FORMAT=%d", &i) == 1)
-                {*uses_time=0; return SUB_MPSUB;}
-        if (!memcmp(line, "FORMAT=TIME", 11))
-                {*uses_time=1; return SUB_MPSUB;}
-        if (strstr (line, "-->>"))
-                {*uses_time=0; return SUB_AQTITLE;}
         if (sscanf (line, "[%d:%d:%d]", &i, &i, &i)==3)
                 {*uses_time=1;return SUB_SUBRIP09;}
     }
@@ -1116,16 +498,9 @@ static bool subreader_autodetect(stream_t *fd, struct MPOpts *opts,
             { sub_read_line_microdvd, NULL, "microdvd", "microdvd" },
             { sub_read_line_subrip, NULL, "subviewer" },
             { sub_read_line_subviewer, NULL, "subrip", "subrip" },
-            { sub_read_line_sami, NULL, "sami" },
-            { sub_read_line_vplayer, NULL, "vplayer" },
-            { sub_read_line_rt, NULL, "rt" },
             { sub_read_line_ssa, NULL, "ssa", "ass-text" },
-            { sub_read_line_pjs, NULL, "pjs" },
-            { sub_read_line_mpsub, NULL, "mpsub" },
-            { sub_read_line_aqt, NULL, "aqt" },
             { sub_read_line_subviewer2, NULL, "subviewer 2.0" },
             { sub_read_line_subrip09, NULL, "subrip 0.9" },
-            { sub_read_line_jacosub, NULL, "jacosub" },
             { sub_read_line_mpl2, NULL, "mpl2" }
     };
     const struct subreader *srp;