diff options
author | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-10-03 17:08:05 -0400 |
commit | 9c2130757cc0ac20be3cb255c2c09ede45cc9826 (patch) | |
tree | 2f06ff7fbde58022a6600f76f15d3734587f2ab0 /gnu/packages/video.scm | |
parent | e543c8a2c6bdc8f129d02a4b48ff336d0e7b529b (diff) | |
parent | b38e97e03b92d54524953949934884828a1683c1 (diff) | |
download | guix-9c2130757cc0ac20be3cb255c2c09ede45cc9826.tar.gz |
Merge branch 'master' into core-updates
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 4a4a3461d4..064a39b829 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -403,14 +403,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 "3.1.3") + (version "3.1.4") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq")))) + "0nvb2k0maj5g8llfg47j8z5xpvp4q3g9pab2pp6vpjd5vmwb6358")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |