[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39719] branches/soc-2011-tomato/ build_files/scons/config: Revert back to FFmpeg from lib/<platform>/ffmpeg

[Sergey Sharybin]

Revision: 39719
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39719
Author:   nazgul
Date:     2011-08-26 20:50:53 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Revert back to FFmpeg from lib/<platform>/ffmpeg

Modified Paths:
--------------
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-08-26 20:14:29 UTC (rev 39718)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-08-26 20:50:53 UTC (rev 39719)
@@ -98,7 +98,7 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
 BF_FFMPEG_INC = "${BF_FFMPEG}/include"
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'

Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2011-08-26 20:14:29 UTC (rev 39718)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py	2011-08-26 20:50:53 UTC (rev 39719)
@@ -3,7 +3,7 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
+BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'

Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2011-08-26 20:14:29 UTC (rev 39718)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py	2011-08-26 20:50:53 UTC (rev 39719)
@@ -3,7 +3,7 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
+BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'