Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/faq/faq.docbook b/doc/faq/faq.docbook
index fa414f1e9..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>&nbsp;&nbsp;&nbsp;<command>xine test.mpg#subtitle:file.sub</command></screen>
+     <screen>&nbsp;&nbsp;&nbsp;<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.
@@ -1828,7 +1828,7 @@
     </para>
     <para>
      Drivers that access hardware directly includes VIDIX (warning: requires 
-     root priviledges or kernel helper) and SyncFB (requires kernel helper - Matrox only).
+     root priviledges or kernel helper).
      User may try one of those, but should be warned that with root access
      they can cause the system to crash hard. The support is also limited to
      a couple of graphics cards only.