Skip to content

Commit 56ebf23

Browse files
committed
format ffmpeg8 patches
1 parent 8b9d597 commit 56ebf23

26 files changed

Lines changed: 81 additions & 80 deletions

File tree

patches/ffmpeg-n8.1.1/0001-PATCH-restore-ijk-h264_ps-null-pointer-fault-toleran.patch renamed to patches/ffmpeg-n8.1.1/0001-restore-ijk-h264_ps-null-pointer-fault-tolerant.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 23773b2fbcdd5f495622318db9a7cc5c35942cef Mon Sep 17 00:00:00 2001
1+
From 21a946850b1be93508b3d2d4478e60d347d9993f Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Wed, 28 May 2025 17:28:22 +0800
44
Subject: restore ijk h264_ps null pointer fault tolerant
@@ -8,7 +8,7 @@ Subject: restore ijk h264_ps null pointer fault tolerant
88
1 file changed, 4 insertions(+), 4 deletions(-)
99

1010
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
11-
index ac204172cb..2c35e0d6f6 100644
11+
index ac20417..2c35e0d 100644
1212
--- a/libavcodec/h264_ps.c
1313
+++ b/libavcodec/h264_ps.c
1414
@@ -437,7 +437,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,

patches/ffmpeg-n8.1.1/0002-restore-ijk-avformat-add-application-and-dns_cache.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 886512c82e75af2e3ab48b8ebf5070995426c253 Mon Sep 17 00:00:00 2001
1+
From c4bfe93521942a600c8ba3e477b74aca1d8c745d Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 15:58:55 +0800
44
Subject: restore ijk avformat add application and dns_cache
@@ -16,7 +16,7 @@ Subject: restore ijk avformat add application and dns_cache
1616
create mode 100644 libavformat/dns_cache.h
1717

1818
diff --git a/libavformat/Makefile b/libavformat/Makefile
19-
index 4786a9345a..3c95fc4b7f 100644
19+
index 4786a93..3c95fc4 100644
2020
--- a/libavformat/Makefile
2121
+++ b/libavformat/Makefile
2222
@@ -5,6 +5,9 @@ HEADERS = avformat.h \
@@ -40,7 +40,7 @@ index 4786a9345a..3c95fc4b7f 100644
4040

4141
diff --git a/libavformat/application.c b/libavformat/application.c
4242
new file mode 100644
43-
index 0000000000..de093b9c89
43+
index 0000000..de093b9
4444
--- /dev/null
4545
+++ b/libavformat/application.c
4646
@@ -0,0 +1,213 @@
@@ -259,7 +259,7 @@ index 0000000000..de093b9c89
259259
+}
260260
diff --git a/libavformat/application.h b/libavformat/application.h
261261
new file mode 100644
262-
index 0000000000..b9e7f5b69a
262+
index 0000000..b9e7f5b
263263
--- /dev/null
264264
+++ b/libavformat/application.h
265265
@@ -0,0 +1,120 @@
@@ -385,7 +385,7 @@ index 0000000000..b9e7f5b69a
385385
+#endif /* AVUTIL_APPLICATION_H */
386386
diff --git a/libavformat/dns_cache.c b/libavformat/dns_cache.c
387387
new file mode 100644
388-
index 0000000000..aab2435b90
388+
index 0000000..aab2435
389389
--- /dev/null
390390
+++ b/libavformat/dns_cache.c
391391
@@ -0,0 +1,232 @@
@@ -623,7 +623,7 @@ index 0000000000..aab2435b90
623623
+}
624624
diff --git a/libavformat/dns_cache.h b/libavformat/dns_cache.h
625625
new file mode 100644
626-
index 0000000000..23c695e827
626+
index 0000000..23c695e
627627
--- /dev/null
628628
+++ b/libavformat/dns_cache.h
629629
@@ -0,0 +1,39 @@

patches/ffmpeg-n8.1.1/0003-restore-ijk-http-event-hooks.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 45eb43659ad56bcf3aea1ab1f5358c1995c57089 Mon Sep 17 00:00:00 2001
1+
From 91b1bc44f636fd2c2a4a40fabffadfd6fa9d22e8 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 16:30:34 +0800
44
Subject: restore ijk http event hooks
@@ -10,7 +10,7 @@ Subject: restore ijk http event hooks
1010
3 files changed, 86 insertions(+), 8 deletions(-)
1111

