summary refs log tree commit diff
path: root/pkgs/development/libraries/ffmpeg-full
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2021-03-02 11:08:19 +0000
committerTredwellGit <tredwell@tutanota.com>2021-03-02 11:08:19 +0000
commitf94e21c4e8783c3f5cd1a3edfc0acca79bd4179f (patch)
treeba6b68b8aebe4ffeaf26bce126e31ce32ec99ec3 /pkgs/development/libraries/ffmpeg-full
parentf14c5a6d92428469dfb9983b3eccdb6fb097cdf3 (diff)
downloadnixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar.gz
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar.bz2
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar.lz
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar.xz
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.tar.zst
nixpkgs-f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f.zip
ffmpeg: 4.3.1 -> 4.3.2
https://nvd.nist.gov/vuln/detail/CVE-2020-35964
https://nvd.nist.gov/vuln/detail/CVE-2020-35965
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 916ea2772e1..a09ad0e871e 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -246,11 +246,6 @@ stdenv.mkDerivation rec {
 
   # this should go away in the next release
   patches = [
-    (fetchpatch {
-      url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
-      sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
-      name = "fix_libsrt.patch";
-    })
     # Patch ffmpeg for svt-av1 until version 4.4
     (fetchpatch {
       url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";