forked from bartvdbraak/blender
=== FFMPEG on Win32 ===
* rebuilt ffmpeg libraries. h264 now actually works.
This commit is contained in:
parent
170a0cbeb4
commit
3c5820e69b
13
SConstruct
13
SConstruct
@ -594,18 +594,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
|
||||
if env['WITH_BF_FFMPEG']:
|
||||
dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/avformat-51.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/avutil-49.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libdts.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libfaac.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libfaad.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libgsm.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libogg-0.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libvorbis-0.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libvorbisenc-2.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/libx264-54.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/postproc-51.dll',
|
||||
'${LCGDIR}/ffmpeg/lib/xvidcore.dll']
|
||||
'${LCGDIR}/ffmpeg/lib/avutil-49.dll']
|
||||
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
|
||||
allinstall += windlls
|
||||
|
||||
|
@ -9,7 +9,7 @@ WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
|
||||
BF_FFMPEG = LIBDIR +'/ffmpeg'
|
||||
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
|
||||
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
|
||||
BF_FFMPEG_LIB = 'avformat-51.lib avcodec-51.lib avutil-49.lib postproc-51.lib'
|
||||
BF_FFMPEG_LIB = 'avformat-51.lib avcodec-51.lib avutil-49.lib'
|
||||
|
||||
BF_PYTHON = LIBDIR + '/python'
|
||||
BF_PYTHON_VERSION = '2.5'
|
||||
|
Loading…
Reference in New Issue
Block a user