# HG changeset patch
# User kraymer
# Date 1191071037 0
# Node ID 71c669dee1d681fe2a613d684e55b574d0ff928a
# Parent  389960ca6c3b9ff6950d8092a8d51d031e82a161
r24030: Document special A-V sync issues with FLV files
r24035: Add <application> tag around MEncoder
r24045: Change "object type complexity" parameter of FAAC
r24089: Complete the list of libavcodec audio encoders.
r24049: i_certify is no longer an option

diff -r 389960ca6c3b -r 71c669dee1d6 DOCS/xml/de/codecs.xml
--- a/DOCS/xml/de/codecs.xml	Sat Sep 29 12:27:13 2007 +0000
+++ b/DOCS/xml/de/codecs.xml	Sat Sep 29 13:03:57 2007 +0000
@@ -494,7 +494,7 @@
       Die Referenzimplementierung ist auf
       <ulink url="http://www.3gpp.org">The 3rd Generation Partnership Project</ulink>
       erhältlich (frei - wie in Freibier - für private Benutzung).
-      Um die Unterstützung zu aktieren, lade die Bibliotheken für
+      Um die Unterstützung zu aktiveren, lade die Bibliotheken für
       <ulink url="http://www.penguin.cz/~utx/amr">AMR-NB and AMR-WB</ulink>
       runter und installiere sie, indem du die Anweisungen auf dieser Seite befolgst.
     </para>
diff -r 389960ca6c3b -r 71c669dee1d6 DOCS/xml/de/encoding-guide.xml
--- a/DOCS/xml/de/encoding-guide.xml	Sat Sep 29 12:27:13 2007 +0000
+++ b/DOCS/xml/de/encoding-guide.xml	Sat Sep 29 13:03:57 2007 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- in sync with r22752 -->
+<!-- in sync with r24549 -->
 <!-- missing cosmetic commit 21537 -->
 <chapter id="encoding-guide">
   <title>Encodieren mit <application>MEncoder</application></title>
@@ -2682,16 +2682,56 @@
             </thead>
             <tbody>
               <row>
-                <entry>mp2</entry>
-                <entry>MPEG Layer 2</entry>
+                <entry>ac3</entry>
+                <entry>Dolby Digital (AC-3)</entry>
+              </row>
+              <row>
+                <entry>adpcm_*</entry>
+                <entry>Adaptive PCM-Formate - siehe begleitende Tabelle</entry>
+              </row>
+              <row>
+                <entry>flac</entry>
+                <entry>Free Lossless Audio Codec (FLAC)</entry>
+              </row>
+              <row>
+                <entry>g726</entry>
+                <entry>G.726 ADPCM</entry>
+              </row>
+              <row>
+                <entry>libamr_nb</entry>
+                <entry>3GPP Adaptive Multi-Rate (AMR) narrow-band</entry>
+              </row>
+              <row>
+                <entry>libamr_wb</entry>
+                <entry>3GPP Adaptive Multi-Rate (AMR) wide-band</entry>
               </row>
               <row>
-                <entry>ac3</entry>
-                <entry>AC3, AKA Dolby Digital</entry>
+                <entry>libfaac</entry>
+                <entry>Advanced Audio Coding (AAC) - verwendet FAAC</entry>
+              </row>
+              <row>
+                <entry>libgsm</entry>
+                <entry>ETSI GSM 06.10 full rate</entry>
+              </row>
+              <row>
+                <entry>libgsm_ms</entry>
+                <entry>Microsoft GSM</entry>
               </row>
               <row>
-                <entry>adpcm_ima_wav</entry>
-                <entry>IMA adaptive PCM (4 Bit pro Sample, 4:1-Kompression)</entry>
+                <entry>libmp3lame</entry>
+                <entry>MPEG-1 audio layer 3 (MP3) - verwendet LAME</entry>
+              </row>
+              <row>
+                <entry>mp2</entry>
+                <entry>MPEG-1 Audio Layer 2</entry>
+              </row>
+              <row>
+                <entry>pcm_*</entry>
+                <entry>PCM-Formate - siehe begleitende Tabelle</entry>
+              </row>
+              <row>
+                <entry>roq_dpcm</entry>
+                <entry>Id Software RoQ DPCM</entry>
               </row>
               <row>
                 <entry>sonic</entry>
