Commit b67f3d65 authored by Rocky Cardwell's avatar Rocky Cardwell Committed by Carl Eugen Hoyos

Fix ffserver-related regression (and crash) introduced in r25500.

Fixes issue 2317.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Originally committed as revision 25603 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ec1ca41c
......@@ -664,11 +664,13 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
if (err < 0)
return err;
/* copy stream format */
s->nb_streams = ic->nb_streams;
s->nb_streams = 0;
for(i=0;i<ic->nb_streams;i++) {
AVStream *st;
AVCodec *codec;
s->nb_streams++;
// FIXME: a more elegant solution is needed
st = av_mallocz(sizeof(AVStream));
memcpy(st, ic->streams[i], sizeof(AVStream));
......@@ -700,6 +702,8 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
if(st->codec->flags & CODEC_FLAG_BITEXACT)
nopts = 1;
new_output_stream(s, nb_output_files);
}
if (!nopts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment