From 0121ddabb8677730f415115c8f9d50e27269111e Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Fri, 26 Dec 2014 18:43:40 -0300 Subject: [PATCH] ffserver: reflow close_connection() Signed-off-by: Reynaldo H. Verdejo Pinochet --- ffserver.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ffserver.c b/ffserver.c index 7ddacd24dd..044bf6f4de 100644 --- a/ffserver.c +++ b/ffserver.c @@ -836,13 +836,11 @@ static void close_connection(HTTPContext *c) ctx = &c->fmt_ctx; if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) { - if (ctx->oformat) { - /* prepare header */ - if (avio_open_dyn_buf(&ctx->pb) >= 0) { - av_write_trailer(ctx); - av_freep(&c->pb_buffer); - avio_close_dyn_buf(ctx->pb, &c->pb_buffer); - } + /* prepare header */ + if (ctx->oformat && avio_open_dyn_buf(&ctx->pb) >= 0) { + av_write_trailer(ctx); + av_freep(&c->pb_buffer); + avio_close_dyn_buf(ctx->pb, &c->pb_buffer); } }