1212
diff --git a/libavformat/http.c b/libavformat/http.c
13-
index 52073ffcb6..f4bf225728 100644
13+
index 52073ff..f4bf225 100644
1414
--- a/libavformat/http.c
1515
+++ b/libavformat/http.c
1616
@@ -48,6 +48,7 @@
@@ -132,7 +132,7 @@ index 52073ffcb6..f4bf225728 100644
132132
redo:
133133
ret = ffurl_open_whitelist(&s->hd, lower_url, AVIO_FLAG_READ_WRITE,
134134
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
135-
index ce9f69a50b..69b1e12c49 100644
135+
index ce9f69a..69b1e12 100644
136136
--- a/libavformat/tcp.c
137137
+++ b/libavformat/tcp.c
138138
@@ -24,7 +24,8 @@
@@ -259,7 +259,7 @@ index ce9f69a50b..69b1e12c49 100644
259259
return ret < 0 ? ff_neterrno() : ret;
260260
}
261261
diff --git a/libavutil/error.h b/libavutil/error.h
262-
index 1efa86c4c1..9dee755c69 100644
262+
index 1efa86c..9dee755 100644
263263
--- a/libavutil/error.h
264264
+++ b/libavutil/error.h
265265
@@ -85,6 +85,10 @@

patches/ffmpeg-n8.1.1/0004-restore-ijk-tcp-dns-cache.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e3804da4a5b88dabf071ad5070070489a9efb874 Mon Sep 17 00:00:00 2001
1+
From acffa5bb5305c8f28419c0f476e8d123f09d9bcd Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 16:39:50 +0800
44
Subject: restore ijk tcp dns cache
@@ -8,7 +8,7 @@ Subject: restore ijk tcp dns cache
88
1 file changed, 310 insertions(+), 14 deletions(-)
99

1010
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
11-
index 69b1e12c49..46b48e609d 100644
11+
index 69b1e12..46b48e6 100644
1212
--- a/libavformat/tcp.c
1313
+++ b/libavformat/tcp.c
1414
@@ -26,6 +26,7 @@

patches/ffmpeg-n8.1.1/0005-restore-ijk-custom-protocols-and-demuxers-except-lon.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5f75c2d325ee7519854a826f85d7b97187052eae Mon Sep 17 00:00:00 2001
1+
From 75225b69a8442347087c02a7ee24944e7c3b41e6 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 17:02:15 +0800
44
Subject: restore ijk custom protocols and demuxers except long
@@ -17,7 +17,7 @@ Subject: restore ijk custom protocols and demuxers except long
1717
create mode 100644 libavformat/ijkutils.c
1818

1919
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
20-
index 1410bd8142..4445d9ea61 100644
20+
index 1410bd8..4445d9e 100644
2121
--- a/libavcodec/Makefile
2222
+++ b/libavcodec/Makefile
2323
@@ -26,6 +26,7 @@ HEADERS = ac3_parser.h \
@@ -29,7 +29,7 @@ index 1410bd8142..4445d9ea61 100644
2929
OBJS = ac3_parser.o \
3030
adts_parser.o \
3131
diff --git a/libavformat/Makefile b/libavformat/Makefile
32-
index 3c95fc4b7f..85ed05b0f2 100644
32+
index 3c95fc4..85ed05b 100644
3333
--- a/libavformat/Makefile
3434
+++ b/libavformat/Makefile
3535
@@ -7,6 +7,15 @@ HEADERS = avformat.h \
@@ -57,7 +57,7 @@ index 3c95fc4b7f..85ed05b0f2 100644
5757
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
5858

5959
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
60-
index 6ec361fb7b..0c2d5caf82 100644
60+
index 6ec361f..0c2d5ca 100644
6161
--- a/libavformat/allformats.c
6262
+++ b/libavformat/allformats.c
6363
@@ -584,6 +584,9 @@ extern const FFInputFormat ff_libmodplug_demuxer;
@@ -71,7 +71,7 @@ index 6ec361fb7b..0c2d5caf82 100644
7171
#include "libavformat/demuxer_list.c"
7272

