summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-08 21:51:11 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-08 21:51:11 +0000
commitd6b50bdde58932ce83d7a9d5b8d1ba09cfdb6666 (patch)
tree42f7ecf3db3e5132997cb998c79d35911bfc649e /DOCS
parent94ea9449cc9d86bb47e82598bebfaa5260b03001 (diff)
downloadmpv-d6b50bdde58932ce83d7a9d5b8d1ba09cfdb6666.tar.bz2
mpv-d6b50bdde58932ce83d7a9d5b8d1ba09cfdb6666.tar.xz
Add missing libavcodec supported codecs and adds (hopefully) all libavformat muxers
Please check if this is correct git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16188 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.139
1 files changed, 38 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 0454c6da11..41da6b2db2 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -6311,6 +6311,12 @@ ASUS Video v1
ASUS Video v2
.IPs ffv1 (also see: vstrict)
FFmpeg's lossless video codec
+.IPs flv\ \
+Sorenson H.263 used in Flash Video
+.IPs dvvideo
+Sony Digital Video
+.IPs svq1\
+Apple Sorenson Video 1
.RE
.PD 1
.
@@ -8564,12 +8570,43 @@ video when the output framerate, eventually converted with \-ofps, is either
Any other framerate is incompatible with this option.
.
.
-.SS FFmpeg libavformat muxers (\-lavfopts)
+.SS FFmpeg libavformat muxers (\-lavfopts) (see also \-of lavf)
.
.TP
.B format=<container_format>
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\ \
+Advanced Streaming Format
+.IPs avi\ \
+Audio Video Interleave File
+.IPs wav\ \
+Waveform Audio
+.IPs swf\ \
+Macromedia Flash
+.IPs flv\ \
+Macromedia Flash video files
+.IPs rm\ \ \
+Real Audio and Video
+.IPs au\ \ \
+SUN AU format
+.IPs nut\ \
+NUT Open Container Format
+.IPs mov\ \
+Quicktime
+.IPs mp4\ \
+MPEG4 format
+.IPs dv\ \
+Sony Digital Video container
+.RE
+.PD 1
+.
.
.
.\" --------------------------------------------------------------------------