colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg-full: enable videotoolbox for hw accelerated encode on darwin

Browse Source 
Plain ffmpeg already includes this, but ffmpeg-full was missing the
VideoToolbox dependency, resulting in it lacking hw accelerated encoding
on darwin.
This commit is contained in:
Cody P Schafer 2022-08-25 01:20:48 -04:00
parent 0fdc7224a2
commit 8b56c422e4
No known key found for this signature in database
GPG Key ID: 794D748B8B8BF912
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -154,7 +154,7 @@
* Darwin frameworks
*/
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration
, VideoDecodeAcceleration, VideoToolbox
}:
/* Maintainer notes:
@ -454,7 +454,7 @@ stdenv.mkDerivation rec {
++ optional (nvdec || nvenc) nv-codec-headers
++ optional cuda-llvm clang
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
MediaToolbox VideoDecodeAcceleration VideoToolbox
libiconv ];
buildFlags = [ "all" ]

2
pkgs/top-level/all-packages.nix
View File

@ -18217,7 +18217,7 @@ with pkgs;
samba = if stdenv.isDarwin then null else samba;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;
VideoDecodeAcceleration VideoToolbox;
};
ffmpeg_5-full = ffmpeg-full.override {