Merge commit '73084391588b0f150737990038829cac5013dd68'

* commit '73084391588b0f150737990038829cac5013dd68':
  lavf: Don't explicitly flush after each written packet in muxers

Conflicts:
	libavformat/assenc.c
	libavformat/yuv4mpeg.c

See: 8de9bb6e5e527e2bcc8b2cff2da4107ecef23421

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 0 deletions

diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index f2e904a59e..9fb9f232d9 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -87,6 +87,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     } else {
         avio_write(s->pb, pkt->data, pkt->size);
     }
+
     return 0;
 }