Commit 7b836487 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '73084391'

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

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

See: 8de9bb6eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 96e6447d 73084391
......@@ -87,6 +87,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} else {
avio_write(s->pb, pkt->data, pkt->size);
}
return 0;
}
......
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