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>2010-02-14 21:52:27 +0300
committerPeter Schlaile <peter@schlaile.de>2010-02-14 21:52:27 +0300
commitcc948f13c0524db97bc7a4f089c52cc4ebe4e42e (patch)
tree7ba4c9eeda21da2f1f3453d8f6a6266d36c42147 /config
parent190d84a08b6d6d5617f89576da17638406d09fdd (diff)
== FFMPEG ==
Made using system's ffmpeg the default now. (First step in removing ffmpeg from extern)
Diffstat (limited to 'config')
-rw-r--r--config/linux2-config.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 532e71a3fe1..ef5ff0d2b4d 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -110,11 +110,11 @@ WITH_BF_BINRELOC = True
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = '#extern/ffmpeg'
-BF_FFMPEG_LIB = ''
+# BF_FFMPEG = '#extern/ffmpeg'
+# BF_FFMPEG_LIB = ''
# Uncomment the following two lines to use system's ffmpeg
-# BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG = '/usr'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'