about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJacek Galowicz <jacek@galowicz.de>2022-02-21 22:35:45 +0100
committerGitHub <noreply@github.com>2022-02-21 22:35:45 +0100
commit25b712020f8fc25e61e79842cbc574625d6af8b7 (patch)
tree2f024cb00c8de95ab785c8f76b41a11b0f8638ab
parente78f0899975fea7bfa7863844ebd247d33faa395 (diff)
parent8a3191fa1b0bf9fb9c3d59cfb1184adff4312377 (diff)
downloadnixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar.gz
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar.bz2
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar.lz
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar.xz
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.tar.zst
nixlib-25b712020f8fc25e61e79842cbc574625d6af8b7.zip
Merge pull request #160615 from blitz/obs-studio-av1
obs-studio: enable AV1 encoding
-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 8210be2a5efd..15a354b4669d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27889,7 +27889,9 @@ with pkgs;
 
   oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
 
-  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {};
+  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
+    ffmpeg_4 = ffmpeg-full;
+  };
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
   wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {};