From 3d9cc27df8786f75d3119b277a58e348c4c7ab12 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 22 Jun 2008 03:42:23 +0000 Subject: move code setting output parameters after possible failure Originally committed as revision 13876 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ffserver.c') diff --git a/ffserver.c b/ffserver.c index c982b3a6c9..7ca7ab54db 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2040,10 +2040,7 @@ static int http_prepare_data(HTTPContext *c) av_strlcpy(c->fmt_ctx.title, c->stream->title, sizeof(c->fmt_ctx.title)); - /* open output stream by using specified codecs */ - c->fmt_ctx.oformat = c->stream->fmt; - c->fmt_ctx.nb_streams = c->stream->nb_streams; - for(i=0;ifmt_ctx.nb_streams;i++) { + for(i=0;istream->nb_streams;i++) { AVStream *st; AVStream *src; st = av_mallocz(sizeof(AVStream)); @@ -2060,6 +2057,10 @@ static int http_prepare_data(HTTPContext *c) st->codec->frame_number = 0; /* XXX: should be done in AVStream, not in codec */ } + /* set output format parameters */ + c->fmt_ctx.oformat = c->stream->fmt; + c->fmt_ctx.nb_streams = c->stream->nb_streams; + c->got_key_frame = 0; /* prepare header and save header data in a stream */ -- cgit v1.2.3