Commit 54118497 authored by Ramiro Polla's avatar Ramiro Polla Committed by Diego Biurrun

Simplify GPl check.

patch by Ramiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7793 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5d55e966
...@@ -1248,37 +1248,19 @@ fi ...@@ -1248,37 +1248,19 @@ fi
if disabled gpl ; then if disabled gpl ; then
if enabled pp; then die_gpl_disabled(){
die "The Postprocessing code is under GPL and --enable-gpl is not specified." name=$1
fi shift
enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
if enabled_any liba52 liba52bin ; then }
die "liba52 is under GPL and --enable-gpl is not specified." die_gpl_disabled "The Postprocessing code" pp
fi die_gpl_disabled "liba52" liba52 liba52bin
die_gpl_disabled "libxvidcore" xvid
if enabled xvid; then die_gpl_disabled "x264" x264
die "libxvidcore is under GPL and --enable-gpl is not specified." die_gpl_disabled "libdts" libdts
fi die_gpl_disabled "FAAD2" libfaad2
die_gpl_disabled "The X11 grabber" x11grab
if enabled x264; then die_gpl_disabled "The software scaler" swscaler
die "x264 is under GPL and --enable-gpl is not specified."
fi
if enabled libdts; then
die "libdts is under GPL and --enable-gpl is not specified."
fi
if enabled libfaad2; then
die "FAAD2 is under GPL and --enable-gpl is not specified."
fi
if enabled x11grab; then
die "The X11 grabber is under GPL and --enable-gpl is not specified."
fi
if enabled swscaler; then
die "The software scaler is under GPL and --enable-gpl is not specified."
fi
fi fi
# compute MMX state # compute MMX state
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment