# HG changeset patch
# User gpoirier
# Date 1123541343 0
# Node ID 0dd814292a59ace63f4ee42fe605d4c37b11a5f9
# Parent  8d1920036c9841170c48af6c8dff6f37e8e891b3
Various fixes, addition and removal of entries related to functions that come from the FFmpeg project

diff -r 8d1920036c98 -r 0dd814292a59 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Aug 08 21:51:11 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Aug 08 22:49:03 2005 +0000
@@ -5848,7 +5848,9 @@
 .IPs "\-of avi"
 Encode to AVI.
 .IPs "\-of mpeg"
-Encode to MPEG.
+Encode to MPEG (see also \-mpegopts).
+.IPs "\-of lavf"
+Encode with libavformat muxers (see also \-lavfopts).
 .IPs "\-of rawvideo"
 raw video stream (no muxing \- one video stream only)
 .IPs "\-of rawaudio"
@@ -6246,6 +6248,8 @@
 AC3
 .IPs adpcm_ima_wav
 IMA Adaptive PCM (4bits per sample, 4:1 compression)
+.IPS sonic\ 
+Experimental lossy/lossless codec
 .RE
 .PD 1
 .
@@ -6317,6 +6321,8 @@
 Sony Digital Video
 .IPs svq1\ 
 Apple Sorenson Video 1
+.IPs snow (also see: vstrict)
+experimental wavelet-based codec
 .RE
 .PD 1
 .
@@ -8578,8 +8584,6 @@
 (default: autodetect from output file extension).
 .PD 0
 .RSs
-.IPs mpa\ \ 
-MPEG audio
 .IPs mpg\ \ 
 MPEG1 systems and MPEG2 PS
 .IPs asf\ \ 
@@ -8597,7 +8601,7 @@
 .IPs au\ \ \ 
 SUN AU format
 .IPs nut\ \ 
-NUT Open Container Format
+NUT Open Container Format (experimental)
 .IPs mov\ \ 
 Quicktime
 .IPs mp4\ \