Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:45:02 +0000 (00:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:45:33 +0000 (00:45 +0200)
* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0':
  ismindex: Avoid writing ismf files if no base name has been specified

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

Simple merge