[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19364] trunk/blender/extern/ffmpeg/ SConscript: fix ffmpeg config.

Martin Poirier theeth at yahoo.com
Sun Mar 22 21:59:32 CET 2009


Revision: 19364
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19364
Author:   theeth
Date:     2009-03-22 21:59:32 +0100 (Sun, 22 Mar 2009)

Log Message:
-----------
fix ffmpeg config. Disabling alsa demux properly

Modified Paths:
--------------
    trunk/blender/extern/ffmpeg/SConscript

Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript	2009-03-22 20:40:31 UTC (rev 19363)
+++ trunk/blender/extern/ffmpeg/SConscript	2009-03-22 20:59:32 UTC (rev 19364)
@@ -9,7 +9,7 @@
 if env['OURPLATFORM'] == 'win32-mingw':
     ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
 else:
-    ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame --disable-bzlib --disable-outdevs --disable-demuxer=alsa_demuxer"
+    ffmpeg_switches = "--disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame --disable-bzlib --disable-outdevs --disable-demuxer=alsa"
     if env['OURPLATFORM'] == 'darwin':
         ffmpeg_switches += " --disable-mmx"
 





More information about the Bf-blender-cvs mailing list