Commit 4d7f8254 authored by Marton Balint's avatar Marton Balint

avformat: remove unneeded avio_flush() calls before calling avio_close_dyn_buf()

avio_close_dyn_buf() also does avio_flush().
Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent 37d24a6c
...@@ -459,7 +459,6 @@ static int flush_dynbuf(VariantStream *vs, int *range_length) ...@@ -459,7 +459,6 @@ static int flush_dynbuf(VariantStream *vs, int *range_length)
// flush // flush
av_write_frame(ctx, NULL); av_write_frame(ctx, NULL);
avio_flush(ctx->pb);
// write out to file // write out to file
*range_length = avio_close_dyn_buf(ctx->pb, &vs->temp_buffer); *range_length = avio_close_dyn_buf(ctx->pb, &vs->temp_buffer);
...@@ -2548,7 +2547,6 @@ static int hls_write_trailer(struct AVFormatContext *s) ...@@ -2548,7 +2547,6 @@ static int hls_write_trailer(struct AVFormatContext *s)
if (!vs->init_range_length) { if (!vs->init_range_length) {
uint8_t *buffer = NULL; uint8_t *buffer = NULL;
av_write_frame(oc, NULL); /* Flush any buffered data */ av_write_frame(oc, NULL); /* Flush any buffered data */
avio_flush(oc->pb);
range_length = avio_close_dyn_buf(oc->pb, &buffer); range_length = avio_close_dyn_buf(oc->pb, &buffer);
avio_write(vs->out, buffer, range_length); avio_write(vs->out, buffer, range_length);
......
...@@ -133,7 +133,6 @@ static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) ...@@ -133,7 +133,6 @@ static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags)
avio_write(pb, page->data, page->size); avio_write(pb, page->data, page->size);
ogg_update_checksum(s, pb, crc_offset); ogg_update_checksum(s, pb, crc_offset);
avio_flush(pb);
size = avio_close_dyn_buf(pb, &buf); size = avio_close_dyn_buf(pb, &buf);
if (size < 0) if (size < 0)
......
...@@ -415,7 +415,6 @@ void ff_rtp_send_punch_packets(URLContext *rtp_handle) ...@@ -415,7 +415,6 @@ void ff_rtp_send_punch_packets(URLContext *rtp_handle)
avio_wb32(pb, 0); /* Timestamp */ avio_wb32(pb, 0); /* Timestamp */
avio_wb32(pb, 0); /* SSRC */ avio_wb32(pb, 0); /* SSRC */
avio_flush(pb);
len = avio_close_dyn_buf(pb, &buf); len = avio_close_dyn_buf(pb, &buf);
if ((len > 0) && buf) if ((len > 0) && buf)
ffurl_write(rtp_handle, buf, len); ffurl_write(rtp_handle, buf, len);
...@@ -430,7 +429,6 @@ void ff_rtp_send_punch_packets(URLContext *rtp_handle) ...@@ -430,7 +429,6 @@ void ff_rtp_send_punch_packets(URLContext *rtp_handle)
avio_wb16(pb, 1); /* length in words - 1 */ avio_wb16(pb, 1); /* length in words - 1 */
avio_wb32(pb, 0); /* our own SSRC */ avio_wb32(pb, 0); /* our own SSRC */
avio_flush(pb);
len = avio_close_dyn_buf(pb, &buf); len = avio_close_dyn_buf(pb, &buf);
if ((len > 0) && buf) if ((len > 0) && buf)
ffurl_write(rtp_handle, buf, len); ffurl_write(rtp_handle, buf, len);
......
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