Commit Graph

461 Commits

Author SHA1 Message Date
jopejoe1
19eba8feb8 ffmpeg_6: 6.1.1 -> 6.1.2 2024-08-05 20:14:42 +02:00
jopejoe1
e53cf6ca74 ffmpeg_4: 4.4.4 -> 4.4.5 2024-08-01 22:10:24 +02:00
Emily
d2225a1ce3 ffmpeg_7: add a Chromium patch to expose a private API
This enables using a modern unvendored FFmpeg.
2024-07-29 11:06:59 +01:00
Emily
801cacf89b ffmpeg: add myself to maintainers
😣
2024-07-29 11:06:59 +01:00
Vladimír Čunát
cd346565bb
Merge branch 'master' into staging-next 2024-07-24 07:19:19 +02:00
toonn
b0c3089aff
ffmpeg_7-full: Reenable withQuirc
This was disabled in #322724 after #328420 fixed quirc.
2024-07-23 12:57:29 +02:00
toonn
fd067e42dc
ffmpeg_7: Reenable withAVFoundation
This was disabled in #322724 after #328424 provided a patch fixing it.
2024-07-23 12:55:09 +02:00
github-actions[bot]
5b4db4db1c
Merge master into staging-next 2024-07-23 06:01:09 +00:00
éclairevoyant
3effa75f8b
Merge pull request #329281 from arthsmn/ffmpeg-remove-maintainer
ffmpeg: remove arthsmn from the maintainers
2024-07-23 01:51:24 +00:00
arthsmn
a1814d2dbf
ffmpeg: remove arthsmn from the maintainers 2024-07-22 21:19:36 -03:00
Artturin
60e9cffe2c Merge branch 'master' into staging-next 2024-07-22 22:53:31 +03:00
Masum Reza
93e87edd25
Merge pull request #322724 from jopejoe1/ffmpeg/fix/darwin
ffmpeg_7: fix darwin build
2024-07-22 23:19:24 +05:30
toonn
1b2e3bdfed
ffmpeg: Patch for compatibility with 10.12 AVFoundation 2024-07-19 14:23:26 +02:00
Atemu
04df2885de
Merge pull request #326249 from afh/fix-ffmpeg4
ffmpeg_4: fix build issue introduced by texinfo 7.1 update
2024-07-18 21:10:09 +02:00
jopejoe1
6c65f6f138 ffmpeg_7: fix darwin build 2024-07-18 20:27:05 +02:00
Alexis Hildebrandt
1e07a3b40b ffmpeg_4: fix build issue introduced by texinfo 7.1 update 2024-07-18 19:31:47 +02:00
Atemu
aba669227b
Merge pull request #326618 from emilazy/drop-ffmpeg-5
ffmpeg_5: drop
2024-07-16 13:06:36 +02:00
Emily
f9eee6b0a7 ffmpeg_5: drop 2024-07-14 08:35:56 +01:00
Alex James
c6d7e85996
ffmpeg: add lcms2 option
FFmpeg 5.1 introduced optional support for ICC profiles using lcms2[^1].
Enable it by default in ffmpeg-full.

