diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
| commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
| tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /gnu/packages/video.scm | |
| parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
| parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
| download | guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/libwebsockets.scm
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 369f29f7ac..ab5033eb73 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -35,14 +35,14 @@ (define-public ffmpeg (package (name "ffmpeg") - (version "2.1.3") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "18qkdpka94rp44x17q7d2bvmw26spxf41c69nvzy31szsdzjwcqx")))) + "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |