Skip to content
Snippets Groups Projects
Commit 11c6f4a1 authored by Luca Abeni's avatar Luca Abeni
Browse files

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
parent 0872a0a6
No related branches found
No related tags found
No related merge requests found
...@@ -1173,6 +1173,11 @@ EOF ...@@ -1173,6 +1173,11 @@ EOF
echo "The X11 grabber is under GPL and --enable-gpl is not specified." echo "The X11 grabber is under GPL and --enable-gpl is not specified."
fail="yes" fail="yes"
fi fi
if test "$swscaler" != "no"; then
echo "The software scaler is under GPL and --enable-gpl is not specified."
fail="yes"
fi
fi fi
if test "$fail" = "yes"; then if test "$fail" = "yes"; then
...@@ -1357,11 +1362,6 @@ if test $arch = "powerpc"; then ...@@ -1357,11 +1362,6 @@ if test $arch = "powerpc"; then
add_cflags "-maltivec -mabi=altivec" add_cflags "-maltivec -mabi=altivec"
fi fi
fi fi
if test "$swscaler" != "no"; then
echo "The software scaler is under GPL and --enable-gpl is not specified."
fail="yes"
fi
fi fi
check_header altivec.h check_header altivec.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment