From 5cf84e595d7ce671c185af8b69d68b77fab1ca0c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 8 Jun 2015 03:41:57 +0200
Subject: [PATCH] doc/ffserver: Add entry for missing jpeg variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 doc/ffserver.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index b756961aa3e..7a30fb6c3bf 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)
-- 
GitLab