Browse code

move code setting output parameters after possible failure

Originally committed as revision 13876 to svn://svn.ffmpeg.org/ffmpeg/trunk

Baptiste Coudurier authored on 2008/06/22 12:42:23
Showing 1 changed files
... ...
@@ -2040,10 +2040,7 @@ static int http_prepare_data(HTTPContext *c)
2040 2040
         av_strlcpy(c->fmt_ctx.title, c->stream->title,
2041 2041
                    sizeof(c->fmt_ctx.title));
2042 2042
 
2043
-        /* open output stream by using specified codecs */
2044
-        c->fmt_ctx.oformat = c->stream->fmt;
2045
-        c->fmt_ctx.nb_streams = c->stream->nb_streams;
2046
-        for(i=0;i<c->fmt_ctx.nb_streams;i++) {
2043
+        for(i=0;i<c->stream->nb_streams;i++) {
2047 2044
             AVStream *st;
2048 2045
             AVStream *src;
2049 2046
             st = av_mallocz(sizeof(AVStream));
... ...
@@ -2060,6 +2057,10 @@ static int http_prepare_data(HTTPContext *c)
2060 2060
             st->codec->frame_number = 0; /* XXX: should be done in
2061 2061
                                            AVStream, not in codec */
2062 2062
         }
2063
+        /* set output format parameters */
2064
+        c->fmt_ctx.oformat = c->stream->fmt;
2065
+        c->fmt_ctx.nb_streams = c->stream->nb_streams;
2066
+
2063 2067
         c->got_key_frame = 0;
2064 2068
 
2065 2069
         /* prepare header and save header data in a stream */