Mercurial > mplayer.hg

comparison configure @ 29809:e255f9571156

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove CONFIG_TV_TELETEXT. DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more.
author cehoyos
date Sat, 07 Nov 2009 16:40:42 +0000
parents a5e7590ffdbd
children 0cc6fcd342fd
comparison
equal deleted inserted replaced
29808:97594e5387c8 29809:e255f9571156
246 --disable-radio-bsdbt848 disable BSD BT848 radio interface [autodetect] 246 --disable-radio-bsdbt848 disable BSD BT848 radio interface [autodetect]
247 --disable-tv disable TV interface (TV/DVB grabbers) [enable] 247 --disable-tv disable TV interface (TV/DVB grabbers) [enable]
248 --disable-tv-v4l1 disable Video4Linux TV interface [autodetect] 248 --disable-tv-v4l1 disable Video4Linux TV interface [autodetect]
249 --disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect] 249 --disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect]
250 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect] 250 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect]
251 --disable-tv-teletext disable TV teletext interface [autodetect]
252 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect] 251 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect]
253 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] 252 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
254 --disable-network disable networking [enable] 253 --disable-network disable networking [enable]
255 --enable-winsock2_h enable winsock2_h [autodetect] 254 --enable-winsock2_h enable winsock2_h [autodetect]
256 --enable-smb enable Samba (SMB) input [autodetect] 255 --enable-smb enable Samba (SMB) input [autodetect]
666 _tv=yes 665 _tv=yes
667 _tv_v4l1=auto 666 _tv_v4l1=auto
668 _tv_v4l2=auto 667 _tv_v4l2=auto
669 _tv_bsdbt848=auto 668 _tv_bsdbt848=auto
670 _tv_dshow=auto 669 _tv_dshow=auto
671 _tv_teletext=auto
672 _pvr=auto 670 _pvr=auto
673 _network=yes 671 _network=yes
674 _winsock2_h=auto 672 _winsock2_h=auto
675 _smb=auto 673 _smb=auto
676 _vidix=auto 674 _vidix=auto
1090 --disable-tv-v4l1) _tv_v4l1=no ;; 1088 --disable-tv-v4l1) _tv_v4l1=no ;;
1091 --enable-tv-v4l2) _tv_v4l2=yes ;; 1089 --enable-tv-v4l2) _tv_v4l2=yes ;;
1092 --disable-tv-v4l2) _tv_v4l2=no ;; 1090 --disable-tv-v4l2) _tv_v4l2=no ;;
1093 --enable-tv-dshow) _tv_dshow=yes ;; 1091 --enable-tv-dshow) _tv_dshow=yes ;;
1094 --disable-tv-dshow) _tv_dshow=no ;; 1092 --disable-tv-dshow) _tv_dshow=no ;;
1095 --enable-tv-teletext) _tv_teletext=yes ;;
1096 --disable-tv-teletext) _tv_teletext=no ;;
1097 --enable-radio) _radio=yes ;; 1093 --enable-radio) _radio=yes ;;
1098 --enable-radio-capture) _radio_capture=yes ;; 1094 --enable-radio-capture) _radio_capture=yes ;;
1099 --disable-radio-capture) _radio_capture=no ;; 1095 --disable-radio-capture) _radio_capture=no ;;
1100 --disable-radio) _radio=no ;; 1096 --disable-radio) _radio=no ;;
1101 --enable-radio-v4l) _radio_v4l=yes ;; 1097 --enable-radio-v4l) _radio_v4l=yes ;;
7612 else 7608 else
7613 _noinputmodules="tv-v4l2 $_noinputmodules" 7609 _noinputmodules="tv-v4l2 $_noinputmodules"
7614 def_tv_v4l2='#undef CONFIG_TV_V4L2' 7610 def_tv_v4l2='#undef CONFIG_TV_V4L2'
7615 fi 7611 fi
7616 echores "$_tv_v4l2" 7612 echores "$_tv_v4l2"
7617
7618
7619 echocheck "TV teletext interface"
7620 if test "$_tv_teletext" = auto ; then
7621 _tv_teletext=no
7622 if test "$_freetype" = yes && test "$_pthreads" = yes; then
7623 if test "$_tv_v4l2" = yes || test "$_v4l" = yes || test "$_tv_dshow" = yes || test "$_dvbin" = yes; then
7624 _tv_teletext=yes
7625 fi
7626 fi
7627 fi
7628 if test "$_tv_teletext" = yes ; then
7629 def_tv_teletext='#define CONFIG_TV_TELETEXT 1'
7630 _inputmodules="tv-teletext $_inputmodules"
7631 else
7632 _noinputmodules="tv-teletext $_noinputmodules"
7633 def_tv_teletext='#undef CONFIG_TV_TELETEXT'
7634 fi
7635 echores "$_tv_teletext"
7636 7613
7637 7614
7638 echocheck "Radio interface" 7615 echocheck "Radio interface"
7639 if test "$_radio" = yes ; then 7616 if test "$_radio" = yes ; then
7640 def_radio='#define CONFIG_RADIO 1' 7617 def_radio='#define CONFIG_RADIO 1'
8350 TOOLAME=$_toolame 8327 TOOLAME=$_toolame
8351 TREMOR_INTERNAL = $_tremor_internal 8328 TREMOR_INTERNAL = $_tremor_internal
8352 TV = $_tv 8329 TV = $_tv
8353 TV_BSDBT848 = $_tv_bsdbt848 8330 TV_BSDBT848 = $_tv_bsdbt848
8354 TV_DSHOW = $_tv_dshow 8331 TV_DSHOW = $_tv_dshow
8355 TV_TELETEXT = $_tv_teletext
8356 TV_V4L = $_tv_v4l 8332 TV_V4L = $_tv_v4l
8357 TV_V4L1 = $_tv_v4l1 8333 TV_V4L1 = $_tv_v4l1
8358 TV_V4L2 = $_tv_v4l2 8334 TV_V4L2 = $_tv_v4l2
8359 TWOLAME=$_twolame 8335 TWOLAME=$_twolame
8360 UNRAR_EXEC = $_unrar_exec 8336 UNRAR_EXEC = $_unrar_exec
8747 $def_radio_v4l 8723 $def_radio_v4l
8748 $def_radio_v4l2 8724 $def_radio_v4l2
8749 $def_tv 8725 $def_tv
8750 $def_tv_bsdbt848 8726 $def_tv_bsdbt848
8751 $def_tv_dshow 8727 $def_tv_dshow
8752 $def_tv_teletext
8753 $def_tv_v4l 8728 $def_tv_v4l
8754 $def_tv_v4l1 8729 $def_tv_v4l1
8755 $def_tv_v4l2 8730 $def_tv_v4l2
8756 8731
8757 8732