summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-03-17 10:37:38 -0700
committerEric Sandall2008-03-17 10:37:38 -0700
commit60d4363d170b425714eccc87ae6f9c6a39a6671c (patch)
treedc6ebcd987fd24d1a37d5f9793f5f659efff2a32
parent1c5936c7461d9edd0e648b4112db508d117d70f8 (diff)
ffmpeg-svn: configure options changed, bug 14364
(cherry-picked from commit 593210ce88dc6707bc507b5d82cba9752b4b363b)
-rwxr-xr-xvideo/ffmpeg-svn/BUILD2
-rwxr-xr-xvideo/ffmpeg-svn/CONFIGURE4
-rw-r--r--video/ffmpeg-svn/HISTORY5
3 files changed, 9 insertions, 2 deletions
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index fa8037fb8d..2417772e43 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -14,7 +14,7 @@ OPTS="$FFMPEG_SWSCALE $OPTS" &&
--enable-pthreads \
--disable-static \
--disable-debug \
- --enable-pp \
+ --enable-postproc \
--enable-gpl \
$OPTS &&
#sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
diff --git a/video/ffmpeg-svn/CONFIGURE b/video/ffmpeg-svn/CONFIGURE
index 98c253dc16..c0c144ff45 100755
--- a/video/ffmpeg-svn/CONFIGURE
+++ b/video/ffmpeg-svn/CONFIGURE
@@ -1,3 +1,5 @@
default_configure &&
+# this option name changed, 20080313
+FFMPEG_SWSCALE=${FFMPEG_SWSCALE/swscaler/swscale} &&
config_query_option FFMPEG_SWSCALE 'enable software scaler support?' y \
- '--enable-swscaler' '--disable-swscaler'
+ '--enable-swscale' '--disable-swscale'
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 86e801ff42..698a054080 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2008-03-13 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * BUILD: --enable-pp --> --enable-postproc
+ * CONFIGURE: --{en,dis}able-swscaler --> --{en,dis}able-swscale,
+ bug #14364
+
2008-02-27 Arwed v. Merkatz <v.merkatz@gmx.net>
* BUILD: fixed location for installed headers back to
/usr/include/ffmpeg