summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-21 08:18:51 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-21 08:18:51 +0000
commit2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa (patch)
treeeb19a1c8b1633bf9a6544a56dab02f1821b6f08d /DOCS
parent9a6313ed24efaeb22b86ddc6309ee28e3bbde0e4 (diff)
downloadmpv-2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa.tar.bz2
mpv-2f76cfc28a0466ad6dfdb7edc7affe91983d6eaa.tar.xz
Revert r23530.
r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.126
-rw-r--r--DOCS/tech/MAINTAINERS1
-rw-r--r--DOCS/tech/slave.txt19
3 files changed, 1 insertions, 45 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 29fdb4a3dd..5c45fa8e75 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -423,26 +423,6 @@ Confirm choice.
.PP
.RS
.
-(The following keys are only valid if teletext support is enabled during
-compilation: they are used for controlling TV teletext)
-.RE
-.PP
-.PD 0
-.RS
-.IPs "X"
-Switch teletext between on, off and transparent mode.
-.IPs "Q"
-Next teletext page.
-.IPs "W"
-Previous teletext page.
-.IPs "E"
-In text mode flips top or bottom piece of page otherwise
-zooms teletext page: top or bottom or normal.
-.RE
-.PD 1
-.PP
-.RS
-.
.TP
.B mouse control
.PD 0
@@ -1882,12 +1862,6 @@ MJPEG compression:
.IPs quality=<0\-100>
Choose the quality of the JPEG compression
(< 60 recommended for full size).
-.IPs tdevice=<value> (default: none)
-Specify TV teletext device (example: /dev/\:vbi0).
-.IPs tformat=<text|bw|gray|color> (default: gray)
-Specify TV teletext display mode. (Note: color mode requires color SPU support.)
-.IPs tpage=<100-999> (default: 100)
-Specify starting TV teletext page number .
.RE
.
.TP
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index a0b3c4832a..bddb74f2e8 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -77,7 +77,6 @@ MPlayer code:
* libmpdemux: Roberto Togni, Nico Sabbi
* libmpcodecs: Roberto Togni
* TV input/capture: Vladimir Voroshilov
- * TV teletext: Vladimir Voroshilov
* network streaming: Roberto Togni, Nico Sabbi, Benjamin Zores
* DVD/VOB subtitles: None
* config files & commandline parser: Alban Bedel
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index 485ec20adb..7a44426d8d 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -314,19 +314,6 @@ switch_vsync [value]
Toggle vsync (1 == on, 0 == off). If [value] is not provided,
vsync status is inverted.
-teletext_add_dec <value>
- On/off teletext page number editing mode and append given digit to
- previously entered one
- 0..9 - append apropriate digit (enables editing mode if called from normal mode, and
- switches to normal mode when third digit is entered.
- - - delete last digit from page number (backspace amulation, works only in page number
- editing mode)
-
-teletext_go_link <value>
- Follow given links on current teletext page
- 0 - go to initial page (specified by -tv tpage= parameter)
- 1..6 - follow given link
-
tv_step_channel <channel>
Select next/previous TV channel.
@@ -460,8 +447,4 @@ tv_brightness int -100 100 X X X
tv_contrast int -100 100 X X X
tv_saturation int -100 100 X X X
tv_hue int -100 100 X X X
-teletext_page int 100 999 X X X
-teletext_mode int 0 3 X X X 0 - off, 1 - opaque, 2 - transparent,
- 3 - transparent inverted (bw format)
-teletext_format int 0 3 X 0 - text, 1 - b/w, 2 - gray, 3 - color
-teletext_half_page int 0 2 X X X 0 - off, 1 - top half, 2- bottom half
+