summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 15:38:05 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 15:38:05 +0000
commitf9c232d63e08a6948671328ae314a3eb61b8a8aa (patch)
tree1f6665894d467cf69ae5f9fa2c9f94f55d850e54 /configure
parent75babce2b1bd5d78f90207b330a8dce852e92b04 (diff)
downloadmpv-f9c232d63e08a6948671328ae314a3eb61b8a8aa.tar.bz2
mpv-f9c232d63e08a6948671328ae314a3eb61b8a8aa.tar.xz
Sync with latest FFmpeg build system changes, now parsers can be
enabled/disabled individually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18978 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 17fdea743d..ce977964f0 100755
--- a/configure
+++ b/configure
@@ -295,7 +295,9 @@ Codecs:
--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=auto
_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 @@ for ac_option do
--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=$_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 $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
CONFIG_FAAC=$_faac
CONFIG_XVID=$_lavc_xvid
CONFIG_X264=$_x264