[FFmpeg-cvslog] Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 20 11:44:25 2013 +0200| [e1acfd3cb0543815316ede06232d13e002562daa] | committer: Michael Niedermayer

Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'

* commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4':
  mkv: Allow flushing the current cluster in progress

Conflicts:
	libavformat/matroskaenc.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1acfd3cb0543815316ede06232d13e002562daa
---