Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:44:25 +0000 (11:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:44:25 +0000 (11:44 +0200)
commite1acfd3cb0543815316ede06232d13e002562daa
treeae93002655c896f4873bd1a5fa8d6f22e0659cef
parentd169b56b7bfc44c80261b7a2ec74f279cd853966
parentb886f5c2f1e71b3e60e4265c500158d392b4b9a4
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@gmx.at>
libavformat/matroskaenc.c
libavformat/version.h