diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-20 23:22:54 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-20 23:22:54 +0000 |
| commit | f6c5a0788c45f34964961111a2c674462ab5c494 (patch) | |
| tree | 200eb73d0fcaba48d6f624c19633fd12c445af04 | |
| parent | 39fda1b826abec7bd54593ef4791a86a1f72371d (diff) | |
| download | mpv-f6c5a0788c45f34964961111a2c674462ab5c494.tar.bz2 mpv-f6c5a0788c45f34964961111a2c674462ab5c494.tar.xz | |
Document lavf muxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15533 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 10 | ||||
| -rw-r--r-- | cfg-mencoder.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 3614a1a300..05d4ae32d0 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -5696,7 +5696,8 @@ syntax: .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 @@ video when the output framerate, eventually converted with \-ofps, is either 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 --git a/cfg-mencoder.h b/cfg-mencoder.h index 998274496c..aa1621b2f5 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -185,6 +185,7 @@ m_option_t of_conf[]={ {"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} |