@@ -2703,15 +2743,15 @@
               </row>
               <row>
                 <entry>vorbis</entry>
-                <entry>Xiph Ogg Vorbis Codec</entry>
+                <entry>Vorbis</entry>
               </row>
               <row>
                 <entry>wma1</entry>
-                <entry>Windows Media Audio v1 Codec</entry>
+                <entry>Windows Media Audio v1</entry>
               </row>
               <row>
                 <entry>wma2</entry>
-                <entry>Windows Media Audio v2 Codec</entry>
+                <entry>Windows Media Audio v2</entry>
               </row>
             </tbody>
           </tgroup>
@@ -2740,6 +2780,167 @@
         <systemitem class="library">libavcodec</systemitem> kompiliert wurde (was
         meistens der Fall ist) und nicht von externen Programmbibliotheken abhängt.
       </para>
+
+      <sect3 id="menc-feat-enc-libavcodec-audio-codecs-pcmadpcm">
+        <title>PCM/ADPCM-Format, begleitende Tabelle</title>
+
+        <para>
+        <informaltable frame="all">
+        <tgroup cols="2">
+        <thead>
+        <row><entry>PCM/ADPCM Codecname</entry><entry>Beschreibung</entry></row>
+        </thead>
+        <tbody>
+        <row>
+          <entry>pcm_s32le</entry>
+          <entry>signed 32-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s32be</entry>
+          <entry>signed 32-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u32le</entry>
+          <entry>unsigned 32-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u32be</entry>
+          <entry>unsigned 32-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s24le</entry>
+          <entry>signed 24-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s24be</entry>
+          <entry>signed 24-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u24le</entry>
+          <entry>unsigned 24-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u24be</entry>
+          <entry>unsigned 24-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s16le</entry>
+          <entry>signed 16-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s16be</entry>
+          <entry>signed 16-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u16le</entry>
+          <entry>unsigned 16-bit little-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_u16be</entry>
+          <entry>unsigned 16-bit big-endian</entry>
+        </row>
+        <row>
+          <entry>pcm_s8</entry>
+          <entry>signed 8-bit</entry>
+        </row>
+        <row>
+          <entry>pcm_u8</entry>
+          <entry>unsigned 8-bit</entry>
+        </row>
+        <row>
+          <entry>pcm_alaw</entry>
+          <entry>G.711 A-LAW </entry>
+        </row>
+        <row>
+          <entry>pcm_mulaw</entry>
+          <entry>G.711 &mu;-LAW</entry>
+        </row>
+        <row>
+          <entry>pcm_s24daud</entry>
+          <entry>signed 24-bit D-Cinema Audioformat</entry>
+        </row>
+        <row>
+          <entry>pcm_zork</entry>
+          <entry>Activision Zork Nemesis</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_qt</entry>
+          <entry>Apple QuickTime</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_wav</entry>
+          <entry>Microsoft/IBM WAVE</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_dk3</entry>
+          <entry>Duck DK3</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_dk4</entry>
+          <entry>Duck DK4</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_ws</entry>
+          <entry>Westwood Studios</entry>
+        </row>
+        <row>
+          <entry>adpcm_ima_smjpeg</entry>
+          <entry>SDL Motion JPEG</entry>
+        </row>
+        <row>
+          <entry>adpcm_ms</entry>
+          <entry>Microsoft</entry>
+        </row>
+        <row>
+          <entry>adpcm_4xm</entry>
+          <entry>4X Technologies</entry>
+        </row>
+        <row>
+          <entry>adpcm_xa</entry>
+          <entry>Phillips Yellow Book CD-ROM eXtended Architecture</entry>
+        </row>
+        <row>
+          <entry>adpcm_ea</entry>
+          <entry>Electronic Arts</entry>
+        </row>
+        <row>
+          <entry>adpcm_ct</entry>
+          <entry>Creative 16->4-bit</entry>
+        </row>
+        <row>
+          <entry>adpcm_swf</entry>
+          <entry>Adobe Shockwave Flash</entry>
+        </row>
+        <row>
+          <entry>adpcm_yamaha</entry>
+          <entry>Yamaha</entry>
+        </row>
+        <row>
+          <entry>adpcm_sbpro_4</entry>
+          <entry>Creative VOC SoundBlaster Pro 8->4-bit</entry>
+        </row>
+        <row>
+          <entry>adpcm_sbpro_3</entry>
+          <entry>Creative VOC SoundBlaster Pro 8->2.6-bit</entry>
+        </row>
+        <row>
+          <entry>adpcm_sbpro_2</entry>
+          <entry>Creative VOC SoundBlaster Pro 8->2-bit</entry>
+        </row>
+        <row>
+          <entry>adpcm_thp</entry>
+          <entry>Nintendo GameCube FMV THP</entry>
+        </row>
+        <row>
+          <entry>adpcm_adx</entry>
+          <entry>Sega/CRI ADX</entry>
+        </row>
+        </tbody>
+        </tgroup>
+        </informaltable>
+        </para>
+      </sect3>
+
     </sect2>
 
 
