core: disable vf_sub auto-insertion

Since most VOs support rendering subs directly, this doesn't change
much. Changes include: vo_null is faster, vo_image doesn't add subtitles
by default (while vo_lavc does), vo_caca doesn't render subs (but you
couldn't read them anyway).

1 files changed, 0 insertions, 32 deletions

diff --git a/mplayer.c b/mplayer.c
index de85ec2c33..6963471c0e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2267,38 +2267,6 @@ int reinit_video_chain(struct MPContext *mpctx)
         sh_video->vfilter = vf_open_filter(opts, NULL, "vo", vf_arg);
     }
 
-    if (opts->ass_enabled) {
-        int i;
-        int insert = 1;
-        if (opts->vf_settings)
-            for (i = 0; opts->vf_settings[i].name; ++i)
-                if (strcmp(opts->vf_settings[i].name, "sub") == 0) {
-                    insert = 0;
-                    break;
-                }
-        if (insert) {
-            extern vf_info_t vf_info_sub;
-            const vf_info_t *sub_vfs[] = {
-                &vf_info_sub, NULL
-            };
-            char *vf_arg[] = {
-                "auto", "yes", NULL
-            };
-            int retcode = 0;
-            struct vf_instance *vf_sub = vf_open_plugin_noerr(opts, sub_vfs,
-                                                              sh_video->vfilter,
-                                                              "sub", vf_arg,
-                                                              &retcode);
-            if (vf_sub)
-                sh_video->vfilter = vf_sub;
-            else if (retcode == -1) // vf_sub open() returns -1 VO has OSD
-                mp_msg(MSGT_CPLAYER, MSGL_V, "[sub] vf_sub not needed\n");
-            else
-                mp_msg(MSGT_CPLAYER, MSGL_ERR,
-                       "sub: cannot add video filter\n");
-        }
-    }
-
     sh_video->vfilter = append_filters(sh_video->vfilter, opts->vf_settings);
 
     struct vf_instance *vf = sh_video->vfilter;