nongnu: Move ffmpeg/nvidia and ffmpeg-6/nvidia to (nongnu packages nvidia).

* nongnu/packages/video.scm (ffmpeg/nvidia, ffmpeg-6/nvidia): Move them to...
* nongnu/packages/nvidia.scm (ffmpeg/nvidia, ffmpeg-6/nvidia): ...here.

2 files changed, 45 insertions, 46 deletions

diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm
index 6d1d374..0240921 100644
--- a/nongnu/packages/nvidia.scm
+++ b/nongnu/packages/nvidia.scm
@@ -1376,6 +1376,51 @@ support.  For dependency of other packages, use @code{nvidia-driver} instead.")
   heroic-nvidia-beta
   (package-version nvidia-driver-beta))
 
+(define-public ffmpeg/nvidia
+  (hidden-package
+   (package
+     (inherit ffmpeg)
+     (name "ffmpeg-nvidia")
+     (inputs
+      (modify-inputs inputs
+        (prepend nv-codec-headers)))
+     (arguments
+      (substitute-keyword-arguments arguments
+        ((#:configure-flags flags)
+         ;; Currently only interested in NVENC.
+         ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
+         ;; in the future.
+         #~(cons* "--enable-cuvid"
+                  "--enable-ffnvcodec"
+                  "--enable-encoder=hevc_nvenc"
+                  "--enable-encoder=h264_nvenc"
+                  #$flags))))
+     (description
+      (string-append
+       (package-description ffmpeg)
+       "  This build of FFmpeg includes the nonfree NVIDIA encoder for
+@code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs.")))))
+
+(define-public ffmpeg-6/nvidia
+  (hidden-package
+   (package
+     (inherit ffmpeg-6)
+     (inputs
+      (modify-inputs inputs
+        (prepend nv-codec-headers)))
+     (arguments
+      (substitute-keyword-arguments arguments
+        ((#:configure-flags flags)
+         ;; Currently only interested in NVENC.
+         ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
+         ;; in the future.
+         #~(cons* "--enable-cuvid"
+                  "--enable-ffnvcodec"
+                  "--enable-encoder=hevc_nvenc"
+                  "--enable-encoder=h264_nvenc"
+                  #$flags))))
+     (description (package-description ffmpeg/nvidia)))))
+
 (define* (replace-mesa obj #:key (driver nvda))
   (with-transformation
       (package-input-grafting
diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm
index b69616a..54fd6c2 100644
--- a/nongnu/packages/video.scm
+++ b/nongnu/packages/video.scm
@@ -43,52 +43,6 @@
   #:use-module (nonguix build-system binary)
   #:use-module ((nonguix licenses) #:prefix nonguix-license:))
 
-(define-public ffmpeg/nvidia
-  (hidden-package
-   (package
-     (inherit ffmpeg)
-     (inputs
-      (modify-inputs inputs
-        (prepend nv-codec-headers)))
-     (arguments
-      (substitute-keyword-arguments arguments
-        ((#:configure-flags flags)
-         ;; Currently only interested in NVENC.
-         ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
-         ;; in the future.
-         #~(cons* "--enable-cuvid"
-                  "--enable-ffnvcodec"
-                  "--enable-encoder=hevc_nvenc"
-                  "--enable-encoder=h264_nvenc"
-                  #$flags))))
-     (description
-      (string-append
-       (package-description ffmpeg)
-       "  This build of FFmpeg includes the nonfree NVIDIA encoder for
-@code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs."))
-     (properties '((upstream-name . "ffmpeg"))))))
-
-(define-public ffmpeg-6/nvidia
-  (hidden-package
-   (package
-     (inherit ffmpeg-6)
-     (inputs
-      (modify-inputs inputs
-        (prepend nv-codec-headers)))
-     (arguments
-      (substitute-keyword-arguments arguments
-        ((#:configure-flags flags)
-         ;; Currently only interested in NVENC.
-         ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
-         ;; in the future.
-         #~(cons* "--enable-cuvid"
-                  "--enable-ffnvcodec"
-                  "--enable-encoder=hevc_nvenc"
-                  "--enable-encoder=h264_nvenc"
-                  #$flags))))
-     (description (package-description ffmpeg/nvidia))
-     (properties '((upstream-name . "ffmpeg"))))))
-
 (define-public gmmlib
   (package
     (name "gmmlib")