[FFmpeg-cvslog] Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 16 12:38:59 2014 +0200| [a9b613b60e5108692d329c5779e1cc7488cadf0d] | committer: Michael Niedermayer

Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9b613b60e5108692d329c5779e1cc7488cadf0d
---