Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Oct 2012 14:37:41 +0000 (16:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Oct 2012 14:41:50 +0000 (16:41 +0200)
commitf74f8bc864b26cdbab606edcd6a401b4d1ca2700
tree28602dfb65b1f78c19d375c9a9b2471863587bb2
parentb26cbf75bc80a972883c617b884f7616db5cee99
parenta854362b40f0e458db5a1fb0d2612a5702ee0ace
Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'

* commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace':
  segment: Flush buffered data before finishing a segment

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