about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-05-31 22:55:05 +0300
committerJon <jonringer@users.noreply.github.com>2020-06-12 11:55:31 -0700
commit8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (patch)
treece1d04ea6e2dd60435036665e8d436ed43822752 /pkgs/top-level
parent8df5edc1537c8cd660ba27adc0b8f946861309bb (diff)
downloadnixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar.gz
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar.bz2
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar.lz
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar.xz
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.tar.zst
nixlib-8e1dcea3d575dfd4ecdee336e5b95c093f3017cb.zip
ffmpeg: default to ffmpeg_4
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe2a3831c164..65ab2e5c0b8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11712,7 +11712,9 @@ in
   # Aliases
   ffmpeg_2 = ffmpeg_2_8;
   ffmpeg_3 = ffmpeg_3_4;
-  ffmpeg = ffmpeg_3;
+  # Please make sure this is updated to the latest version on the next major
+  # update to ffmpeg
+  ffmpeg = ffmpeg_4;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     ffmpeg = ffmpeg_4;