projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
fbd6d44
)
OSX: set ffmpeg back in darwin-config according librenaming
author
Jens Verwiebe <info@jensverwiebe.de>
Fri, 24 Feb 2012 18:31:09 +0000
(18:31 +0000)
committer
Jens Verwiebe <info@jensverwiebe.de>
Fri, 24 Feb 2012 18:31:09 +0000
(18:31 +0000)
build_files/scons/config/darwin-config.py
patch
|
blob
|
history
diff --git
a/build_files/scons/config/darwin-config.py
b/build_files/scons/config/darwin-config.py
index 17882342a86ca905d6839740ec38eb301d980abe..78a19a1e81dab0e08d07869249a5f39c9c884b09 100644
(file)
--- a/
build_files/scons/config/darwin-config.py
+++ b/
build_files/scons/config/darwin-config.py
@@
-102,7
+102,7
@@
else:
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg
_0.10
'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'