[SCM] libav/experimental: clean up amr option handling

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 12b61a74ada9ca231d5a4c5b8f578f8c5a496d4b
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Feb 11 19:36:04 2007 +0000

    clean up amr option handling
    
    Originally committed as revision 7940 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 3d51e1a..c84d867 100755
--- a/configure
+++ b/configure
@@ -1104,13 +1104,13 @@ for opt do
   ;;
   --enable-small) optimize="small"
   ;;
-  --enable-amr_nb) amr="yes"; amr_nb="yes"; amr_nb_fixed="no"
+  --enable-amr_nb) amr_nb="yes"
   ;;
-  --enable-amr_nb-fixed) amr="yes"; amr_nb_fixed="yes"; amr_nb="no"
+  --enable-amr_nb-fixed) amr_nb_fixed="yes"
   ;;
-  --enable-amr_wb) amr="yes"; amr_wb="yes"
+  --enable-amr_wb) amr_wb="yes"
   ;;
-  --enable-amr_if2) amr="yes"; amr_if2="yes"
+  --enable-amr_if2) amr_if2="yes"
   ;;
   --enable-sunmlib) mlib="yes"
   ;;
@@ -1560,6 +1560,10 @@ for thread in pthreads beosthreads os2threads w32threads; do
     fi
 done
 
+enabled_any amr_nb amr_nb_fixed amr_wb amr_if2 && enable amr
+enabled_all amr_nb amr_nb_fixed &&
+    die "Only one of amr_nb and amr_nb_fixed may be enabled."
+
 # these are off by default, so fail if requested and not available
 enabled libdts     && require libdts dts.h dts_init -ldts -lm
 enabled libgsm     && require libgsm gsm.h gsm_create -lgsm

-- 
Libav/FFmpeg packaging