From 58756f9cb4c8f68fb6ccb0314da33a5462393380 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Mar 2008 14:02:56 +0100 Subject: Document DVB controls and the stream "save:" option. --- doc/man/en/xine.5 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 13e5d0597..895e3068a 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -256,6 +256,23 @@ audio program ID .TP 20 .B service-id service ID (needed for now/next information etc.) +.PP +The following keyboard & mouse inputs may be accepted: +.TP 24 +.B Menu 2 +Start/stop recording +.TP 24 +.B Menu 3 +Toggle zoom +.TP 24 +.B Menu 7 +Toggle now/next display +.TP 24 +.B Previous/Next Chapter +Previous/next channel +.TP 24 +.B Mouse wheel & button 1 +Scroll through channel list & select the highlighted channel .SH SUBTITLE .B external subtitle files (any mrl) .br @@ -295,6 +312,10 @@ Set audio dynamic range compression. .BI : Assign a new value to any config entry. .TP +.BI save: +Save the stream (if allowed) to the named file, relative to the directory +given by the option "media.capture.save_dir". +.TP .B change configuration option 'on the fly': .br You can change a configuration option at any time, using the special -- cgit v1.2.3 From 09af51d0f72fdf51ad170c02a3841aed00460453 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Mar 2008 15:06:16 +0100 Subject: Release. --- ChangeLog | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f01743732..d756df256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.11.1) 2008-??-?? +xine-lib (1.1.11.1) 2008-03-30 * Security fixes: - Integer overflows in FLV, Qt, Real, WC3Movie, Matroska and FILM demuxers, allowing remote attackers to trigger heap overflows and diff --git a/configure.ac b/configure.ac index 15420b823..d4a817025 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ XINE_MAJOR=1 XINE_MINOR=1 XINE_SUB=11 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar -XINE_PATCH= +XINE_PATCH=.1 dnl if test $XINE_SUB -eq 0 ; then dnl XINE_SUBPART=""; -- cgit v1.2.3 From fd0b0e22f7ae5dbd8f0387f75c93de2025363b7d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Mar 2008 15:15:22 +0100 Subject: Added tag xine-lib-1_1_11_1-release for changeset 2a2cc543b27b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8e215ddd6..c49fa0205 100644 --- a/.hgtags +++ b/.hgtags @@ -67,3 +67,4 @@ b6be674453e922114b55d4613cb197c77d19f094 xine-lib-1_1_9-release 7f1232425c6d715c404e6df1292075b33ecb8305 xine-lib-1_1_10-release 0e9e4df266f639ac7ba9e0c204f205686b56d5f9 xine-lib-1_1_10_1-release 10a6bc10e58f45f6cb79f634bdb6b7daa3167742 xine-lib-1_1_11-release +2a2cc543b27b64a6587dfaef4f1d986eb2f2710a xine-lib-1_1_11_1-release -- cgit v1.2.3 From c14d425e89e9fdf5e97e79efd40f6e551e43e11a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Mar 2008 15:15:32 +0100 Subject: Added signature for changeset 92dad3eca733ff0daecd6b1a539f8b077ea071cb --- .hgsigs | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgsigs b/.hgsigs index 92f6ce36d..b6c252df8 100644 --- a/.hgsigs +++ b/.hgsigs @@ -4,3 +4,4 @@ b591d00fcd386cdd3779378c34b2d42b7504afc4 0 iD8DBQBHh5UfsBKtjPGfWZ8RAgvMAJ9xwnDNifmaobFYe2nR7+rJlLTkEQCgguGMqwqRZY68HWQXhEx918hp4Yg= ae1e23df14223cdacf83df75b28b223895d658c2 0 iD8DBQBHm6SjsBKtjPGfWZ8RAi8HAKDAHmmLu8rwN5XJJPhfEofE7BTpsgCfTyNzku+v/PhqXgl4kQnRiB6nUSE= d912bda42df43a6ec24a4d479e202c327a733a42 0 iD8DBQBH4R2HsBKtjPGfWZ8RAr/IAJ46ypOhqO0EiSDrZYhumvpFYtrPQwCbBz/SXSDNuJNaKlR70Ep+THmhFIk= +92dad3eca733ff0daecd6b1a539f8b077ea071cb 0 iD8DBQBH76CDsBKtjPGfWZ8RAnQUAJ9ARudZye68h9JIKe10wIsWm6OQEwCgvjS+c6o48SjNrb5l7i8KisKG89o= -- cgit v1.2.3