Upstream sync. [MPlayer r33021 / FFmpeg 8cf9a09]

mplayer/Changelog

@@ -3,7 +3,8 @@ MPlayer (1.0)
   rc5:
 
     Decoders:
-    * FFmpeg AAC decoder is now preferred over libfaad2
+    * FFmpeg AAC decoder is now preferred over libfaad2 and the internal
+      libfaad2 forked copy has been removed in its favor
 
     Demuxers:
     * experimental support for using binary Quicktime codecs with -demuxer lavf.

mplayer/Copyright

@@ -21,14 +21,6 @@ License:    GNU Lesser General Public License, some parts GNU General Public
             License, GNU General Public License when combined
 
 
-Name:       FAAD2
-Version:    2.1 beta (20040915 CVS snapshot) + fixes and portability patches
-URL:        http://www.audiocoding.com
-Directory:  libfaad2
-Copyright:  2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-License:    GNU General Public License
-
-
 Name:       libdvdcss
 Version:    Subversion r237 + local changes
 URL:        http://developers.videolan.org/libdvdcss/

mplayer/DOCS/codecs-status.html

@@ -674,23 +674,23 @@ <h1>Status of codecs support</h1>
 <!--  -->
         <tr>
           <td align=center><b>FFmpeg H.264</b></td>
-          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>AVC1<br>davc<br>DAVC<br>vvvc<br></b></td>
+          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>AVC1<br>davc<br>DAVC<br>vvvc<br>ai55<br>ai15<br>ai1q<br>ai5q<br></b></td>
           <td align=center><b>h264</b></td>
           <td align=center><b>YV12<br>I420<br>IYUV</b></td>
           <td align=center colspan=2><b>-</b></td>
         </tr>
 <!--  -->
         <tr>
           <td align=center><b>FFmpeg H.264 (VDPAU)</b></td>
-          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>AVC1<br>davc<br>DAVC<br></b></td>
+          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>AVC1<br>davc<br>DAVC<br>ai55<br>ai15<br>ai1q<br>ai5q<br></b></td>
           <td align=center><b>h264_vdpau</b></td>
           <td align=center><b>VDPAU_H264</b></td>
           <td align=center colspan=2><b>-</b></td>
         </tr>
 <!--  -->
         <tr>
           <td align=center><b>CoreAVC H.264 for x86 - http://corecodec.org/</b></td>
-          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>davc<br>DAVC<br>VSSH<br></b></td>
+          <td align=center><b>H264<br>h264<br>X264<br>x264<br>avc1<br>davc<br>DAVC<br>VSSH<br>ai55<br>ai15<br>ai1q<br>ai5q<br></b></td>
           <td align=center><b>CoreAVCDecoder.ax</b></td>
           <td align=center><b>YV12<br>IYUV<br>I420<br>YUY2</b></td>
           <td align=center colspan=2><b>this codec will only work after purchasing it</b></td>
@@ -1906,7 +1906,7 @@ <h1>Status of codecs support</h1>
 <!--  -->
         <tr>
           <td align=center><b>Apple ProRes 422 (HQ) decoder</b></td>
-          <td align=center><b>apch<br>apcn<br>apcs</b></td>
+          <td align=center><b>apch<br>apcn<br>apcs<br>apco<br>ap4h</b></td>
           <td align=center><b>AppleProResDecoder.qtx</b></td>
           <td align=center><b>YUY2</b></td>
           <td align=center colspan=2><b>-</b></td>
@@ -2087,6 +2087,14 @@ <h1>Status of codecs support</h1>
           <td align=center><b>BGR24<br>BGR15<br>BGR8</b></td>
           <td align=center colspan=2><b>-</b></td>
         </tr>
+<!--  -->
+        <tr>
+          <td align=center><b>FFmpeg XAN wc4</b></td>
+          <td align=center><b>Xxan</b></td>
+          <td align=center><b>xan_wc4</b></td>
+          <td align=center><b>YV12</b></td>
+          <td align=center colspan=2><b>-</b></td>
+        </tr>
 <!--  -->
         <tr>
           <td align=center><b>FFmpeg Electronic Arts TGV</b></td>
@@ -3240,9 +3248,9 @@ <h1>Status of codecs support</h1>
 <!--  -->
         <tr>
           <td align=center><b>FFmpeg XAN DPCM audio</b></td>
-          <td align=center><b>0x6E617841</b></td>
+          <td align=center><b>0x6E617841<br>0x594A</b></td>
           <td align=center><b>xan_dpcm</b></td>
-          <td align=center colspan=3><b>only works with libavformat demuxer</b></td>
+          <td align=center colspan=3><b>Wing Commander 4 files only work with libavformat demuxer</b></td>
         </tr>
 <!--  -->
         <tr>
@@ -3552,6 +3560,13 @@ <h1>Status of codecs support</h1>
           <td align=center><b>pcm_bluray</b></td>
           <td align=center colspan=3><b>-</b></td>
         </tr>
