# HG changeset patch
# User diego
# Date 1116631374 0
# Node ID f05963f1dff68b4399400f937abfc5463ff0e0a3
# Parent  ca66260288e26c384d46c1d73f37326354c3864f
Document lavf muxers.

diff -r ca66260288e2 -r f05963f1dff6 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Fri May 20 21:50:57 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Fri May 20 23:22:54 2005 +0000
@@ -5696,7 +5696,8 @@
 .B \-<codec>opts <option1[=value],option2,...>
 .
 .PP
-Where <codec> may be: lavc, xvidenc, divx4, lame, toolame, twolame, faac, x264enc, mpeg.
+Where <codec> may be: lavc, xvidenc, divx4, lame, toolame, twolame,
+nuv, vfw, faac, x264enc, mpeg, lavf.
 .
 .
 .SS divx4 (\-divx4opts)
@@ -8184,6 +8185,13 @@
 Any other framerate is incompatible with this option.
 .
 .
+.SS FFmpeg libavformat muxers (\-lavfopts)
+.
+.TP
+.B format=<container_format>
+Select which container format to mux into (no default).
+.
+.
 .\" --------------------------------------------------------------------------
 .\" Files
 .\" --------------------------------------------------------------------------
diff -r ca66260288e2 -r f05963f1dff6 cfg-mencoder.h
--- a/cfg-mencoder.h	Fri May 20 21:50:57 2005 +0000
+++ b/cfg-mencoder.h	Fri May 20 23:22:54 2005 +0000
@@ -185,6 +185,7 @@
 	{"help", "\nAvailable output formats:\n"
 	"   avi      - Microsoft Audio/Video Interleaved\n"
 	"   mpeg     - MPEG-1/2 system stream format\n"
+	"   lavf     - FFmpeg libavformat muxers\n"
 	"   rawvideo - (video only, one stream only) raw stream, no muxing\n"
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}