FFmpeg library update:

- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.

1 files changed, 3 insertions, 23 deletions

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index b83a65f2466..415f95a516f 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -108,31 +108,11 @@ else:
 
         sys.exit(0)
     else:
-        bitness = '32'
-        # Switch to new FFmpeg library
         if builder.find('win') != -1:
-            if builder.find('win32') != -1:
-                LCGDIR = '#../lib/windows'
-            elif builder.find('win64') != -1:
-                LCGDIR = '#../lib/win64'
-                bitness = '64'
-
-            all_ffmpeg_libs = ['avcodec-53',
-                               'avdevice-53',
-                               'avformat-53',
-                               'avutil-51',
-                               'swscale-2']
-
-            ffmpeg_lib = []
-            ffmpeg_dll = []
+            bitness = '32'
 
-            for lib in all_ffmpeg_libs:
-                ffmpeg_lib.append(lib + '.lib')
-                ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll')
-
-            scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
-            scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
-            scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
+            if builder.find('win64') != -1:
+                bitness = '64'
 
             scons_options.append('BF_BITNESS=' + bitness)