diff options
| author | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
| commit | 1524851f58d8d69f6c6e1c6406cf174083bbe82d (patch) | |
| tree | d7c63b716501e4423e9f7173790a8cc4c3962935 /gnu/packages/video.scm | |
| parent | 0802f3a034815576bf0e28c59c968400566b418b (diff) | |
| parent | ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 (diff) | |
| download | guix-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar guix-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 383e88cf9b..8f7a2384f4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -457,14 +457,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.2.4") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0ymg1mkg1n0770gmjfqp79p5ijxq04smfrsrrxc8pjc0y0agyf3f")))) + "17anx7rnbi63if1ndr61836lf76dpn47n0y424hc48bj05y7z7jr")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -577,7 +577,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") "--enable-libx265" "--enable-openal" "--enable-opengl" - "--enable-x11grab" "--enable-runtime-cpudetect" |