[FFmpeg-cvslog] Merge commit '73084391588b0f150737990038829cac5013dd68'
Michael Niedermayer
git at videolan.org
Tue Sep 17 12:21:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 12:16:55 2013 +0200| [7b836487a924bc77733523957818124c07b82efc] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b836487a924bc77733523957818124c07b82efc
---
More information about the ffmpeg-cvslog
mailing list