From 29226e6a994e829c637f04cfd7f3574f0699885c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 15 Dec 2015 21:03:34 +0100
Subject: sub: remove sd_movtext.c

libavcodec's movtext-to-ass converter does the same and has more
features. On Libav, this commit disables mp4 subtitle display.
---
 sub/dec_sub.c    |  8 +-------
 sub/sd_movtext.c | 56 --------------------------------------------------------
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 sub/sd_movtext.c

(limited to 'sub')

diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 44c1d0a8a7..dffec03983 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -34,7 +34,6 @@
 
 extern const struct sd_functions sd_ass;
 extern const struct sd_functions sd_lavc;
-extern const struct sd_functions sd_movtext;
 extern const struct sd_functions sd_srt;
 extern const struct sd_functions sd_microdvd;
 extern const struct sd_functions sd_lavf_srt;
@@ -45,7 +44,6 @@ static const struct sd_functions *const sd_list[] = {
     &sd_ass,
 #endif
     &sd_lavc,
-    &sd_movtext,
     &sd_srt,
     &sd_lavf_srt,
     &sd_microdvd,
@@ -391,11 +389,7 @@ bool sub_read_all_packets(struct dec_sub *sub, struct sh_stream *sh)
         talloc_free(pkt);
     }
 
-    // movtext is currently the only subtitle format that has text output,
-    // but binary input. Skip charset conversion (they're UTF-8 anyway).
-    bool binary = sub->sd[0]->driver == &sd_movtext;
-
-    if (opts->sub_cp && !sh->sub->is_utf8 && !binary)
+    if (opts->sub_cp && !sh->sub->is_utf8)
         sub->charset = guess_sub_cp(sub->log, sub, subs, opts->sub_cp);
 
     if (sub->charset && sub->charset[0] && !mp_charset_is_utf8(sub->charset))
diff --git a/sub/sd_movtext.c b/sub/sd_movtext.c
deleted file mode 100644
index 3038a4c132..0000000000
--- a/sub/sd_movtext.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <assert.h>
-
-#include <libavutil/intreadwrite.h>
-#include <libavutil/common.h>
-
-#include "sd.h"
-
-static bool supports_format(const char *format)
-{
-    return format && strcmp(format, "mov_text") == 0;
-}
-
-static int init(struct sd *sd)
-{
-    sd->output_codec = "text";
-    return 0;
-}
-
-static void decode(struct sd *sd, struct demux_packet *packet)
-{
-    unsigned char *data = packet->buffer;
-    int len = packet->len;
-    if (len < 2)
-        return;
-    len = FFMIN(len - 2, AV_RB16(data));
-    data += 2;
-    if (len > 0)
-        sd_conv_add_packet(sd, data, len, packet->pts, packet->duration);
-}
-
-const struct sd_functions sd_movtext = {
-    .name = "movtext",
-    .supports_format = supports_format,
-    .init = init,
-    .decode = decode,
-    .get_converted = sd_conv_def_get_converted,
-    .reset = sd_conv_def_reset,
-};
-- 
cgit v1.2.3