aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-07-09 03:06:34 -0400
committerMark H Weaver <mhw@netris.org>2015-07-09 03:30:27 -0400
commit549381d6db229a440cd48158015c760891bbb238 (patch)
treecc959c805ddabc70b138b700a2f8aa73180b2a02 /gnu/packages
parent82712597cc59d09521eb69fd83f71424ebb5657a (diff)
downloadgnu-guix-549381d6db229a440cd48158015c760891bbb238.tar
gnu-guix-549381d6db229a440cd48158015c760891bbb238.tar.gz
gnu: ffmpeg: Add libx264 support.
* gnu/packages/video.scm (ffmpeg)[inputs]: Add libx264. [arguments]: Add "--enable-libx264" to configure-flags.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/video.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 01070f650c..d0983808c6 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -399,6 +399,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
+ ("libx264" ,libx264)
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("soxr" ,soxr)
@@ -462,7 +463,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
;; --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no]
;; --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no]
;; --enable-libwavpack enable wavpack encoding via libwavpack [no]
- ;; --enable-libx264 enable H.264 encoding via x264 [no]
;; --enable-libxavs enable AVS encoding via xavs [no]
;; --enable-libzmq enable message passing via libzmq [no]
;; --enable-libzvbi enable teletext support via libzvbi [no]
@@ -496,6 +496,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
"--enable-libvorbis"
"--enable-libvpx"
"--enable-libxvid"
+ "--enable-libx264"
"--enable-openal"
"--enable-runtime-cpudetect"