swscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext}

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index b756961aa3e9f88e4442acf39e68fe94b49dc366..7a30fb6c3bfba5e0c2a8a429ae2661d789ef4fba 100644 (file)
--- 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)