1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 7b973e7341 Merge commit '2bc220958c7570020d87ee353db65460b518998a'
* commit '2bc220958c7570020d87ee353db65460b518998a':
  ismindex: handle discontinuous streams better

Conflicts:
	tools/ismindex.c

See: d3834f290138cb8c48fd404081ac5b9a2ca14564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 12:25:52 +02:00
..