+<!--  -->
+        <tr>
+          <td align=center><b>Leitch/Harris PCM</b></td>
+          <td align=center><b>0x46584C50</b></td>
+          <td align=center><b>pcm_lxf</b></td>
+          <td align=center colspan=3><b>-</b></td>
+        </tr>
 <!--  -->
         <tr>
           <td align=center><b>FFmpeg AC-3</b></td>

mplayer/DOCS/man/cs/mplayer.1

@@ -365,30 +365,6 @@ Převíjení zpět/\:vpřed o 1 minutu.
 .PD 1
 .PP
 .RS
-(Následující klávesy jsou platné, pokud jste zakompilovali podporu GUI
-a dostanou přednost před výše uvedenými definicemi tlačítek.)
-.RE
-.PP
-.PD 0
-.RS
-.IPs "ENTER"
-Start přehrávání.
-.IPs "ESC\ \ "
-Stop přehrávání.
-.IPs "l\ \ \ \ "
-Načtení souboru.
-.IPs "t\ \ \ \ "
-Načtení titulků.
-.IPs "c\ \ \ \ "
-Otevře volič skinů.
-.IPs "p\ \ \ \ "
-Otevře playlist.
-.IPs "r\ \ \ \ "
-Otevře předvolby.
-.RE
-.PD 1
-.PP
-.RS
 (Následující klávesy jsou platné, pokud jste zakompilovali podporu vstupu z TV
 nebo DVB a dostanou přednost před výše uvedenými definicemi tlačítek.)
 .RE

mplayer/DOCS/man/de/mplayer.1

@@ -377,30 +377,6 @@ Im Minutenschritt zur
 .PD 1
 .PP
 .RS
-(Die folgenden Tasten sind nur g�ltig, falls MPlayer mit GUI-Unterst�tzung
-�bersetzt wurde und haben Vorrang vor den oben definierten Tasten.)
-.RE
-.PP
-.PD 0
-.RSs
-.IPs ENTER
-Startet Wiedergabe.
-.IPs "ESC\ \ "
-Beendet die Wiedergabe.
-.IPs "l\ \ \ \ "
-Datei laden.
-.IPs "t\ \ \ \ "
-Untertitel laden.
-.IPs "c\ \ \ \ "
-Skinbrowser �ffnen.
-.IPs "p\ \ \ \ "
-Playlist �ffnen.
-.IPs "r\ \ \ \ "
-Konfigurationsdialog �ffnen.
-.RE
-.PD 1
-.PP
-.RS
 (Die folgenden Tasten sind nur g�ltig, falls MPlayer mit Unterst�tzung
 f�r TV-Karten oder DVB-Input �bersetzt wurde und haben Vorrang vor den oben
 definierten Tasten.)
@@ -2416,6 +2392,24 @@ Deaktiviert das automatische Laden von Untertiteln.
 Setzt die Anzeigedauer der OSD-Meldungen in ms (Standard: 1000).
 .
 .TP
+.B \-osd\-fractions <0\-2>
+Setzt die Art der Anzeige von Nachkommastellen des aktuellen Zeitstempels im
+OSD:
+.PD 0
+.RSs
+.IPs 0
+Keine Anzeige der Nachkommastellen (Standard).
+.IPs 1
+Zeige die ersten beiden Nachkommastellen.
+.IPs 2
+Zeige gen�herte Framezahl an.
+Die angezeigte Framezahl ist nicht exakt, sondern nur gen�hert.
+F�r variable FPS ist die N�herung weit von der tats�chlichen Framezahl
+entfernt.
+.RE
+.PD 1
+.
+.TP
 .B \-osdlevel <0\-3> (nur bei MPlayer)
 Gibt den Modus an, in dem das OSD startet:
 .PD 0
@@ -11265,10 +11259,22 @@ Eingabebelegungen (siehe '\-input keylist' f
 aller Tastennamen)
 .
 .TP
+~/.mplayer/\:gui.conf
+Konfigurationsdatei f�r die GUI
+.
+.TP
+~/.mplayer/\:gui.history
+Verzeichnis-Verlaufsdatei f�r die GUI
+.
+.TP
 ~/.mplayer/\:gui.pl
 Playlist f�r die GUI
 .
 .TP
+~/.mplayer/\:gui.url
+URL-Liste f�r die GUI
+.
+.TP
 ~/.mplayer/\:font/
 Schriftartenverzeichnis (es m�ssen sich eine Datei font.desc und Dateien mit
 der Erweiterung .RAW in dem Verzeichnis befinden)

mplayer/DOCS/man/en/mplayer.1

@@ -1,4 +1,4 @@
-.\" $Revision: 32699 $
+.\" $Revision: 32946 $
 .\" MPlayer (C) 2000-2010 MPlayer Team
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .
@@ -374,30 +374,6 @@ Seek backward/\:forward 1 minute.
 .PD 1
 .PP
 .RS
