Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 13:04:30 +0000 (15:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 13:04:34 +0000 (15:04 +0200)
* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
  ismindex: recover from completely empty streams

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

Simple merge