diff options
author | Mark H Weaver <mhw@netris.org> | 2014-08-23 20:43:51 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-08-23 20:43:51 -0400 |
commit | ce3e35ed6af5c502029fb79cb5e2bdbca528d841 (patch) | |
tree | f2db16e01972bc8dcf5d69e4c94b8c4da52e9547 /gnu/packages/video.scm | |
parent | fa5731baabdb4a9240aad2154847f352aed02d6e (diff) | |
parent | f0dafadcfc0336e8d437f39c3563029eaa0f7953 (diff) | |
download | guix-patches-ce3e35ed6af5c502029fb79cb5e2bdbca528d841.tar guix-patches-ce3e35ed6af5c502029fb79cb5e2bdbca528d841.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 23c63fabdb..2873c49e3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -58,14 +58,14 @@ (define-public ffmpeg (package (name "ffmpeg") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "10w1sw5c9qjlaqlr77r3znzm7y0y9qpkni0mfr9rhij22562yspf")))) + "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |