Opss... My last commit was wrong; sorry!

This one moves the GPL check in the right place Originally committed as revision 7359 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago · 11c6f4a11c
parent 0872a0a6d9
commit 11c6f4a11c
1 changed files with 5 additions and 5 deletions
--- a/10
+++ b/10
@ -1173,6 +1173,11 @@ EOF
        echo "The X11 grabber is under GPL and --enable-gpl is not specified."
        fail="yes"
    fi
+
+    if test "$swscaler" != "no"; then
+        echo "The software scaler is under GPL and --enable-gpl is not specified."
+        fail="yes"
+    fi
 fi

 if test "$fail" = "yes"; then
@ -1357,11 +1362,6 @@ if test $arch = "powerpc"; then
            add_cflags "-maltivec -mabi=altivec"
        fi
    fi
-
-    if test "$swscaler" != "no"; then
-        echo "The software scaler is under GPL and --enable-gpl is not specified."
-        fail="yes"
-    fi
 fi

 check_header altivec.h