summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-03-24 19:32:56 +0100
committerJaka Kranjc2009-03-24 21:50:45 +0100
commit6e41f32de0396bfe165b09a582068125ff699448 (patch)
treed271692c73a00ed6c17bcfd185e03d83dba56829
parent7a4ca2679905db0c49fe96b3b28947f9b66b1ee7 (diff)
ffmpeg-svn: removed swscale configure option, bug 15129
(cherry picked from commit d11acc202caed178c71a42da88af52096ab9c8f6)
-rwxr-xr-xvideo/ffmpeg-svn/BUILD2
-rwxr-xr-xvideo/ffmpeg-svn/CONFIGURE5
-rw-r--r--video/ffmpeg-svn/HISTORY4
3 files changed, 4 insertions, 7 deletions
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index edf217c17e..f867c413cb 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -4,8 +4,6 @@ disable_pic &&
# OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
#fi &&
-OPTS="$FFMPEG_SWSCALE $OPTS" &&
-
./configure --prefix=${INSTALL_ROOT}/usr \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-shared \
diff --git a/video/ffmpeg-svn/CONFIGURE b/video/ffmpeg-svn/CONFIGURE
deleted file mode 100755
index c0c144ff45..0000000000
--- a/video/ffmpeg-svn/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-default_configure &&
-# this option name changed, 20080313
-FFMPEG_SWSCALE=${FFMPEG_SWSCALE/swscaler/swscale} &&
-config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
- '--enable-swscale' '--disable-swscale'
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index bbd762c23d..375d47945e 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2009-03-24 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: removed FFMPEG_SWSCALE opts, always built now, bug #15129
+ * CONFIGURE: removed
+
2008-10-07 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: liba52 wrapper removed upstream