[^1]: b9a25963f7
2024-07-13 22:04:31 -05:00
Atemu
cf3f53b650
Merge pull request #325662 from risicle/ris-ffmpeg-CVE-2023-51794
ffmpeg_4, ffmpeg_5: add patch for CVE-2023-51794
2024-07-11 03:31:45 +02:00
Robert Scott
0aded32563 ffmpeg_4: add patch for CVE-2023-51794 2024-07-08 23:23:31 +01:00
Robert Scott
3e99b5aec1 ffmpeg_5: add patch for CVE-2023-51794 2024-07-08 23:23:16 +01:00
github-actions[bot]
5cfda25a07
Merge staging-next into staging 2024-07-02 12:01:51 +00:00
K900
40df467b06 ffmpeg_6-full: work around clang wrapper hardening nonsense with nvcc 2024-07-02 11:34:22 +03:00
Sefa Eyeoglu
416ba8804b
treewide: use addDriverRunpath
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-06-30 15:01:01 -04:00
Atemu
6ad14fad09
Merge pull request #321832 from jopejoe1/ffmpeg/feature/twolame
ffmpeg: add twolame option
2024-06-23 22:06:01 +02:00
jopejoe1
23336b6607 ffmpeg: add twolame option 2024-06-22 22:49:48 +02:00
Vladimír Čunát
33e1de781a
Merge #318912: ffmpeg, ffmpeg_5: add patches for several CVEs
...into staging
2024-06-12 11:27:50 +02:00
Robert Scott
59f7e20118 ffmpeg_5: add patches for CVE-2023-49502, CVE-2023-50008, CVE-2023-51793, CVE-2023-51796 2024-06-10 22:23:51 +01:00
Robert Scott
f959d366f1 ffmpeg: add patches for CVE-2023-49501, CVE-2023-49502, CVE-2023-50007, CVE-2023-50008 2024-06-10 22:18:43 +01:00
Robert Scott
53ca42587f ffmpeg: refactor mapped fetchpatch2 application
this prevents us from easily including non-fetchpatch'ed
patches
2024-06-10 22:18:07 +01:00
github-actions[bot]
c8c2ff3b9b
Merge staging-next into staging 2024-06-10 00:02:49 +00:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Atemu
3d15ef2951
Merge pull request #316997 from jopejoe1/ffmpeg/feature/metal
ffmpeg: add metal support
2024-06-09 15:38:01 +02:00
jopejoe1
b1e72e8082 ffmpeg: add metal support 2024-06-07 19:27:03 +02:00
jopejoe1
00d7d60e2a ffmpeg_7: 7.0 -> 7.0.1 2024-06-05 19:28:46 +02:00
Robert Scott
c23f9d58ff ffmpeg, ffmpeg_5: add patches for CVE-2024-31578 2024-05-11 19:24:53 +01:00
Robert Scott
ff06e7d5e9 ffmpeg, ffmpeg_5: add patches for CVE-2024-31582 2024-05-11 19:22:08 +01:00
Robert Scott
4230c04c74 ffmpeg_5: add patch for CVE-2024-31585 2024-05-11 18:56:51 +01:00
Vladimír Čunát
0bf0fc0629
Revert "ffmpeg-full: disable avisynth on Darwin" 2024-05-08 06:59:37 +02:00
Atemu
b72561a394 ffmpeg-full: disable avisynth on Darwin
See https://github.com/NixOS/nixpkgs/issues/309417
2024-05-06 03:21:19 +02:00
Vladimír Čunát
e34c2340c2
Merge #286255: ffmpeg: add avisynth support
...into staging
2024-04-22 09:00:16 +02:00
Atemu
bde107e321
Merge pull request #303683 from jopejoe1/ffmpeg/codec2
ffmpeg: codec2 support
2024-04-22 03:33:58 +02:00
Atemu
b251c56cac
Merge pull request #303730 from jopejoe1/ffmpeg/jxl
ffmpeg: jxl support
2024-04-19 17:19:17 +02:00
github-actions[bot]
a459b363de
Merge master into staging-next 2024-04-16 12:01:11 +00:00
jopejoe1
68cb245ca1 ffmpeg_7: dvd reading support 2024-04-15 15:23:32 +02:00
jopejoe1
9a9e475ca4 ffmpeg: jxl support 2024-04-12 22:34:58 +02:00
jopejoe1
8f5da4db6e ffmpeg: codec2 support 2024-04-12 15:18:48 +02:00
Vladimír Čunát
24d4f2cd52
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval):
	pkgs/development/python-modules/apsw/default.nix
	pkgs/development/python-modules/mido/default.nix
	pkgs/development/python-modules/pytest-bdd/default.nix
	pkgs/development/python-modules/sparse/default.nix
2024-04-12 07:06:54 +02:00
Atemu
3e4f96c930
Merge pull request #303165 from jopejoe1/ffmpeg/evc
ffmpeg_7: add support for MPEG-5 EVC en/decoding
2024-04-11 19:15:28 +02:00