Mercurial > mplayer.hg
changeset 19011:015bc8ec48d5
Split _libavcodecs variable into _libavdecoders and _libavencoders.
| author | diego |
|---|---|
| date | Tue, 11 Jul 2006 14:47:07 +0000 |
| parents | 5d3cf56dad0c |
| children | 218889a99c23 |
| files | configure |
| diffstat | 1 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Jul 11 14:45:34 2006 +0000 +++ b/configure Tue Jul 11 14:47:07 2006 +0000 @@ -295,8 +295,10 @@ --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 FFmpeg codec - --enable-codec=CODEC enable specified FFmpeg codec + --disable-decoder=DECODER disable specified FFmpeg decoder + --enable-decoder=DECODER enable specified FFmpeg decoder + --disable-encoder=ENCODER disable specified FFmpeg encoder + --enable-encoder=ENCODER enable specified FFmpeg encoder --disable-parser=PARSER disable specified FFmpeg parser --enable-parser=PARSER enable specified FFmpeg parser --disable-demuxer=DEMUXER disable specified FFmpeg demuxer @@ -1559,7 +1561,8 @@ _amr_nb=auto _amr_nb_fixed=auto _amr_wb=auto -_libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` +_libavdecoders=`grep 'register_avcodec(&[a-z]_decoder)' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` +_libavencoders=`grep 'register_avcodec(&[a-z]_encoder)' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` _libavparsers=`grep 'av_register_codec_parser(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` _libavdemuxers=`grep 'av_register_input_format(&[a-z]' libavformat/allformats.c | sed 's/.*&\(.*\)).*/\1/'` _libavmuxers=`grep 'av_register_output_format(&[a-z]' libavformat/allformats.c | sed 's/.*&\(.*\)).*/\1/'` @@ -1923,8 +1926,10 @@ --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-decoder=*) _libavdecoders="$_libavdecoders `echo $ac_option | cut -d '=' -f 2`" ;; + --disable-decoder=*) _libavdecoders=`echo $_libavdecoders | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;; + --enable-encoder=*) _libavencoders="$_libavencoders `echo $ac_option | cut -d '=' -f 2`" ;; + --disable-encoder=*) _libavencoders=`echo $_libavencoders | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;; --enable-parser=*) _libavparsers="$_libavparsers `echo $ac_option | cut -d '=' -f 2`" ;; --disable-parser=*) _libavparsers=`echo $_libavparsers | sed "s/\`echo $ac_option | cut -d '=' -f 2\`//g"` ;; --enable-demuxer=*) _libavdemuxers="$_libavdemuxers `echo $ac_option | cut -d '=' -f 2`" ;; @@ -6711,7 +6716,7 @@ _def_encoders='#define CONFIG_ENCODERS 1' _def_muxers='#define CONFIG_MUXERS 1' else - _libavcodecs="`echo $_libavcodecs | sed 's/[-_a-zA-Z0-9]*encoder//g'`" + _libavencoders="" _libavmuxers="" fi echores "$_mencoder" @@ -7638,7 +7643,8 @@ AMR_NB=$_amr_nb AMR_NB_FIXED=$_amr_nb_fixed AMR_WB=$_amr_wb -`echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` +`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` +`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` @@ -8015,8 +8021,9 @@ $_def_amr_nb_fixed $_def_amr_wb -/* Use specific codecs from libavcodec */ -`echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` +/* Use specific parts from FFmpeg. */ +`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` +`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'`