Browse Source

return error if av_write_header failed (it fails on some containers when codec is not supported)

Originally committed as revision 8110 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Alex Beregszaszi 18 years ago
parent
commit
f75cdda718
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      ffserver.c

+ 6
- 2
ffserver.c View File

@@ -2033,7 +2033,8 @@ static int http_prepare_data(HTTPContext *c)
c->fmt_ctx.pb.is_streamed = 1;

av_set_parameters(&c->fmt_ctx, NULL);
av_write_header(&c->fmt_ctx);
if (av_write_header(&c->fmt_ctx) < 0)
return -1;

len = url_close_dyn_buf(&c->fmt_ctx.pb, &c->pb_buffer);
c->buffer_ptr = c->pb_buffer;
@@ -3525,7 +3526,10 @@ static void build_feed_streams(void)
s->streams[i] = st;
}
av_set_parameters(s, NULL);
av_write_header(s);
if (av_write_header(s) < 0) {
fprintf(stderr, "Container doesn't supports the required parameters\n");
exit(1);
}
/* XXX: need better api */
av_freep(&s->priv_data);
url_fclose(&s->pb);


Loading…
Cancel
Save