diff options
| author | Atemu <atemu.main@gmail.com> | 2024-03-07 08:52:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 08:52:46 +0000 |
| commit | ab5c9ffb0643471d34ca052b250b045fa9d782bf (patch) | |
| tree | 8d941ea66db5f74930ef9e682de4c91d89afb697 /pkgs/development/libraries/ffmpeg | |
| parent | 35c6bd1d2a791eb51ce1942b9724b8f700a7000e (diff) | |
| parent | 19d6df886fa6b34470e7d32feb3b8717f8321599 (diff) | |
Merge pull request #292998 from jopejoe1/ffmpeg/update
ffmpeg: 6.1 -> 6.1.1, 5.1.3 -> 5.1.4
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/5.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/6.nix | 9 |
2 files changed, 4 insertions, 24 deletions
diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index 68edb0fd37e4f..d4d78befe7dca 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -1,21 +1,6 @@ import ./generic.nix { - version = "5.1.3"; - hash = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; + version = "5.1.4"; + hash = "sha256-2jUL1/xGUf7aMooST2DW41KE7bC+BtgChXmj0sAJZ90="; extraPatches = [ - { - name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; - hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; - } - { - name = "libsvtav1-1.5.0-compat-vbv_bufsize.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee"; - hash = "sha256-v9Viyo12QfZpbcVqd1aHgLl/DgSkdE9F1kr6afTGPik="; - } - { - name = "libsvtav1-1.5.0-compat-maximum_buffer_size_ms-conditional.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/96748ac54f998ba6fe22802799c16b4eba8d4ccc"; - hash = "sha256-Z5HSe7YpryYGHD3BYXejAhqR4EPnmfTGyccxNvU3AaU="; - } ]; } diff --git a/pkgs/development/libraries/ffmpeg/6.nix b/pkgs/development/libraries/ffmpeg/6.nix index cebf17e071e9b..9b9b5e49a4e50 100644 --- a/pkgs/development/libraries/ffmpeg/6.nix +++ b/pkgs/development/libraries/ffmpeg/6.nix @@ -1,11 +1,6 @@ import ./generic.nix { - version = "6.1"; - hash = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; + version = "6.1.1"; + hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; extraPatches = [ - { - name = "avcodec-decode-validate-hw-frames-ctx.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7"; - hash = "sha256-aE9WN7a2INbss7oRys+AC9d9+yBzlJdeBRcwSDpG0Qw="; - } ]; } |