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
path: root/config
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-10-05 21:31:33 +0400
committerPeter Schlaile <peter@schlaile.de>2008-10-05 21:31:33 +0400
commit34399546b71fc10a2e5ca9e808ba589ee8e8f394 (patch)
tree9a515133a10c68295c3dd65203c82aecd894bade /config
parente99ff615d78132bf206ab7fbf572d3d63f345a75 (diff)
== FFMPEG ==
Added optional OGG / theora / vorbis support. (OGG-format encoding is currently disabled, since the bundled ffmpeg version is broken here) Fixed a bug with PTS-encoding, to make theora work. You have to explicitly enable it and currently only scons is supported. Otherwise: enjoy! :)
Diffstat (limited to 'config')
-rw-r--r--config/linux2-config.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py
index cd7e6659af1..2b7bf074f83 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -143,21 +143,21 @@ BF_FFMPEG_LIB = ''
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false' # -DWITH_OGG
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
WITH_BF_OPENJPEG = 'true'
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = 'false'
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_REDCODE_INC = '${BF_REDCODE}/include'
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'