Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:35:34 +0000 (11:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:35:39 +0000 (11:35 +0200)
* qatar/master:
  ismindex: Change the duration field to int64_t

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

Simple merge