diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-21 14:30:22 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-21 14:30:22 -0400 |
| commit | bf76d98789a0fc6303c303beddbc1ed609f2a6ea (patch) | |
| tree | 1df8db2fa06f6826a1c7a1cb1faa253df704834e /gnu/packages/video.scm | |
| parent | fc9ff915b3cfcb494dbb5c8ab767972352fa31da (diff) | |
| parent | 12b04cbee6b9c725db8a5c898b597de8e667bef0 (diff) | |
| download | guix-bf76d98789a0fc6303c303beddbc1ed609f2a6ea.tar guix-bf76d98789a0fc6303c303beddbc1ed609f2a6ea.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 b923e47444..c118b2fe50 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -296,14 +296,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 "2.7") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "0jl43b63b20db3yia5xxp0hh8zwdbirk5k9p1d7416nq1b5ckfx8")))) + "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |