aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-08-15 13:03:37 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-08-15 13:03:37 +0000
commitdd2af5aa4e69bc16ed0d6e93d5891f8e0f386b5f (patch)
tree6cd4a7db53a2904a9ef729a9ca8f849394c55f3c /ffserver.c
parent3abf2c27c6548f4848c9f96e16c4cb2ba05e1dae (diff)
downloadffmpeg-dd2af5aa4e69bc16ed0d6e93d5891f8e0f386b5f.tar.gz
jpeg hack
Originally committed as revision 89 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffserver.c b/ffserver.c
index cfabe30823..1cb9450ecc 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1362,6 +1362,9 @@ int parse_ffconfig(const char *filename)
stream->fmt = NULL;
} else {
stream->stream_type = STREAM_TYPE_LIVE;
+ /* jpeg cannot be used here, so use single frame jpeg */
+ if (!strcmp(arg, "jpeg"))
+ strcpy(arg, "singlejpeg");
stream->fmt = guess_format(arg, NULL, NULL);
if (!stream->fmt) {
fprintf(stderr, "%s:%d: Unknown Format: %s\n",