aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/video.scm
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-08-29 23:25:41 +0800
committerZheng Junjie <zhengjunjie@iscas.ac.cn>2024-09-07 23:01:50 +0800
commit1ac27c7a66097cc5a3d445539bd45556a433e062 (patch)
tree1e4e5c1484f5d8563469f8e74fafd1f0f4f1ba3a /gnu/packages/video.scm
parentfdd59cb339393fcdcafc388a6061d1b986099906 (diff)
downloadguix-1ac27c7a66097cc5a3d445539bd45556a433e062.tar.gz
guix-1ac27c7a66097cc5a3d445539bd45556a433e062.zip
gnu: Add ffmpeg-7.
* gnu/packages/video.scm (ffmpeg-7): New variable. (ffmpeg): Inherit above. Change-Id: I39fdec3e380c8cf7feed74d5caa960fb33f0ffae Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r--gnu/packages/video.scm20
1 files changed, 16 insertions, 4 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c900b5adf7..f3c6b6df9a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -67,7 +67,7 @@
;;; Copyright © 2023 Dominik Delgado Steuter <dds@disroot.org>
;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -1664,17 +1664,17 @@ These tools require a supported graphics chip, driver, and VA-API back end to
operate properly.")
(license license:expat)))
-(define-public ffmpeg
+(define-public ffmpeg-7
(package
(name "ffmpeg")
- (version "6.1.1")
+ (version "7.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
- "0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146"))))
+ "12dkv17mrsdqrm70c30azjw7qi1lfxca7xisw81x6flacddm2il6"))))
(outputs '("out" "debug"))
(build-system gnu-build-system)
(inputs
@@ -1883,6 +1883,18 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.")
(license license:gpl2+)))
+(define-public ffmpeg
+ (package
+ (inherit ffmpeg-7)
+ (version "6.1.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146"))))))
+
(define-public ffmpeg-5
(package
(inherit ffmpeg)