1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '73084391588b0f150737990038829cac5013dd68'

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

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

See: 8de9bb6e5e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-17 12:16:55 +02:00
commit 7b836487a9

View File

@ -87,6 +87,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} else {
avio_write(s->pb, pkt->data, pkt->size);
}
return 0;
}