-(The following keys are only valid if GUI support is compiled in
-and will take precedence over the keys defined above.)
-.RE
-.PP
-.PD 0
-.RS
-.IPs ENTER
-Start playing.
-.IPs "ESC\ \ "
-Stop playing.
-.IPs "l\ \ \ \ "
-Load file.
-.IPs "t\ \ \ \ "
-Load subtitle.
-.IPs "c\ \ \ \ "
-Open skin browser.
-.IPs "p\ \ \ \ "
-Open playlist.
-.IPs "r\ \ \ \ "
-Open preferences.
-.RE
-.PD 1
-.PP
-.RS
 (The following keys are only valid if you compiled with TV or DVB input
 support and will take precedence over the keys defined above.)
 .RE
@@ -1552,8 +1528,7 @@ on how to use this.
 Stop at given time or byte position.
 .br
 .I NOTE:
-Byte position is enabled only for MEncoder and will not be accurate, as it can
-only stop at a frame boundary.
+Byte position may not be accurate, as it can only stop at a frame boundary.
 When used in conjunction with \-ss option, \-endpos time will shift forward by
 seconds specified with \-ss.
 .sp 1
@@ -2427,6 +2402,23 @@ Turns off automatic subtitle file loading.
 Set the duration of the OSD messages in ms (default: 1000).
 .
 .TP
+.B \-osd\-fractions <0\-2>
+Set how fractions of seconds of the current timestamp are printed on the OSD:
+.PD 0
+.RSs
+.IPs 0
+Do not display fractions (default).
+.IPs 1
+Show the first two decimals.
+.IPs 2
+Show approximated frame count within current second.
+This frame count is not accurate but only an approximation.
+For variable fps, the approximation is known to be far off the correct frame
+count.
+.RE
+.PD 1
+.
+.TP
 .B \-osdlevel <0\-3> (MPlayer only)
 Specifies which mode the OSD should start in.
 .PD 0
@@ -2558,7 +2550,7 @@ exact match
 .IPs 1
 Load all subs containing movie name.
 .IPs 2
-Load all subs in the current directory.
+Load all subs in the current and \-sub\-paths directories.
 .RE
 .PD 1
 .
@@ -2625,6 +2617,27 @@ Guess the encoding for Polish, fall back on cp1250.
 .PD 1
 .
 .TP
+.B \-sub\-paths <path1,path2,...>
+Specify extra subtitle paths to track in the media directory.
+.sp 1
+.I EXAMPLE:
+Assuming that /path/\:to/\:movie/\:movie.avi is played and \-sub\-paths
+sub,subtitles,/tmp/subs is specified, MPlayer searches for subtitle files in
+these directories:
+.RSs
+/path/\:to/\:movie/
+.br
+/path/\:to/\:movie/\:sub/
+.br
+/path/\:to/\:movie/\:subtitles/
+.br
+/tmp/\:subs/
+.br
+~/.mplayer/\:sub/
+.RE
+.PD 1
+.
+.TP
 .B \-subdelay <sec>
 Delays subtitles by <sec> seconds.
 Can be negative.
@@ -4593,6 +4606,8 @@ Specifies the compression level.
 0 is no compression, 9 is maximum compression.
 .IPs outdir=<dirname>
 Specify the directory to save the PNG files to (default: ./).
+.IPs prefix=<prefix>
+Specify the prefix to be used for the PNG filenames (default: no prefix).
 .IPs alpha (default: noalpha)
 Create PNG files with an alpha channel.
 Note that MPlayer in general does not support alpha, so this will only
@@ -10341,13 +10356,16 @@ Note that quantization in H.264 works differently from MPEG-1/2/4:
 H.264's quantization parameter (QP) is on a logarithmic scale.
 The mapping is approximately H264QP = 12 + 6*log2(MPEGQP).
 For example, MPEG at QP=2 is equivalent to H.264 at QP=18.
+Generally, this option should be avoided and crf should be used instead
+as crf will yield better visual results for the same size.
 .
 .TP
 .B crf=<1.0\-50.0>
 Enables constant quality mode, and selects the quality.
 The scale is similar to QP.
 Like the bitrate-based modes, this allows each frame to use a
 different QP based on the frame's complexity.
+This option should generally be used instead of qp.
 .
 .TP
 .B pass=<1\-3>
@@ -11727,24 +11745,24 @@ input bindings (see '\-input keylist' for the full list)
 GUI configuration file
 .
 .TP
+~/.mplayer/\:gui.history
+GUI directory history
+.
+.TP
 ~/.mplayer/\:gui.pl
 GUI playlist
 .
 .TP
+~/.mplayer/\:gui.url
+GUI URL list
+.
+.TP
 ~/.mplayer/\:font/
 font directory (There must be a font.desc file and files with .RAW extension.)
 .
 .TP
 ~/.mplayer/\:DVDkeys/
 cached CSS keys
-.
-.TP
-Assuming that /path/\:to/\:movie.avi is played, MPlayer searches for sub files
-in this order:
-.RS
-/path/\:to/\:movie.sub
-.br
-~/.mplayer/\:sub/\:movie.sub
 .RE
 .PD 1
 .