From 2fc9eee4317fb79d9ffc62e2a2e4b793ee96ec6c Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 3 May 2005 11:16:35 +0000 Subject: [PATCH] per (libav)codec enable/disable fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15334 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure b/configure index e28ccec2a1..d952b78cd0 100755 --- a/configure +++ b/configure @@ -230,6 +230,8 @@ Codecs: --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 @@ _libavcodec=auto _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 @@ for ac_option do --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 @@ FAAC_LIB=$_ld_faac 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 $_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