Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2011-05-28 03:33:40 +0400
committerPeter Schlaile <peter@schlaile.de>2011-05-28 03:33:40 +0400
commit42121590f4bfd65f26e8ec705a660f4cc1bd826e (patch)
treed57d4cf5b303c81ecdd43b89d503b481d48a2be8 /intern/audaspace/SConscript
parenta9467182fb00be9fb6dd276e80b69fb650b2cac3 (diff)
== FFMPEG ==
Added central compatibility header file, which enables blender to compile against very old ffmpeg versions as well as very new versions using the *NEW* API. (Old API functions are simulated using macros and inline functions) Added a whole lot of additional checks, tested against 6 different versions down the timeline, hopefully, now finally all is well.
Diffstat (limited to 'intern/audaspace/SConscript')
-rw-r--r--intern/audaspace/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index ecc94987185..67f859b0e5f 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -8,7 +8,7 @@ defs = []
if env['WITH_BF_FFMPEG']:
sources += env.Glob('ffmpeg/*.cpp')
- incs += ' ffmpeg ' + env['BF_FFMPEG_INC']
+ incs += ' ffmpeg #/intern/ffmpeg ' + env['BF_FFMPEG_INC']
defs.append('WITH_FFMPEG')
if env['WITH_BF_SDL']: