[FFmpeg-cvslog] Merge commit '2bc220958c7570020d87ee353db65460b518998a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 12:25:52 2014 +0200| [7b973e734111caccc737fcc6d1ed5a6a111c8831] | committer: Michael Niedermayer

Merge commit '2bc220958c7570020d87ee353db65460b518998a'

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

Conflicts:
	tools/ismindex.c

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

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