Mercurial > mplayer.hg
changeset 18973:32c9c35dc083
Sync with latest FFmpeg build system changes, now parsers can be
enabled/disabled individually.
| author | diego |
|---|---|
| date | Sun, 09 Jul 2006 15:38:05 +0000 |
| parents | e22929c3e1e3 |
| children | e9702c5cb0b6 |
| files | configure |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Jul 09 14:34:43 2006 +0000 +++ b/configure Sun Jul 09 15:38:05 2006 +0000 @@ -295,7 +295,9 @@ --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 + --enable-codec=CODEC enable specified codec + --disable-parser=PARSER disable specified parser + --enable-parser=PARSER enable specified parser Video output: --disable-vidix-internal disable internal VIDIX [for x86 *nix] @@ -1553,6 +1555,7 @@ _amr_nb_fixed=auto _amr_wb=auto _libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` +_libavparsers=`grep 'av_register_codec_parser(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` _libavcodec_so=auto _libavformat=auto _libavformat_so=auto @@ -1912,6 +1915,8 @@ --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-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-libavformat) _libavformat=yes;; --disable-libavformat) _libavformat=no ;; --enable-libavformat_so) _libavformat_so=yes ;; @@ -7591,6 +7596,7 @@ AMR_NB_FIXED=$_amr_nb_fixed AMR_WB=$_amr_wb `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` +`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` CONFIG_FAAC=$_faac CONFIG_XVID=$_lavc_xvid CONFIG_X264=$_x264