[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19361] trunk/blender/extern/ffmpeg/ SConscript: == FFMPEG ==

[Peter Schlaile]

Revision: 19361
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19361
Author:   schlaile
Date:     2009-03-22 20:52:55 +0100 (Sun, 22 Mar 2009)

Log Message:
-----------
== FFMPEG ==

Yasm support was broken

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

Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript	2009-03-22 19:22:16 UTC (rev 19360)
+++ trunk/blender/extern/ffmpeg/SConscript	2009-03-22 19:52:55 UTC (rev 19361)
@@ -174,6 +174,11 @@
             shutil.copyfile(root + "/" + lib + "/" + h,
                             root + "/include/ffmpeg/" + h)
 
+    if "YASM" in vars:
+        ff_env['AS'] = vars['YASM']
+    if "YASMFLAGS" in vars:
+        ff_env['ASFLAGS'] = vars['YASMFLAGS']
+
     ff_env.BlenderLib (libname="extern_" + lib, sources=sources,
                     includes=["."] + all_libs + extra_includes,
                     defines=Split(defs),