ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 8 03:41:57 2015 +0200| [5cf84e595d7ce671c185af8b69d68b77fab1ca0c] | committer: Michael Niedermayer
doc/ffserver: Add entry for missing jpeg variant Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cf84e595d7ce671c185af8b69d68b77fab1ca0c --- doc/ffserver.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ffserver.conf b/doc/ffserver.conf index b756961..7a30fb6 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
