The branch, master has been updated
via 8830305f52defcfa30f15b8aeb46a4f07ad42d6d (commit)
via 7238ff304c4912796adbbddd7b7f9c6298b2f166 (commit)
from cbfe12e6dedb1ca81a308d8a396ae678747bbc2b (commit)
- Log -----------------------------------------------------------------
commit 8830305f52defcfa30f15b8aeb46a4f07ad42d6d
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Aug 28 21:59:49 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Wed Sep 3 14:55:53 2025 +0200
web: Add funding.json
See: https://fundingjson.org/
See: https://floss.fund/
Based on: https://www.python.org/funding.json and the example from
fundingjson.org
It is put in the web repository so its all on the plain ffmpeg.org domain
otherwise extra files are needed
Discussed in the General Assembly: 0830 9:53 Sponsors and funding.json
As of 3rd September there are no objections and no requests for changes in
the General Assembly
diff --git a/htdocs/funding.json b/htdocs/funding.json
new file mode 100644
index 0000000..42664c7
--- /dev/null
+++ b/htdocs/funding.json
@@ -0,0 +1,126 @@
+{
+ "version": "v1.0.0",
+
+ "entity": {
+ "type": "group",
+ "role": "owner",
+ "name": "FFmpeg",
+ "email": "[email protected]",
+ "description": "FFmpeg is the leading multimedia framework, able to
decode, encode, transcode, mux, demux, stream, filter and play pretty much
anything that humans and machines have created. It supports the most obscure
ancient formats up to the cutting edge. No matter if they were designed by some
standards committee, the community or a corporation. It is also highly
portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE
across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide
variety of build environments, machine architectures, and configurations.",
+ "webpageUrl": {
+ "url": "https://ffmpeg.org/";
+ }
+ },
+
+ "projects": [{
+ "guid": "ffmpeg",
+ "name": "FFmpeg",
+ "description": "FFmpeg is the leading multimedia framework, able to
decode, encode, transcode, mux, demux, stream, filter and play pretty much
anything that humans and machines have created. It supports the most obscure
ancient formats up to the cutting edge. No matter if they were designed by some
standards committee, the community or a corporation. It is also highly
portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE
across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide
variety of build environments, machine architectures, and configurations.",
+ "webpageUrl": {
+ "url": "https://ffmpeg.org/";
+ },
+ "repositoryUrl": {
+ "url": "https://ffmpeg.org/download";
+ },
+ "licenses": ["spdx:LGPL-2.1-or-later", "spdx:GPL-2.0-or-later"],
+ "tags": ["audio", "graphics"]
+ }],
+
+ "funding": {
+ "channels": [{
+ "guid": "ffmpeg-spi",
+ "type": "other",
+ "address": "https://ffmpeg.org/donations.html";,
+ "description": "Paypal, CreditCard, Check, Money Order"
+ },{
+ "guid": "ffmpeg-spi-bank",
+ "type": "bank",
+ "address": "Please email us for payment details.",
+ "description": "Bank transfer"
+ }
+ ],
+
+ "plans": [{
+ "guid": "ffmpeg-individual",
+ "status": "active",
+ "name": "FFmpeg individual",
+ "description": "Pay as much or as little as you want",
+ "amount": 0,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi"]
+ },{
+ "guid": "visionary",
+ "status": "active",
+ "name": "Visionary Sponsor",
+ "amount": 155000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "sustainability",
+ "status": "active",
+ "name": "Sustainability Sponsor",
+ "amount": 95000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "maintaining",
+ "status": "active",
+ "name": "Maintaining Sponsor",
+ "amount": 63000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "contributing",
+ "status": "active",
+ "name": "Contributing Sponsor",
+ "amount": 33000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "supporting",
+ "status": "active",
+ "name": "Supporting Sponsor",
+ "amount": 16500,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "partner",
+ "status": "active",
+ "name": "Partner Sponsor",
+ "amount": 11000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ },{
+ "guid": "participating",
+ "status": "active",
+ "name": "Participating Sponsor",
+ "amount": 4000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi", "ffmpeg-spi-bank"]
+ },{
+ "guid": "associate",
+ "status": "active",
+ "name": "Associate Sponsor",
+ "amount": 1500,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi", "ffmpeg-spi-bank"]
+ },{
+ "guid": "ffmpeg-maintainer",
+ "status": "active",
+ "name": "Sponsor a full time maintainer and patch reviewer",
+ "amount": 100000,
+ "currency": "USD",
+ "frequency": "yearly",
+ "channels": ["ffmpeg-spi-bank"]
+ }]
+ }
+}
commit 7238ff304c4912796adbbddd7b7f9c6298b2f166
Author: Michael Niedermayer <[email protected]>
AuthorDate: Wed Sep 3 14:54:22 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Wed Sep 3 14:55:46 2025 +0200
CVE-2024-7272 ticket number
diff --git a/src/security b/src/security
index d05e369..b80fd98 100644
--- a/src/security
+++ b/src/security
@@ -149,6 +149,7 @@ CVE-2022-2566, c953baa084607dd1d84c3bfcce3cf6a87c3e6e05
CVE-2022-3964, 92f9b28ed84a77138105475beba16c146bdaf984
CVE-2022-3965, 13c13109759090b7f7182480d075e13b36ed8edd
CVE-2022-48434, cc867f2c09d2b69cee8a0eccd62aff002cbbfe11
+CVE-2024-7272, 9903ba28c28ab18dc7b7b6fb8571cc8b5caae1a6, ticket/9908
</pre>
@@ -178,7 +179,7 @@ Fixes following vulnerabilities:
</p>
<pre>
CVE-2024-7055, 5372bfe01e4a04357ab4465c1426cf8c6412dfd5 /
3faadbe2a27e74ff5bb5f7904ec27bb1f5287dc8
-CVE-2024-7272, a937b3c58babae893fb46b286a4792cd24a01d3d /
9903ba28c28ab18dc7b7b6fb8571cc8b5caae1a6
+CVE-2024-7272, a937b3c58babae893fb46b286a4792cd24a01d3d /
9903ba28c28ab18dc7b7b6fb8571cc8b5caae1a6, ticket/9908
</pre>
<h3>5.1.5</h3>
-----------------------------------------------------------------------
Summary of changes:
htdocs/funding.json | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/security | 3 +-
2 files changed, 128 insertions(+), 1 deletion(-)
create mode 100644 htdocs/funding.json
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
