* 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>
			
			tags/n2.1