summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-01-04 20:49:00 +0100
committerwm4 <wm4@nowhere>2020-01-04 20:49:00 +0100
commit1b0129c4143fe73ef0ee3c3f1e2bed734c374d40 (patch)
treecec82bcf0a589984966643dc84ac36f23a718b73
parent119bad4daaf206300bb4b55c269ff407e9537bf4 (diff)
downloadmpv-1b0129c4143fe73ef0ee3c3f1e2bed734c374d40.tar.bz2
mpv-1b0129c4143fe73ef0ee3c3f1e2bed734c374d40.tar.xz
stream_libarchive: remove "old" rar volume pattern
This turned every "normal" .rar filename into a multi-volume one accidentally. Since the detection is purely by filename (due to lack of support by libarchive I guess), it causes the nasty message added in the previous commit to appear for every .rar file. Just drop it.
-rw-r--r--stream/stream_libarchive.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c
index e068a9ca0c..857650059b 100644
--- a/stream/stream_libarchive.c
+++ b/stream/stream_libarchive.c
@@ -192,13 +192,6 @@ static char *standard_volume_url(void *ctx, const char *format,
return talloc_asprintf(ctx, format, BSTR_P(base), index);
}
-static char *old_rar_volume_url(void *ctx, const char *format,
- struct bstr base, int index)
-{
- return talloc_asprintf(ctx, format, BSTR_P(base),
- 'r' + index / 100, index % 100);
-}
-
struct file_pattern {
const char *match;
const char *format;
@@ -213,7 +206,6 @@ static const struct file_pattern patterns[] = {
{ ".part01.rar", "%.*s.part%.2d.rar", standard_volume_url, 2, 99 },
{ ".part001.rar", "%.*s.part%.3d.rar", standard_volume_url, 2, 999 },
{ ".part0001.rar", "%.*s.part%.4d.rar", standard_volume_url, 2, 9999 },
- { ".rar", "%.*s.%c%.2d", old_rar_volume_url, 0, 9999 },
{ ".001", "%.*s.%.3d", standard_volume_url, 2, 9999 },
{ NULL, NULL, NULL, 0, 0 },
};