Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Oct 2014 10:38:59 +0000 (12:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Oct 2014 10:45:01 +0000 (12:45 +0200)
* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

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

Simple merge