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>
This commit is contained in:
commit
7b836487a9
@ -87,6 +87,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
} else {
|
||||
avio_write(s->pb, pkt->data, pkt->size);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user