summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
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, 45 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 2fb65fedc8..d60c50837a 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -421,6 +421,26 @@ 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
@@ -1851,6 +1871,12 @@ 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 bddb74f2e8..a0b3c4832a 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -77,6 +77,7 @@ 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 09e1ef31ea..b1d1158ebb 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -314,6 +314,19 @@ 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.
@@ -446,4 +459,8 @@ 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