git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 17 Sep 2013 10:16:55 +0000 (12:16 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 17 Sep 2013 10:16:55 +0000 (12:16 +0200)
commit	7b836487a924bc77733523957818124c07b82efc
tree	de9bb0b27cba427033e14ec050610e5f5744178c	tree \| snapshot
parent	96e6447d6233ac55f6dd4c50c9afefe99fefe773	commit \| diff
parent	73084391588b0f150737990038829cac5013dd68	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.