summaryrefslogtreecommitdiff
path: root/ffserver_config.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffserver_config.c')
-rw-r--r--ffserver_config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffserver_config.c b/ffserver_config.c
index 017af48434..06bd8ac44a 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -862,8 +862,10 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd,
} else {
stream->stream_type = STREAM_TYPE_LIVE;
/* JPEG cannot be used here, so use single frame MJPEG */
- if (!strcmp(arg, "jpeg"))
- strcpy(arg, "mjpeg");
+ if (!strcmp(arg, "jpeg")) {
+ strcpy(arg, "singlejpeg");
+ stream->single_frame=1;
+ }
stream->fmt = ffserver_guess_format(arg, NULL, NULL);
if (!stream->fmt)
ERROR("Unknown Format: '%s'\n", arg);