virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fix ffserver's SIGSEGV

Browse Source
This commit is contained in:
Maksym Veremeyenko 2011-05-21 04:39:20 +02:00 committed by Michael Niedermayer
parent 0eed5016a2
commit ab1c19efc5
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ffmpeg.c
View File

@ -703,6 +703,7 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
return err; return err;
/* copy stream format */ /* copy stream format */
s->nb_streams = 0; s->nb_streams = 0;
s->streams = av_mallocz(sizeof(*s->streams) * ic->nb_streams);
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
AVStream *st; AVStream *st;
AVCodec *codec; AVCodec *codec;

1
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, "copyright", c->stream->copyright, 0);
av_metadata_set2(&c->fmt_ctx.metadata, "title" , c->stream->title , 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++) { for(i=0;i<c->stream->nb_streams;i++) {
AVStream *st; AVStream *st;
AVStream *src; AVStream *src;