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)
commita9b613b60e5108692d329c5779e1cc7488cadf0d
treefb200c10c53451dfc8ae1d94208d8a5f9740d24d
parent293a8e426fc05db44ac8952a1f62b254e9362f3f
parent979932378ae3fbf452e312eb759cc7ce175f78de
Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

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