Revision: 19415
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19415
Author: dfelinto
Date: 2009-03-26 00:09:17 +0100 (Thu, 26 Mar 2009)
Log Message:
-----------
scons+msvc update for the FFMpeg recent updates
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/config/win32-vc-config.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2009-03-25 20:49:15 UTC (rev 19414)
+++ trunk/blender/SConstruct 2009-03-25 23:09:17 UTC (rev 19415)
@@ -557,14 +557,14 @@
if env['WITH_BF_ICONV']:
dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
if env['WITH_BF_FFMPEG']:
- dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+ dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
-
'${LCGDIR}/ffmpeg/lib/avutil-49.dll',
-
'${LCGDIR}/ffmpeg/lib/libfaad-0.dll',
+
'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
+
'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-
'${LCGDIR}/ffmpeg/lib/libx264-59.dll',
+
'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2009-03-25 20:49:15 UTC (rev
19414)
+++ trunk/blender/config/win32-vc-config.py 2009-03-25 23:09:17 UTC (rev
19415)
@@ -9,7 +9,7 @@
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib
swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib
swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '2.5'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
