Merge commit '2bc220958c7570020d87ee353db65460b518998a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 10:25:52 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 10:25:52 +0000 (12:25 +0200)
commit7b973e734111caccc737fcc6d1ed5a6a111c8831
treea346a6328e05a818729d37f07c11e5630e859e22
parentd3834f290138cb8c48fd404081ac5b9a2ca14564
parent2bc220958c7570020d87ee353db65460b518998a
Merge commit '2bc220958c7570020d87ee353db65460b518998a'

* commit '2bc220958c7570020d87ee353db65460b518998a':
  ismindex: handle discontinuous streams better

Conflicts:
tools/ismindex.c

See: d3834f290138cb8c48fd404081ac5b9a2ca14564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/ismindex.c