diff options
| author | wm4 <wm4@nowhere> | 2020-01-04 19:53:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2020-01-04 19:56:09 +0100 |
| commit | 1b283f6b60cce278aeb0c4fb675faac493546ab6 (patch) | |
| tree | 8ff7a048c049f463e59d8452a6a75a049315412d /stream | |
| parent | 4231ce6f5f6976c65a22853b77103cf4243e5f5f (diff) | |
| download | mpv-1b283f6b60cce278aeb0c4fb675faac493546ab6.tar.bz2 mpv-1b283f6b60cce278aeb0c4fb675faac493546ab6.tar.xz | |
libarchive: some shitty hack to make opening slightly faster
See manpage additions. The libarchive behavior mentioned in the last
paragraph there is technically unrelated, but makes this new option
mostly pointless.
See: #7182
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_libarchive.c | 8 | ||||
| -rw-r--r-- | stream/stream_libarchive.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c index 7c48f3a135..a43f2e633f 100644 --- a/stream/stream_libarchive.c +++ b/stream/stream_libarchive.c @@ -264,9 +264,11 @@ struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src, if (!add_volume(mpa, src, src->url, 0)) goto err; - // try to open other volumes - if (!find_volumes(mpa)) - goto err; + if (!(flags & MP_ARCHIVE_FLAG_NO_RAR_VOLUMES)) { + // try to open other volumes + if (!find_volumes(mpa)) + goto err; + } locale_t oldlocale = uselocale(mpa->locale); diff --git a/stream/stream_libarchive.h b/stream/stream_libarchive.h index bb5dee432b..f9e05fcbee 100644 --- a/stream/stream_libarchive.h +++ b/stream/stream_libarchive.h @@ -24,7 +24,8 @@ struct mp_archive { void mp_archive_free(struct mp_archive *mpa); -#define MP_ARCHIVE_FLAG_UNSAFE 1 +#define MP_ARCHIVE_FLAG_UNSAFE (1 << 0) +#define MP_ARCHIVE_FLAG_NO_RAR_VOLUMES (1 << 1) struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src, int flags, int max_volumes); |