opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-28 20:14:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

ffserver segfault & other fatal failure fixes

Browse Source 
Originally committed as revision 4454 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2005-07-18 09:02:58 +00:00
parent 01f4895c68
commit 8d931070fc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffserver.c
View File

@ -2000,6 +2000,7 @@ static int http_prepare_data(HTTPContext *c)
AVStream *st; AVStream *st;
AVStream *src; AVStream *src;
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
st->codec= avcodec_alloc_context();
c->fmt_ctx.streams[i] = st; c->fmt_ctx.streams[i] = st;
/* if file or feed, then just take streams from FFStream struct */ /* if file or feed, then just take streams from FFStream struct */
if (!c->stream->feed || if (!c->stream->feed ||
@ -3138,6 +3139,7 @@ static int rtp_new_av_stream(HTTPContext *c,
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
if (!st) if (!st)
goto fail; goto fail;
st->codec= avcodec_alloc_context();
ctx->nb_streams = 1; ctx->nb_streams = 1;
ctx->streams[0] = st; ctx->streams[0] = st;
@ -3221,6 +3223,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec)
fst = av_mallocz(sizeof(AVStream)); fst = av_mallocz(sizeof(AVStream));
if (!fst) if (!fst)
return NULL; return NULL;
fst->codec= avcodec_alloc_context();
fst->priv_data = av_mallocz(sizeof(FeedData)); fst->priv_data = av_mallocz(sizeof(FeedData));
memcpy(fst->codec, codec, sizeof(AVCodecContext)); memcpy(fst->codec, codec, sizeof(AVCodecContext));
fst->codec->coded_frame = &dummy_frame; fst->codec->coded_frame = &dummy_frame;
@ -3664,6 +3667,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));
if (!st) if (!st)
return; return;
st->codec = avcodec_alloc_context();
stream->streams[stream->nb_streams++] = st; stream->streams[stream->nb_streams++] = st;
memcpy(st->codec, av, sizeof(AVCodecContext)); memcpy(st->codec, av, sizeof(AVCodecContext));
} }
@ -3971,7 +3975,7 @@ static int parse_ffconfig(const char *filename)
stream->stream_type = STREAM_TYPE_LIVE; stream->stream_type = STREAM_TYPE_LIVE;
/* jpeg cannot be used here, so use single frame jpeg */ /* jpeg cannot be used here, so use single frame jpeg */
if (!strcmp(arg, "jpeg")) if (!strcmp(arg, "jpeg"))
strcpy(arg, "singlejpeg"); strcpy(arg, "mjpeg");
stream->fmt = guess_stream_format(arg, NULL, NULL); stream->fmt = guess_stream_format(arg, NULL, NULL);
if (!stream->fmt) { if (!stream->fmt) {
fprintf(stderr, "%s:%d: Unknown Format: %s\n", fprintf(stderr, "%s:%d: Unknown Format: %s\n",

4
tests/test.conf
View File

@ -218,7 +218,7 @@ MaxTime 100
<Stream test.jpg> <Stream test.jpg>
Feed feed1.ffm Feed feed1.ffm
Format singlejpeg Format mjpeg
VideoFrameRate 1 VideoFrameRate 1
VideoSize 352x288 VideoSize 352x288
@ -231,7 +231,7 @@ PreRoll 2
<Stream test_small.jpg> <Stream test_small.jpg>
Feed feed1.ffm Feed feed1.ffm
Format singlejpeg Format mjpeg
VideoFrameRate 1 VideoFrameRate 1
VideoSize 160x128 VideoSize 160x128