summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nongnu/packages/video.scm87
1 files changed, 44 insertions, 43 deletions
diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm
index 2b6def8..096adb0 100644
--- a/nongnu/packages/video.scm
+++ b/nongnu/packages/video.scm
@@ -44,54 +44,55 @@
44 #:use-module ((nonguix licenses) #:prefix nonguix-license:)) 44 #:use-module ((nonguix licenses) #:prefix nonguix-license:))
45 45
46(define-public ffmpeg/nvidia 46(define-public ffmpeg/nvidia
47 (package 47 (hidden-package
48 (inherit ffmpeg) 48 (package
49 (name "ffmpeg-nvidia") 49 (inherit ffmpeg)
50 (inputs 50 (inputs
51 (modify-inputs 51 (modify-inputs
52 (package-inputs ffmpeg) 52 (package-inputs ffmpeg)
53 (prepend nv-codec-headers))) 53 (prepend nv-codec-headers)))
54 (arguments 54 (arguments
55 (substitute-keyword-arguments (package-arguments ffmpeg) 55 (substitute-keyword-arguments (package-arguments ffmpeg)
56 ((#:configure-flags flags) 56 ((#:configure-flags flags)
57 ;; Currently only interested in NVENC. 57 ;; Currently only interested in NVENC.
58 ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs 58 ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
59 ;; in the future. 59 ;; in the future.
60 #~(cons* "--enable-cuvid" 60 #~(cons* "--enable-cuvid"
61 "--enable-ffnvcodec" 61 "--enable-ffnvcodec"
62 "--enable-encoder=hevc_nvenc" 62 "--enable-encoder=hevc_nvenc"
63 "--enable-encoder=h264_nvenc" 63 "--enable-encoder=h264_nvenc"
64 #$flags)))) 64 #$flags))))
65 (description 65 (description
66 (string-append 66 (string-append
67 (package-description ffmpeg) 67 (package-description ffmpeg)
68 " This build of FFmpeg includes the nonfree NVIDIA encoder for 68 " This build of FFmpeg includes the nonfree NVIDIA encoder for
69@code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs.")) 69@code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs."))
70 (properties '((upstream-name . "ffmpeg"))))) 70 (properties '((upstream-name . "ffmpeg"))))))
71 71
72(define-public ffmpeg-6/nvidia 72(define-public ffmpeg-6/nvidia
73 (package 73 (hidden-package
74 (inherit ffmpeg-6) 74 (package
75 (name "ffmpeg-nvidia") 75 (inherit ffmpeg-6)
76 (inputs 76 (inputs
77 (modify-inputs 77 (modify-inputs
78 (package-inputs ffmpeg-6) 78 (package-inputs ffmpeg-6)
79 (prepend nv-codec-headers))) 79 (prepend nv-codec-headers)))
80 (arguments 80 (arguments
81 (substitute-keyword-arguments (package-arguments ffmpeg-6) 81 (substitute-keyword-arguments (package-arguments ffmpeg-6)
82 ((#:configure-flags flags) 82 ((#:configure-flags flags)
83 ;; Currently only interested in NVENC. 83 ;; Currently only interested in NVENC.
84 ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs 84 ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
85 ;; in the future. 85 ;; in the future.
86 #~(cons* "--enable-cuvid" 86 #~(cons* "--enable-cuvid"
87 "--enable-ffnvcodec" 87 "--enable-ffnvcodec"
88 "--enable-encoder=hevc_nvenc" 88 "--enable-encoder=hevc_nvenc"
89 "--enable-encoder=h264_nvenc" 89 "--enable-encoder=h264_nvenc"
90 #$flags)))) 90 #$flags))))
91 (description (package-description ffmpeg/nvidia)) 91 (description (package-description ffmpeg/nvidia))
92 (properties '((upstream-name . "ffmpeg"))))) 92 (properties '((upstream-name . "ffmpeg"))))))
93 93
94(define-deprecated-package ffmpeg-nvenc ffmpeg/nvidia) 94(define-deprecated-package ffmpeg-nvenc ffmpeg/nvidia)
95(define-deprecated-package ffmpeg-nvidia ffmpeg/nvidia)
95 96
96(define-public gmmlib 97(define-public gmmlib
97 (package 98 (package