diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-18 15:29:38 +0200 |
| commit | 6969c4de445a390eaa05de22bc5a537a76a76169 (patch) | |
| tree | 9df3bdde497fdce705ae4eb66972f93a9ae111d9 /gnu/packages/video.scm | |
| parent | 73d18915b597f2a386d6ae42930b49a13c8813b0 (diff) | |
| parent | 32eb44240db23b2320a68a3ab17370531945587f (diff) | |
| download | guix-6969c4de445a390eaa05de22bc5a537a76a76169.tar guix-6969c4de445a390eaa05de22bc5a537a76a76169.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8cd7a3d57c..e31238243f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -606,14 +606,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "4.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d")))) + "1vn04n0n46zdxq14cma3w8ml2ckh5jxwlybsc4xmvcqdqq0mqpv0")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |