Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 16:18:38 +0000 (18:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 16:30:24 +0000 (18:30 +0200)
commitdac7b278026401a67795181c22f6eaaf72095074
treef724aebe0dde18e909f65c95636be38944859546
parent962654f25137ee8a8f75625ee8f5440db060fc9f
parentb14086ca38efa1a86cb0f0c6aa147b05f698877b
Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'

* commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b':
  mkv: Correctly report the latest packet had been flushed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c