h264: Remove unused variables.

[ffmpeg] / configure

diff --git a/configure b/configure
index ace351623c2721a0c0da2bd81a9c0f51b8e066be..891b06c43370ffadcaff3b78029c0fd1ebb84c15 100755 (executable)
--- a/configure
+++ b/configure
@@ -964,6 +964,7 @@ ARCH_LIST='
     sh4
     sparc
     sparc64
+    tomi
     x86
     x86_32
     x86_64
@@ -1393,6 +1394,7 @@ avformat_deps="avcodec"
 # programs
 ffmpeg_deps="avcodec avformat swscale"
 ffplay_deps="avcodec avformat swscale sdl"
+ffplay_select="rdft"
 ffserver_deps="avformat ffm_muxer rtp_protocol rtsp_demuxer"
 ffserver_extralibs='$ldl'
 
@@ -1426,12 +1428,12 @@ yasmexe="yasm"
 nm_opts='-g'
 
 # machine
-arch=$(uname -m)
+arch_default=$(uname -m)
 cpu="generic"
 
 # OS
-target_os=$(tolower $(uname -s))
-host_os=$target_os
+target_os_default=$(tolower $(uname -s))
+host_os=$target_os_default
 
 # configurable options
 enable avcodec
@@ -1605,6 +1607,13 @@ set >> $logfile
 
 test -n "$cross_prefix" && enable cross_compile
 
+if enabled cross_compile; then
+    test -n "$arch" && test -n "$target_os" ||
+        die "Must specify target arch and OS when cross-compiling"
+fi
+
+set_default arch target_os
+
 ar="${cross_prefix}${ar}"
 cc_default="${cross_prefix}${cc_default}"
 nm_default="${cross_prefix}${nm_default}"