diff options
author | Maksym Veremeyenko <verem@m1stereo.tv> | 2011-05-21 04:39:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 04:39:20 +0200 |
commit | ab1c19efc59cbcb1ff1b0c076cde01b87837f21e (patch) | |
tree | 2682bf181e3c44845ab770d4470f70887d1390b7 | |
parent | 0eed5016a27ec2f6990c426e79eb28fbf370f613 (diff) | |
download | ffmpeg-ab1c19efc59cbcb1ff1b0c076cde01b87837f21e.tar.gz |
fix ffserver's SIGSEGV
-rw-r--r-- | ffmpeg.c | 1 | ||||
-rw-r--r-- | ffserver.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -703,6 +703,7 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename) return err; /* copy stream format */ s->nb_streams = 0; + s->streams = av_mallocz(sizeof(*s->streams) * ic->nb_streams); for(i=0;i<ic->nb_streams;i++) { AVStream *st; AVCodec *codec; diff --git a/ffserver.c b/ffserver.c index 81c9fcf448..517cb6f3f3 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2229,6 +2229,7 @@ static int http_prepare_data(HTTPContext *c) av_metadata_set2(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0); av_metadata_set2(&c->fmt_ctx.metadata, "title" , c->stream->title , 0); + c->fmt_ctx.streams = av_mallocz(sizeof(*c->fmt_ctx.streams) * c->stream->nb_streams); for(i=0;i<c->stream->nb_streams;i++) { AVStream *st; AVStream *src; |