diff options
| author | wm4 <wm4@nowhere> | 2018-09-07 21:41:52 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-09-19 20:37:04 +0200 |
| commit | f77515ebafb9fdfd177671b848211824e654206f (patch) | |
| tree | 8bbc1adc712b6edb7d81e5b0d7f19a1e293e257b /player | |
| parent | 0fa38121a6ce6baed277b17a1ca1e28f5978343f (diff) | |
| download | mpv-f77515ebafb9fdfd177671b848211824e654206f.tar.bz2 mpv-f77515ebafb9fdfd177671b848211824e654206f.tar.xz | |
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.
Diffstat (limited to 'player')
| -rw-r--r-- | player/loadfile.c | 9 |
1 files changed, 1 insertions, 8 deletions
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); |