[Ffmpeg-cvslog] CVS: ffmpeg configure,1.265,1.266

[Diego Biurrun]

On Thu, Apr 27, 2006 at 04:38:43AM +0200, Diego Biurrun CVS wrote:
> 
> Modified Files:
> 	configure 
> Log Message:
> amr_nb should disable amr_nb-fixed and vice versa.
> 
> --- configure	27 Apr 2006 02:33:26 -0000	1.265
> +++ configure	27 Apr 2006 02:38:41 -0000	1.266
> @@ -591,9 +591,9 @@
> -  --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"

I could also have added a check that makes the script fail and warn the
user if both options are found on the command line but given that we
already have some implicit disabling for other options I figured this
was good enough.

Diego