From f77515ebafb9fdfd177671b848211824e654206f Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 21:41:52 +0200 Subject: stream_libarchive: remove base filename stuff Apparently this was so that when playing a video file from a .rar file, it would load external subtitles with the same name (instead of looking for mpv's rar:// mangled URL). This was requested on github almost 5 years ago. Seems like a weird feature, and I don't care. Drop it, because it complicates some in progress change. --- player/loadfile.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'player') diff --git a/player/loadfile.c b/player/loadfile.c index f55dd29f34..bb7365c641 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -819,14 +819,7 @@ void autoload_external_files(struct MPContext *mpctx, struct mp_cancel *cancel) return; void *tmp = talloc_new(NULL); - char *base_filename = mpctx->filename; - char *stream_filename = NULL; - if (mpctx->demuxer) { - if (demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_BASE_FILENAME, - &stream_filename) > 0) - base_filename = talloc_steal(tmp, stream_filename); - } - struct subfn *list = find_external_files(mpctx->global, base_filename, + struct subfn *list = find_external_files(mpctx->global, mpctx->filename, mpctx->opts); talloc_steal(tmp, list); -- cgit v1.2.3