Skip to content

Commit acbe4de

Browse files
committed
fix mistake
1 parent 7f5ec94 commit acbe4de

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

patches/ffmpeg-n6.1/0027-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV-u.patch

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From d0bdb913a8ba8af6eeee4d259f6b759fbe18738c Mon Sep 17 00:00:00 2001
1+
From a0ab581935b79564106be60328c6522648799b70 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <[email protected]>
3-
Date: Wed, 19 Mar 2025 11:34:09 +0800
3+
Date: Wed, 19 Mar 2025 13:24:49 +0800
44
Subject: [PATCH 27] custom bluray fs for network Blu-ray Disc and BDMV, use cache
55
improve parse title list
66

77
---
88
libavformat/Makefile | 2 +-
9-
libavformat/bluray.c | 152 ++++++++--
9+
libavformat/bluray.c | 154 ++++++++--
1010
libavformat/bluray_custom_fs.c | 529 +++++++++++++++++++++++++++++++++
1111
libavformat/bluray_custom_fs.h | 33 ++
1212
libavformat/lrucache.c | 112 +++++++
1313
libavformat/lrucache.h | 30 ++
14-
6 files changed, 839 insertions(+), 19 deletions(-)
14+
6 files changed, 840 insertions(+), 20 deletions(-)
1515
create mode 100644 libavformat/bluray_custom_fs.c
1616
create mode 100644 libavformat/bluray_custom_fs.h
1717
create mode 100644 libavformat/lrucache.c
@@ -31,7 +31,7 @@ index 19ba54e..4184bfd 100644
3131
OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o
3232
OBJS-$(CONFIG_CONCATF_PROTOCOL) += concat.o
3333
diff --git a/libavformat/bluray.c b/libavformat/bluray.c
34-
index 1845551..0bcfad5 100644
34+
index 1845551..b8312ff 100644
3535
--- a/libavformat/bluray.c
3636
+++ b/libavformat/bluray.c
3737
@@ -20,24 +20,29 @@
@@ -123,7 +123,7 @@ index 1845551..0bcfad5 100644
123123
}
124124
-
125125
+ bd->access = access;
126-
+
126+
+
127127
+ if (av_strstart(diskname, "file://", NULL) ||
128128
+ av_strstart(diskname, "/", NULL)) {
129129
+ //
@@ -198,7 +198,7 @@ index 1845551..0bcfad5 100644
198198
case AVSEEK_SIZE:
199199
return bd_get_title_size(bd->bd);
200200
}
201-
@@ -222,6 +267,76 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
201+
@@ -222,13 +267,84 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
202202
return AVERROR(EINVAL);
203203
}
204204

@@ -275,8 +275,9 @@ index 1845551..0bcfad5 100644
275275

276276
const URLProtocol ff_bluray_protocol = {
277277
.name = "bluray",
278-
@@ -229,6 +344,7 @@ const URLProtocol ff_bluray_protocol = {
279-
.url_open = bluray_open,
278+
.url_close = bluray_close,
279+
- .url_open = bluray_open,
280+
+ .url_open2 = bluray_open,
280281
.url_read = bluray_read,
281282
.url_seek = bluray_seek,
282283
+ .url_parse_priv = bluray_parse_priv,

patches/ffmpeg-n6.1/0028-bluray-protocol-add-dvd-fallback.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 1669f861cde61ae47e48586d89c74d01b1025de1 Mon Sep 17 00:00:00 2001
1+
From b5176510c15322f2223c5e16af20e65be98db163 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <[email protected]>
3-
Date: Wed, 19 Mar 2025 11:35:08 +0800
3+
Date: Wed, 19 Mar 2025 13:22:27 +0800
44
Subject: [PATCH 28] bluray protocol add dvd fallback
55

66
---
77
libavformat/demux.c | 24 +++++++++++++++++++++---
88
1 file changed, 21 insertions(+), 3 deletions(-)
99

1010
diff --git a/libavformat/demux.c b/libavformat/demux.c
11-
index 51fff7b..cf2d630 100644
11+
index 51fff7b..05e02db 100644
1212
--- a/libavformat/demux.c
1313
+++ b/libavformat/demux.c
1414
@@ -158,7 +158,10 @@ static int init_input(AVFormatContext *s, const char *filename,
@@ -17,8 +17,8 @@ index 51fff7b..cf2d630 100644
1717
int score = AVPROBE_SCORE_RETRY;
1818
-
1919
+ AVDictionary *tmp_opts = NULL;
20-
+ if (av_stristart(filename, "bluray://", NULL) || av_stristart(filename, "dvd://", NULL)) {
21-
+ av_dict_copy(&tmp_opts, options, 0);
20+
+ if (options && (av_stristart(filename, "bluray://", NULL) || av_stristart(filename, "dvd://", NULL))) {
21+
+ av_dict_copy(&tmp_opts, *options, 0);
2222
+ }
2323
if (s->pb) {
2424
s->flags |= AVFMT_FLAG_CUSTOM_IO;

0 commit comments

Comments
 (0)