Browse Source

fix ffserver's SIGSEGV

tags/n0.8
Maksym Veremeyenko Michael Niedermayer 14 years ago
parent
commit
ab1c19efc5
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      ffmpeg.c
  2. +1
    -0
      ffserver.c

+ 1
- 0
ffmpeg.c View File

@@ -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;


+ 1
- 0
ffserver.c View File

@@ -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;


Loading…
Cancel
Save