diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 03:41:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 03:41:57 +0200 |
| commit | 5cf84e595d7ce671c185af8b69d68b77fab1ca0c (patch) | |
| tree | ff1f10301382ca81ec2a41ad365213929b1d7fa3 | |
| parent | 3b89a673155fa3863e13f3595d651f37b024e6c5 (diff) | |
| download | ffmpeg-5cf84e595d7ce671c185af8b69d68b77fab1ca0c.tar.gz | |
doc/ffserver: Add entry for missing jpeg variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/ffserver.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index b756961aa3..7a30fb6c3b 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -82,6 +82,7 @@ Feed feed1.ffm # ra : RealNetworks-compatible stream. Audio only. # mpjpeg : Multipart JPEG (works with Netscape without any plugin) # jpeg : Generate a single JPEG image. +# mjpeg : Generate a M-JPEG stream. # asf : ASF compatible streaming (Windows Media Player format). # swf : Macromedia Flash compatible stream # avi : AVI format (MPEG-4 video, MPEG audio sound) |