diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-12-17 23:52:39 +0300 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-12-17 23:52:39 +0300 |
| commit | 04ef5be177b35c12378c85ef99b2e83aa7f27bd3 (patch) | |
| tree | e456d24c6226ce9de1c6b4965ab2a822fc40e34b /config/darwin-config.py | |
| parent | 3c886d7c384289206b02b1581ddc9366d607bd3f (diff) | |
FFmpeg upgrade to revision 12758 (avformat version 52.13): support libavdevice for video capture in VideoTexture module (BGE). Makefile, CMake, scons updated. FFmpeg binaries will have to be rebuilt for certain OS (irix), win32 binaries already up to date. You MUST do a clean rebuild after this patch. Scons users: pay attention that the config/<os>-config.py files have changed, adapt your user-config.py in consequence
Diffstat (limited to 'config/darwin-config.py')
| -rw-r--r-- | config/darwin-config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 3ef7b7132d9..cfd6a9395bb 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -40,7 +40,11 @@ else: # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = "#extern/ffmpeg" -BF_FFMPEG_INC = '${BF_FFMPEG}/include' +# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements +# To keep Blender compatible with older versions, I add ${BF_FFMPEG} to the inc dir so that ffmpeg +# finds the files directly in extern/ffmpeg/libav... while blender finds them in +# extern/ffmpeg/include. +BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}' if USE_SDK==True: BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' |