Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 18:37:00 +0000 (20:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 18:37:06 +0000 (20:37 +0200)
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

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

Simple merge