diff options
| author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-08 22:49:03 +0000 |
|---|---|---|
| committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-08 22:49:03 +0000 |
| commit | f4a3c54bfb3cf24b49ea22bb9d30cc0d474ff478 (patch) | |
| tree | 557d9f67180fce34de7507c01d93f7dbd3dc7f9f /DOCS | |
| parent | d6b50bdde58932ce83d7a9d5b8d1ba09cfdb6666 (diff) | |
| download | mpv-f4a3c54bfb3cf24b49ea22bb9d30cc0d474ff478.tar.bz2 mpv-f4a3c54bfb3cf24b49ea22bb9d30cc0d474ff478.tar.xz | |
Various fixes, addition and removal of entries related to functions that come from the FFmpeg project
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16189 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 41da6b2db2..35e77ea492 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -5848,7 +5848,9 @@ Use \-of help to get a list of available container formats. .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 @@ MPEG Layer 3 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 @@ Sorenson H.263 used in Flash Video 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 @@ Override which container format to mux into (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 @@ Real Audio and Video .IPs au\ \ \ SUN AU format .IPs nut\ \ -NUT Open Container Format +NUT Open Container Format (experimental) .IPs mov\ \ Quicktime .IPs mp4\ \ |