=== FFMPEG on Win32 ===

* rebuilt ffmpeg libraries. h264 now actually works.

diff --git a/SConstruct b/SConstruct
index 3cea4b24e8723bb0fbced8db5c6cc36dc157013c..db690a2967ccf210e9355ce1fa75fb551390d4ed 100644 (file)
--- 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 51ad11f9eadb278295911e2ebd73a7705b323a64..7e0d98c072ba6e9e81711da963b70becfdd0740e 100644 (file)
--- 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'