diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2009-03-26 02:09:17 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2009-03-26 02:09:17 +0300 |
| commit | c53577a1189dd71efe6a2bdd589dab7896deb946 (patch) | |
| tree | f0d9ba4110579eee8b86b41a88b3804259fbdde2 | |
| parent | 616897d0db674275b0f8d962f220f8d722a976d5 (diff) | |
scons+msvc update for the FFMpeg recent updates
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 20d8f8fd2ec..7366149c593 100644 --- a/SConstruct +++ b/SConstruct @@ -557,14 +557,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): 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) diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 6e56af2d95e..4ffffc46167 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -9,7 +9,7 @@ WITH_BF_FFMPEG = True # -DWITH_FFMPEG 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' |