diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
| commit | 813c609ea30c3201eec34d4bba185566ad48c998 (patch) | |
| tree | f93ff7fd2604bf9396d5f1712d3eaa2f6d044178 /doc/man | |
| parent | e728b8f587ee41ff483e46fe50a4cb538c5df9e2 (diff) | |
| parent | a1508e2f58d2c4b32d032d798f6f137262717e7f (diff) | |
| download | xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.gz xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.bz2 | |
Merge from 1.2 tip.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.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 |