[SCM] libav/experimental: amr_nb should disable amr_nb-fixed and vice versa.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 64eaac62ca3120124d000240f020d5d4fab51da2
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Apr 27 02:38:41 2006 +0000

    amr_nb should disable amr_nb-fixed and vice versa.
    
    Originally committed as revision 5322 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 694150a..b5129a1 100755
--- a/configure
+++ b/configure
@@ -591,9 +591,9 @@ for opt do
   ;;
   --enable-small) optimize="small"
   ;;
-  --enable-amr_nb) amr_nb="yes"
+  --enable-amr_nb) amr_nb="yes"; amr_nb_fixed="no"
   ;;
-  --enable-amr_nb-fixed) amr_nb_fixed="yes"
+  --enable-amr_nb-fixed) amr_nb_fixed="yes"; amr_nb="no"
   ;;
   --enable-amr_wb) amr_wb="yes"
   ;;

-- 
Libav/FFmpeg packaging