OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3abf2c2
)
jpeg hack
author
Fabrice Bellard
<fabrice@bellard.org>
Wed, 15 Aug 2001 13:03:37 +0000
(13:03 +0000)
committer
Fabrice Bellard
<fabrice@bellard.org>
Wed, 15 Aug 2001 13:03:37 +0000
(13:03 +0000)
Originally committed as revision 89 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
cfabe30
..
1cb9450
100644
(file)
--- 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",