summaryrefslogtreecommitdiffstats
path: root/sub/dec_sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-15 21:03:34 +0100
committerwm4 <wm4@nowhere>2015-12-15 21:05:48 +0100
commit29226e6a994e829c637f04cfd7f3574f0699885c (patch)
tree446aa2cb4af5cf131b52f5cf5cfe946f3a63bbb5 /sub/dec_sub.c
parentd0fd68f6dfeac03d07a005f230cdec0756636075 (diff)
downloadmpv-29226e6a994e829c637f04cfd7f3574f0699885c.tar.bz2
mpv-29226e6a994e829c637f04cfd7f3574f0699885c.tar.xz
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.
Diffstat (limited to 'sub/dec_sub.c')
-rw-r--r--sub/dec_sub.c8
1 files changed, 1 insertions, 7 deletions
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))