diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-05-07 02:13:38 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-05-07 02:13:38 +0400 |
| commit | 3c5820e69b7717814fdd2a8f9458d5cb86f543a4 (patch) | |
| tree | 9a85d6d9551f0759e7eb0ff1a0885576398017fa | |
| parent | 170a0cbeb4d83fe1ce45e883264e9db4f5283203 (diff) | |
=== FFMPEG on Win32 ===
* rebuilt ffmpeg libraries. h264 now actually works.
| -rw-r--r-- | SConstruct | 13 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct index 3cea4b24e87..db690a2967c 100644 --- a/SConstruct +++ b/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 diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 51ad11f9ead..7e0d98c072b 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -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' |