From ab1c19efc59cbcb1ff1b0c076cde01b87837f21e Mon Sep 17 00:00:00 2001
From: Maksym Veremeyenko <verem@m1stereo.tv>
Date: Sat, 21 May 2011 04:39:20 +0200
Subject: [PATCH] fix ffserver's SIGSEGV
---
ffmpeg.c | 1 +
ffserver.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index fb644adc182..38297cc7f49 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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 81c9fcf448a..517cb6f3f35 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;
--
GitLab