Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
  ismindex: produce .ismf file

Conflicts:
tools/ismindex.c

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

Simple merge