summary refs log tree commit diff
path: root/pkgs/development/libraries/ffmpeg-full
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-05-11 11:01:51 +0200
committerVladimír Čunát <v@cunat.cz>2019-05-11 11:38:28 +0200
commit9fda8602e1b9d166ed9545587e74f3f3f668cd80 (patch)
tree8540d0178466bf3282a59a3c4122999d30e51ae4 /pkgs/development/libraries/ffmpeg-full
parentb1565e5af8f54f1a1235881fd0245898c5157a37 (diff)
downloadnixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar.gz
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar.bz2
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar.lz
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar.xz
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.tar.zst
nixpkgs-9fda8602e1b9d166ed9545587e74f3f3f668cd80.zip
ffmpeg-full: enable nvenc by default
It's called "full", after all, and nvenc seem quite cheap actually.
Also remove an unused parameter.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index ca0a250e3d4..5aa247578b1 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -97,8 +97,7 @@
 , libXv ? null # Xlib support
 , libXext ? null # Xlib support
 , lzma ? null # xz-utils
-, nvenc ? false, nv-codec-headers ? null # NVIDIA NVENC support
-, callPackage # needed for NVENC to access external ffmpeg nvidia headers
+, nvenc ? true, nv-codec-headers ? null # NVIDIA NVENC support
 , openal ? null # OpenAL 1.1 capture support
 #, opencl ? null # OpenCL code
 , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder