From cc948f13c0524db97bc7a4f089c52cc4ebe4e42e Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 14 Feb 2010 18:52:27 +0000
Subject: == FFMPEG ==

Made using system's ffmpeg the default now. (First step in removing
ffmpeg from extern)
---
 config/linux2-config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config')

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'
 
-- 
cgit v1.2.3