Merge branch 'cloudooo' of https://git.erp5.org/repos/slapos into cloudooo

a858a815 · Priscila Manhaes · 253c3b35 · 78f3b53d · a858a815
Commit a858a815 authored Nov 03, 2011 by Priscila Manhaes
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

component/ffmpeg/buildout.cfg component/ffmpeg/buildout.cfg +6 -6

No files found.
--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
@@ -9,7 +9,7 @@ parts =
  ffmpeg
 [ffmpeg]
-<= ffmpeg-0.6
+<= ffmpeg-0.8
 [libogg]
 recipe = hexagonit.recipe.cmmi
@@ -53,8 +53,8 @@ environment =
 [libx264]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110412-2245.tar.bz2
+url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
-md5sum = 423c402214544d0e2f21455175a0d01f
+md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
  --enable-shared
  --enable-pic
@@ -76,10 +76,10 @@ md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
  --disable-static
-[ffmpeg-0.6]
+[ffmpeg-0.8]
 recipe = hexagonit.recipe.cmmi
-url = http://www.ffmpeg.org/releases/ffmpeg-0.6.3.tar.bz2
+url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
-md5sum = cdf4ad9b2a4d195b5ca874494bc7b0b0
+md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 
 --enable-gpl
 --enable-version3