r23578: Fix license header.

r23579: Activate license notice.
r23594: added some carriage returns and full stops, plus a missing 'option'
r23608: Nico claims to never have had any problems with X11 compilation on Mandrake.
r23983: i_certify_that_my_video_stream_does_not_use_b_frames is gone.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24644 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 10 insertions, 14 deletions

diff --git a/DOCS/xml/de/documentation.xml b/DOCS/xml/de/documentation.xml
index 0a65e660ce..8c32f2b8c3 100644
--- a/DOCS/xml/de/documentation.xml
+++ b/DOCS/xml/de/documentation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- in sync with r21537 -->
+<!-- in sync with r23579 -->
 <!-- missing cosmetic commit 21537 -->
 <bookinfo id="toc">
   <title><application>MPlayer</application> - Movie Player</title>
@@ -18,24 +18,22 @@
     <year>2007</year>
     <holder>MPlayer-Team</holder>
   </copyright>
-  <!--
       <legalnotice>
         <title>License</title>
-        <para>This program is free software; you can redistribute it and/or modify
+        <para>MPlayer is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by the
           Free Software Foundation; either version 2 of the License, or (at your
           option) any later version.</para>
 
-        <para>This program is distributed in the hope that it will be useful, but
+        <para>MPlayer is distributed in the hope that it will be useful, but
           WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
           or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
           for more details.</para>
 
         <para>You should have received a copy of the GNU General Public License
-          along with this program; if not, write to the Free Software Foundation,
+          along with MPlayer; if not, write to the Free Software Foundation,
           Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para>
       </legalnotice>
-      -->
     </bookinfo>
 
 
diff --git a/DOCS/xml/de/faq.xml b/DOCS/xml/de/faq.xml
index 4e1b90dcd0..5fcb9327f2 100644
--- a/DOCS/xml/de/faq.xml
+++ b/DOCS/xml/de/faq.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with r21930 -->
+<!-- synced with r23608 -->
 <chapter id="faq" xreflabel="FAQ">
   <title>Häufig gestellte Fragen</title>
 
@@ -194,8 +194,7 @@
             <filename>xlibs-dev</filename> und bei Debian Sarge <filename>libx11-dev</filename>.
             Überprüfe auch, ob die Symlinks
             <filename class="directory">/usr/X11</filename> und
-            <filename class="directory">/usr/include/X11</filename> existieren
-            (das kann ein Problem auf Mandrake-Systemen sein).
+            <filename class="directory">/usr/include/X11</filename> existieren.
           </para>
         </answer>
       </qandaentry>
diff --git a/DOCS/xml/de/mencoder.xml b/DOCS/xml/de/mencoder.xml
index e0d037bf9d..aa58d4ac87 100644
--- a/DOCS/xml/de/mencoder.xml
+++ b/DOCS/xml/de/mencoder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- in sync with r23342 -->
+<!-- in sync with r23983 -->
 <!-- missing cosmetic commit 21537 -->
 <chapter id="mencoder">
   <title>Allgemeiner Gebrauch von <application>MEncoder</application></title>
@@ -345,7 +345,7 @@
         <screen>
           mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \
           -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \
-          -lavfopts format=psp:i_certify_that_my_video_stream_does_not_use_b_frames \
+          -lavfopts format=psp \
           <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable>
         </screen>
         Der Titel des Videos kann folgendermaßen angepasst werden:
@@ -435,8 +435,7 @@
         Das gleiche bei Benutzung des MPEG-Muxers von <systemitem class="library">libavformat</systemitem>:
         <screen>
           mencoder <replaceable>input.avi</replaceable> -o <replaceable>VCD.mpg</replaceable> -ofps 25 -vf scale=352:288,harddup -of lavf \
-          -lavfopts format=mpg:i_certify_that_my_video_stream_does_not_use_b_frames \
-          -oac lavc -lavcopts acodec=mp2:abitrate=224 -ovc lavc \
+          -lavfopts format=mpg -oac lavc -lavcopts acodec=mp2:abitrate=224 -ovc lavc \
           -lavcopts vcodec=mpeg1video:vrc_buf_size=327:keyint=15:vrc_maxrate=1152:vbitrate=1152:vmax_b_frames=0
         </screen>
       </para>
diff --git a/DOCS/xml/de/video.xml b/DOCS/xml/de/video.xml
index 09673ee705..c775b848e5 100644
--- a/DOCS/xml/de/video.xml
+++ b/DOCS/xml/de/video.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- in sync with r23271 -->
+<!-- in sync with r23594 -->
 <!-- missing cosmetic commit 21537 -->
 <chapter id="video">
 <title>Videoausgabegeräte</title>