[MPlayer-cvslog] CVS: main configure,1.984,1.985

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv20364

Modified Files:
	configure 
Log Message:
per (libav)codec enable/disable fix


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- configure	29 Apr 2005 17:18:12 -0000	1.984
+++ configure	3 May 2005 11:16:35 -0000	1.985
@@ -230,6 +230,8 @@
   --disable-amr_nb       disable amr narrowband, floating point [autodetect]
   --disable-amr_nb-fixed disable amr narrowband, fixed point [autodetect]
   --disable-amr_wb       disable amr wideband, floating point [autodetect]
+  --disable-codec=CODEC  disable specified codec
+  --enable-codec=CODEC   dnable specified codec
   
 Video output:
   --disable-vidix        disable VIDIX [enable on x86 *nix]
@@ -1282,6 +1284,7 @@
 _amr_nb=auto
 _amr_nb_fixed=auto
 _amr_wb=auto
+_libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c  | sed 's/.*&\(.*\)).*/\1/'`
 _libavcodecso=auto 
 _libavformat=auto
 _fame=auto
@@ -1607,6 +1610,8 @@
   --disable-amr_nb-fixed)	_amr_nb_fixed=no ;;
   --enable-amr_wb)	_amr_wb=yes	;;
   --disable-amr_wb)	_amr_wb=no	;;
+  --enable-codec=*)	_libavcodecs="$_libavcodecs `echo $ac_option | cut -d '=' -f 2`" ;;
+  --disable-codec=*)	_libavcodecs="$(echo $_libavcodecs | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g")" ;;
   --enable-libavformat)	_libavformat=yes;;
   --disable-libavformat)	_libavformat=no	;;
   --enable-libfame)	_fame=yes	;;
@@ -6894,6 +6899,7 @@
 AMR_NB=$_amr_nb
 AMR_NB_FIXED=$_amr_nb_fixed
 AMR_WB=$_amr_wb
+`echo $_libavcodecs | awk '{$0=toupper($0)}1' | sed 's/ \?\([-_a-zA-Z0-9]*\)/CONFIG_\1=yes\n/g'`
 
 # --- Some stuff for autoconfigure ----
 $_target_arch
@@ -7222,6 +7228,9 @@
 $_def_amr_nb_fixed
 $_def_amr_wb
 
+/* Use specific codecs from libavcodec */
+`echo $_libavcodecs | awk '{$0=toupper($0)}1' | sed 's/ \?\([-_a-zA-Z0-9]*\)/#define CONFIG_\1 1\n/g'`
+
 /* Use codec libs included in mplayer CVS / source dist: */
 $_def_mp3lib
 $_def_liba52