diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-17 22:53:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-17 22:53:35 +0000 |
| commit | 255f131648030618f753c27139d4b278f11020c7 (patch) | |
| tree | b28a41924089d059424f06bd06ff73cf10838b5e /doc | |
| parent | 5e1efcee823576470ffa3ae2f57ba5c6020e436b (diff) | |
| parent | 4b30fc7d0ad482d4449703e9270df933cdd755ee (diff) | |
| download | xine-lib-255f131648030618f753c27139d4b278f11020c7.tar.gz xine-lib-255f131648030618f753c27139d4b278f11020c7.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/faq/faq.docbook | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/faq/faq.docbook b/doc/faq/faq.docbook index 57da1c5bd..8d09441e1 100644 --- a/doc/faq/faq.docbook +++ b/doc/faq/faq.docbook @@ -8,7 +8,7 @@ <title>The xine engine FAQ</title> <titleabbrev>xine FAQ</titleabbrev> <copyright> - <year>2001-2007</year> + <year>2001-2008</year> <holder>the xine project team</holder> </copyright> </bookinfo> @@ -948,7 +948,7 @@ Latest xine-lib modules (1-beta3 or newer) support external subtitles for any media file, not only AVI. In order to use it you can pass a special MRL construction like: - <screen> <command>xine test.mpg#subtitle:file.sub</command></screen> + <screen> <command>xine file://path/to/test.mpg#subtitle:/path/to/file.sub</command></screen> The external subtitles support can also be used by any xine frontend. Currently xine-ui and kaffeine implement this feature with a subtitle selection dialog. |