diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-10 02:57:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-10 02:57:50 +0200 |
| commit | ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b (patch) | |
| tree | c743e4905419232e6a342694760bf446cd41b5d4 /gnu/packages/video.scm | |
| parent | 202342fdda708d8e4554e0514a58849584eddbd0 (diff) | |
| parent | 8caf5bac4c89512793276054770386c343c73e7b (diff) | |
| download | guix-ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b.tar guix-ea45e2c500c7ed5b22ea5c21516db40dfd8fbd0b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4b3d83df28..8a91a97017 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -461,14 +461,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.3.1") + (version "3.3.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp")))) + "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -2176,7 +2176,7 @@ many codecs and formats supported by libmediainfo.") (source (origin (method url-fetch) (uri (string-append - "http://www.live555.com/liveMedia/public/live." + "https://download.videolan.org/contrib/live555/live." version ".tar.gz")) (sha256 (base32 |