7373
diff --git a/libavformat/demux.c b/libavformat/demux.c
74-
index a1909237f0..05ab1e172d 100644
74+
index a190923..05ab1e1 100644
7575
--- a/libavformat/demux.c
7676
+++ b/libavformat/demux.c
7777
@@ -235,6 +235,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
@@ -116,7 +116,7 @@ index a1909237f0..05ab1e172d 100644
116116
avio_closep(&s->pb);
117117
avformat_free_context(s);
118118
diff --git a/libavformat/demux.h b/libavformat/demux.h
119-
index f09afc849f..531c433968 100644
119+
index f09afc8..531c433 100644
120120
--- a/libavformat/demux.h
121121
+++ b/libavformat/demux.h
122122
@@ -98,6 +98,8 @@ typedef struct FFInputFormat {
@@ -130,7 +130,7 @@ index f09afc849f..531c433968 100644
130130
* set. 'avformat_new_stream' can be called only if the flag
131131
diff --git a/libavformat/ijkutils.c b/libavformat/ijkutils.c
132132
new file mode 100644
133-
index 0000000000..0314c48d8b
133+
index 0000000..0314c48
134134
--- /dev/null
135135
+++ b/libavformat/ijkutils.c
136136
@@ -0,0 +1,107 @@
@@ -242,7 +242,7 @@ index 0000000000..0314c48d8b
242242
+ */
243243
+IJK_DUMMY_DEMUXER(ijklivehook);
244244
diff --git a/libavformat/protocols.c b/libavformat/protocols.c
245-
index 207b6bf8d9..de0926beea 100644
245+
index 207b6bf..de0926b 100644
246246
--- a/libavformat/protocols.c
247247
+++ b/libavformat/protocols.c
248248
@@ -79,6 +79,12 @@ extern const URLProtocol ff_libzmq_protocol;
@@ -259,7 +259,7 @@ index 207b6bf8d9..de0926beea 100644
259259

260260
const AVClass *ff_urlcontext_child_class_iterate(void **iter)
261261
diff --git a/libavutil/Makefile b/libavutil/Makefile
262-
index c5241895ff..a9fbf9923b 100644
262+
index c524189..a9fbf99 100644
263263
--- a/libavutil/Makefile
264264
+++ b/libavutil/Makefile
265265
@@ -99,7 +99,8 @@ HEADERS = adler32.h \

patches/ffmpeg-n8.1.1/0006-add-4-dummy-ijkplaceholder-demuxers.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From eb2b38cb1107ecaa18fef1594300f9700f64318a Mon Sep 17 00:00:00 2001
1+
From 44ce37e539f1db0fce3804b192f2e48a7d72e040 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 17:02:34 +0800
44
Subject: add 4 dummy ijkplaceholder demuxers
@@ -9,7 +9,7 @@ Subject: add 4 dummy ijkplaceholder demuxers
99
2 files changed, 8 insertions(+)
1010

1111
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
12-
index 0c2d5caf82..e2f37da7a1 100644
12+
index 0c2d5ca..e2f37da 100644
1313
--- a/libavformat/allformats.c
1414
+++ b/libavformat/allformats.c
1515
@@ -586,6 +586,10 @@ extern const FFInputFormat ff_vapoursynth_demuxer;
@@ -24,7 +24,7 @@ index 0c2d5caf82..e2f37da7a1 100644
2424
#include "libavformat/muxer_list.c"
2525
#include "libavformat/demuxer_list.c"
2626
diff --git a/libavformat/ijkutils.c b/libavformat/ijkutils.c
27-
index 0314c48d8b..ac80e548f4 100644
27+
index 0314c48..ac80e54 100644
2828
--- a/libavformat/ijkutils.c
2929
+++ b/libavformat/ijkutils.c
3030
@@ -105,3 +105,7 @@ FFInputFormat ff_##x##_demuxer = { \

patches/ffmpeg-n8.1.1/0007-add-3-dummy-ijkhttp-protocols.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 637a50bedd7a8761f79f30f8fd1bd6bc212533a5 Mon Sep 17 00:00:00 2001
1+
From 86da4f9eeb7824aa61cb59b690507a0772972a1d Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 17:07:35 +0800
44
Subject: add 3 dummy ijkhttp protocols
@@ -9,7 +9,7 @@ Subject: add 3 dummy ijkhttp protocols
99
2 files changed, 6 insertions(+)
1010

1111
diff --git a/libavformat/ijkutils.c b/libavformat/ijkutils.c
12-
index ac80e548f4..ba8eadd131 100644
12+
index ac80e54..ba8eadd 100644
1313
--- a/libavformat/ijkutils.c
1414
+++ b/libavformat/ijkutils.c
1515
@@ -69,6 +69,9 @@ IJK_DUMMY_PROTOCOL(ijkhttphook);
@@ -23,7 +23,7 @@ index ac80e548f4..ba8eadd131 100644
2323
#define IJK_FF_DEMUXER(x) \
2424
extern FFInputFormat ff_##x##_demuxer; \
2525
diff --git a/libavformat/protocols.c b/libavformat/protocols.c
26-
index de0926beea..d1c1095364 100644
26+
index de0926b..d1c1095 100644
2727
--- a/libavformat/protocols.c
2828
+++ b/libavformat/protocols.c
2929
@@ -84,6 +84,9 @@ extern const URLProtocol ff_ijkmediadatasource_protocol;

patches/ffmpeg-n8.1.1/0008-restore-ijk-av_dict_get-that-converts-the-value-to-a.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From aa354e9e139f7b028d71c92afe72dfef97c61dc0 Mon Sep 17 00:00:00 2001
1+
From 3da3f038de2cd4067263b69a06ac42ceb01b56d5 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Wed, 28 May 2025 18:33:27 +0800
44
Subject: restore ijk av_dict_get that converts the value to a
@@ -10,7 +10,7 @@ Subject: restore ijk av_dict_get that converts the value to a
1010
2 files changed, 47 insertions(+), 1 deletion(-)
1111

1212
diff --git a/libavutil/dict.c b/libavutil/dict.c
13-
index fafb454fd3..db8ee05699 100644
13+
index fafb454..db8ee05 100644
1414
--- a/libavutil/dict.c
1515
+++ b/libavutil/dict.c
1616
@@ -63,7 +63,7 @@ AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
@@ -67,7 +67,7 @@ index fafb454fd3..db8ee05699 100644
6767
const char *key_val_sep, const char *pairs_sep,
6868
int flags)
6969
diff --git a/libavutil/dict.h b/libavutil/dict.h
70-
index 93c7cbf128..d97a601f66 100644
70+
index 93c7cbf..d97a601 100644
7171
--- a/libavutil/dict.h
7272
+++ b/libavutil/dict.h
7373
@@ -173,6 +173,15 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags

patches/ffmpeg-n8.1.1/0009-control-which-http-impl-was-used-by-set-selected_htt.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 453a18e73206f0074fe6cf94240b9066cf95f6d0 Mon Sep 17 00:00:00 2001
1+
From 5b78a77e4274c7aa8199ad5cc0aa1aa464b381c8 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Wed, 28 May 2025 18:25:51 +0800
44
Subject: control which http impl was used by set selected_http
@@ -10,7 +10,7 @@ Subject: control which http impl was used by set selected_http
1010
2 files changed, 77 insertions(+), 2 deletions(-)
1111

1212
diff --git a/libavformat/avio.c b/libavformat/avio.c
13-
index b146ac9f19..0287cc6092 100644
13+
index b146ac9..0287cc6 100644
1414
--- a/libavformat/avio.c
1515
+++ b/libavformat/avio.c
1616
@@ -360,6 +360,65 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags,
@@ -98,7 +98,7 @@ index b146ac9f19..0287cc6092 100644
9898

9999
if (h->prot->url_open_dir && h->prot->url_read_dir && h->prot->url_close_dir) {
100100
diff --git a/libavformat/url.h b/libavformat/url.h
101-
index 0784d77b64..53c6f13d23 100644
101+
index 0784d77..53c6f13 100644
102102
--- a/libavformat/url.h
103103
+++ b/libavformat/url.h
104104
@@ -112,6 +112,22 @@ typedef struct URLProtocol {

patches/ffmpeg-n8.1.1/0010-correct-file-seekable-value-range-0-means-streamed-c.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f98ffd5b75b7c85f4f336f5a193357a2675e71e5 Mon Sep 17 00:00:00 2001
1+
From a238a10d136f21902de411f024536b43c87cae95 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <qianlongxu@gmail.com>
33
Date: Fri, 8 May 2026 17:11:02 +0800
44
Subject: correct file seekable value range, 0 means streamed
@@ -9,7 +9,7 @@ Subject: correct file seekable value range, 0 means streamed
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/libavformat/file.c b/libavformat/file.c
12-
index 3ceddc8c25..59a0442c5a 100644
12+
index 3ceddc8..59a0442 100644
1313
--- a/libavformat/file.c
1414
+++ b/libavformat/file.c
1515
@@ -106,7 +106,7 @@ static const AVOption file_options[] = {

0 commit comments

Comments
 (0)