Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-04-13 19:17:06 +0400
committerPeter Schlaile <peter@schlaile.de>2008-04-13 19:17:06 +0400
commit747b31385a35963795ec8e8f461ccae51b871b63 (patch)
tree19dc8306995829353f41180d2b56a225e217def4 /extern/SConscript
parent6b81045bc39f24290782fcc7a45687267ca9e8f1 (diff)
== FFMPEG ==
Added H264-encoding support using libx264. Beware: it currently only works with scons and it needs nasm or yasm as an additional dependency!
Diffstat (limited to 'extern/SConscript')
-rw-r--r--extern/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/extern/SConscript b/extern/SConscript
index bcf67055788..0e46adeb9be 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -16,7 +16,8 @@ if env['WITH_BF_VERSE']:
SConscript(['verse/dist/SConstruct'])
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
- SConscript(['ffmpeg/SConscript']);
+ SConscript(['x264/SConscript'])
+ SConscript(['ffmpeg/SConscript'])
if env['OURPLATFORM'] == 'linux2':
- SConscript(['binreloc/SConscript']); \ No newline at end of file
+ SConscript(['binreloc/SConscript']);