diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-17 19:30:55 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-17 19:30:55 +0000 |
| commit | 73483024d68a2c71bd29ce823a66ae7841c37b44 (patch) | |
| tree | d31372b58ed4716712bfebd7ce28e9aaf50091c1 | |
| parent | 584a3ac9078f3facb956420dd59348bfae11c63f (diff) | |
| download | ffmpeg-73483024d68a2c71bd29ce823a66ae7841c37b44.tar.gz | |
Remove --disable-bktr option from configure
--disable-demuxer=bktr should be used instead
Originally committed as revision 10522 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -120,7 +120,6 @@ show_help(){ echo " --disable-armv6 disable armv6 usage" echo " --disable-iwmmxt disable iwmmxt usage" echo " --disable-altivec disable AltiVec usage" - echo " --disable-bktr disable bktr video grabbing [default=no]" echo " --disable-network disable network support [default=no]" echo " --disable-ipv6 disable ipv6 support [default=no]" echo " --disable-zlib disable zlib [default=no]" @@ -585,7 +584,6 @@ CONFIG_LIST=" $COMPONENT_LIST avisynth beos_netserver - bktr ffmpeg ffplay ffserver @@ -772,7 +770,7 @@ libxvid_encoder_deps="libxvid" ac3_demuxer_deps="ac3_parser" audio_beos_demuxer_deps="audio_beos" audio_beos_muxer_deps="audio_beos" -bktr_demuxer_deps="bktr" +bktr_demuxer_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" dv1394_demuxer_deps="dv1394" libdc1394_demuxer_deps="libdc1394" libnut_demuxer_deps="libnut" @@ -844,9 +842,6 @@ cpu="generic" # OS targetos=$(tolower $(uname -s)) -# non-library system interfaces -bktr="yes" - # libraries zlib="yes" @@ -1694,16 +1689,13 @@ check_header linux/videodev.h check_header linux/videodev2.h # check for ioctl_meteor.h, ioctl_bt848.h and alternatives -if enabled bktr; then { check_header dev/bktr/ioctl_meteor.h && check_header dev/bktr/ioctl_bt848.h; } || { check_header machine/ioctl_meteor.h && check_header machine/ioctl_bt848.h; } || { check_header dev/video/meteor/ioctl_meteor.h && check_header dev/video/bktr/ioctl_bt848.h; } || - check_header dev/ic/bt8xx.h || - disable bktr -fi + check_header dev/ic/bt8xx.h check_header sys/soundcard.h check_header soundcard.h |