diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-29 14:59:25 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-29 14:59:25 +0000 |
commit | fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7 (patch) | |
tree | 71c6249433ccb247678affe99d44137a6ec204e8 /doc/man | |
parent | 4a2a24dc98003e59ea9d7da982fefc81a82890d2 (diff) | |
parent | 2e5c9c79a47efe0df60aaea17569ea9f32d347a6 (diff) | |
download | xine-lib-fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7.tar.gz xine-lib-fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7.tar.bz2 |
Merge from 1.1.
--HG--
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
Diffstat (limited to 'doc/man')
-rw-r--r-- | doc/man/en/xine.5 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 297aff48e..2c267f5d3 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -264,7 +264,12 @@ Text subtitle files may be appended to the MRL:. .TP .BI <mrl>#subtitle:<subtitlefile> This is the normal way to define the subtitle file to use. The frontend will -not take any notice of the subtitle file. +not take any notice of the subtitle file. For example: +.br +.I file://home/user/wibble.mpg#subtitles:/home/user/wibble.sub +.br +(Note that some front ends can detect subtitles files where the name differs +as shown in the example.) .br .SH STREAM OPTIONS .br |