@@ -4550,7 +4751,7 @@
 <screen>mencoder -dvd-device <replaceable>zeiram.iso</replaceable> dvd://7 -o <replaceable>trailer.flv</replaceable> \
 -ovc vfw -xvfwopts codec=vp6vfw.dll:compdata=onepass.mcf -oac mp3lame \
 -lameopts cbr:br=64 -af lavcresample=22050 -vf yadif,scale=320:240,flip \
--of lavf -lavfopts i_certify_that_my_video_stream_does_not_use_b_frames
+-of lavf
 </screen>
         </para>
       </informalexample>
@@ -4808,7 +5009,7 @@
 -x264encopts pass=1:turbo:bitrate=900:bframes=1:\
 me=umh:partitions=all:trellis=1:qp_step=4:qcomp=0.7:direct_pred=auto:keyint=300 \
 -vf crop=720:352:0:62,scale=-10:-1,harddup \
--oac faac -faacopts br=192:mpeg=4:object=1 -channels 2 -srate 48000 \
+-oac faac -faacopts br=192:mpeg=4:object=2 -channels 2 -srate 48000 \
 -ofps 24000/1001</screen>
 
           Wenn du einen Rechner mit mehreren Prozessoren hast, nutze die Chance, den
@@ -4828,7 +5029,7 @@
 -x264encopts <emphasis role="bold">pass=2</emphasis>:turbo:bitrate=900:frameref=5:bframes=1:\
 me=umh:partitions=all:trellis=1:qp_step=4:qcomp=0.7:direct_pred=auto:keyint=300 \
 -vf crop=720:352:0:62,scale=-10:-1,harddup \
--oac faac -faacopts br=192:mpeg=4:object=1 -channels 2 -srate 48000 \
+-oac faac -faacopts br=192:mpeg=4:object=2 -channels 2 -srate 48000 \
 -ofps 24000/1001</screen>
           </para>
           <para>
diff -r 389960ca6c3b -r 71c669dee1d6 DOCS/xml/de/faq.xml
--- a/DOCS/xml/de/faq.xml	Sat Sep 29 12:27:13 2007 +0000
+++ b/DOCS/xml/de/faq.xml	Sat Sep 29 13:03:57 2007 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- synced with r23608 -->
+<!-- synced with r24035 -->
 <chapter id="faq" xreflabel="FAQ">
   <title>Häufig gestellte Fragen</title>
 
@@ -874,6 +874,14 @@
         </question>
         <answer>
           <para>
+            Viele FLV-Dateien werden nur mit <option>-correct-pts</option> korrekt wiedergegeben.
+            Leider hat <application>MEncoder</application> diese Option nicht.
+            Du kannst aber versuchen, die <option>-fps</option>-Option zu setzen, um den
+            richtigen Wert manuell, wenn du ihn kennst.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
             Deine Maschine ist zu langsam, oder dein Soundkartentreiber ist kaputt.
             Konsultiere die Dokumentation, um herauszufinden, wie du die Performance verbessern kannst.
           </para>