Unverified Commit 3586ad34 authored by Anthony Cowley's avatar Anthony Cowley Committed by GitHub
Browse files

Merge pull request #192175 from jmesmon/ffmpeg-full-enable-videotoolbox 

ffmpeg-full: enable videotoolbox for hw accelerated encode on darwin
parents 413bf055 8b56c422

pkgs/development/libraries/ffmpeg-full/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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" ]

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -18850,7 +18850,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 {