[Bf-blender-cvs] [cc439f6] master: fix scons ffmpeg libraries for mingw32

Antony Riakiotakis noreply at git.blender.org
Sun Mar 30 03:35:44 CEST 2014


Commit: cc439f683b2b1603e94e9d27f420692b17b79f41
Author: Antony Riakiotakis
Date:   Sun Mar 30 01:34:55 2014 +0200
https://developer.blender.org/rBcc439f683b2b1603e94e9d27f420692b17b79f41

fix scons ffmpeg libraries for mingw32

===================================================================

M	build_files/scons/config/win32-mingw-config.py

===================================================================

diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py
index 213efcb..470987b 100644
--- a/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@ -18,10 +18,10 @@ BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = True
-BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_LIB = 'avformat-55 avcodec-55 avdevice-55 avutil-52 swscale-2'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 WITH_BF_JACK = False
 BF_JACK = LIBDIR + '/jack'




More information about the Bf-blender-cvs mailing list