aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-10-25 20:05:57 -0400
committerMark H Weaver <mhw@netris.org>2014-10-25 20:06:43 -0400
commitf9e687b51aafaa160b3c361c801ec5823dbef2f0 (patch)
tree6b65626565bbba6fc00f94bac5336a1e469483d1 /gnu
parent569ac04681aa6f1d63fd9fa7b2bd844f67685d28 (diff)
downloadgnu-guix-f9e687b51aafaa160b3c361c801ec5823dbef2f0.tar
gnu-guix-f9e687b51aafaa160b3c361c801ec5823dbef2f0.tar.gz
gnu: ffmpeg: Add version 2.2.9 and use it for vlc.
* gnu/packages/video.scm (ffmpeg-2.2): New variable. (vlc): Use ffmpeg-2.2.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/video.scm14
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2d27ddf693..9f9b8b04a9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -196,6 +196,18 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.")
(license gpl2+)))
+;; We need this older ffmpeg because vlc-2.1.5 doesn't work with ffmpeg-2.4.
+(define-public ffmpeg-2.2
+ (package (inherit ffmpeg)
+ (version "2.2.9")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0fbjszysnab6yfrv4dpa8yqjin6hcy1zs4i1wa8782bq3pc1529y"))))))
+
(define-public vlc
(package
(name "vlc")
@@ -218,7 +230,7 @@ audio/video codec library.")
("avahi" ,avahi)
("dbus" ,dbus)
("flac" ,flac)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-2.2) ; FIXME: vlc-2.1.5 won't work with ffmpeg-2.4
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gnutls" ,gnutls)