X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver_config.c;h=06bd8ac44ab744b6f243e4eb35dec9efbd496c95;hb=766a8346cfb4e3553be207852266058d9edb9945;hp=017af48434ce1dd7fd60a9c5792421ef39703546;hpb=14617e3a739ea23e8da9adcdca4418f2b14a3956;p=ffmpeg diff --git a/ffserver_config.c b/ffserver_config.c index 017af48434c..06bd8ac44ab 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);