diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-10-05 21:31:33 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-10-05 21:31:33 +0400 |
| commit | 34399546b71fc10a2e5ca9e808ba589ee8e8f394 (patch) | |
| tree | 9a515133a10c68295c3dd65203c82aecd894bade /tools | |
| parent | e99ff615d78132bf206ab7fbf572d3d63f345a75 (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 'tools')
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 47bc5e9fa72..330a3713817 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -176,6 +176,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) + if lenv['WITH_BF_OGG']: + syslibs += Split(lenv['BF_OGG_LIB']) if lenv['WITH_BF_SDL']: syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: diff --git a/tools/btools.py b/tools/btools.py index 58b667b486f..4c5e0dd3527 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -35,6 +35,7 @@ def validate_arguments(args, bc): 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', 'WITH_BF_DDS', 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', + 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'BF_TIFF', 'BF_TIFF_INC', @@ -194,6 +195,10 @@ def read_opts(cfg, args): ('BF_FFMPEG_INC', 'FFMPEG includes', ''), ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''), + (BoolOption('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true', + 'false')), + ('BF_OGG', 'OGG base path', ''), + ('BF_OGG_LIB', 'OGG library', ''), (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')), ('BF_JPEG', 'JPEG base path', ''), |